From d1b40a0c026a07b5780e85bd8170f3a397967189 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Tue, 31 Mar 2020 22:55:19 +0200
Subject: [PATCH] JAVA-42: Upgrade spring-security-x509 to Spring Boot 2

---
 spring-security-modules/spring-security-x509/pom.xml        | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/application.properties               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-security-modules/spring-security-x509/pom.xml b/spring-security-modules/spring-security-x509/pom.xml
index a4ff908eed..d4132f058d 100644
--- a/spring-security-modules/spring-security-x509/pom.xml
+++ b/spring-security-modules/spring-security-x509/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <modules>
diff --git a/spring-security-modules/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/application.properties b/spring-security-modules/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/application.properties
index f293d6712d..53dfe9976a 100644
--- a/spring-security-modules/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/application.properties
+++ b/spring-security-modules/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/application.properties
@@ -1,8 +1,8 @@
-server.ssl.key-store=../keystore/keystore.jks
+server.ssl.key-store=keystore/keystore.jks
 server.ssl.key-store-password=changeit
 server.ssl.key-alias=localhost
 server.ssl.key-password=changeit
 server.ssl.enabled=true
 server.port=8443
-security.user.name=Admin
-security.user.password=admin
\ No newline at end of file
+spring.security.user.name=Admin
+spring.security.user.password=admin
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-x509/spring-security-x509-client-auth/src/main/resources/application.properties b/spring-security-modules/spring-security-x509/spring-security-x509-client-auth/src/main/resources/application.properties
index 174eba9f98..743c9c4582 100644
--- a/spring-security-modules/spring-security-x509/spring-security-x509-client-auth/src/main/resources/application.properties
+++ b/spring-security-modules/spring-security-x509/spring-security-x509-client-auth/src/main/resources/application.properties
@@ -4,8 +4,8 @@ server.ssl.key-alias=localhost
 server.ssl.key-password=changeit
 server.ssl.enabled=true
 server.port=8443
-security.user.name=Admin
-security.user.password=admin
+spring.security.user.name=Admin
+spring.security.user.password=admin
 server.ssl.trust-store=../keystore/truststore.jks
 server.ssl.trust-store-password=changeit
 server.ssl.client-auth=need
\ No newline at end of file