Changed the name of "keycloak" to "keycloak-embedded" in configuration files to have compatibility with "keycloak-spring-boot-starter"

embedded-keycloak-server-custom/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.thomasdarimont.keycloak</groupId>
         <artifactId>embedded-keycloak-server-spring-boot-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.1.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

embedded-keycloak-server-custom/src/main/resources/application.yml

@@ -29,7 +29,7 @@ server:
     context-path: "/"
   shutdown: graceful
 
-keycloak:
+keycloak-embedded:
   custom:
     server:
       keycloak-path: "/auth"

embedded-keycloak-server-plain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.thomasdarimont.keycloak</groupId>
         <artifactId>embedded-keycloak-server-spring-boot-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>embedded-keycloak-server-plain</artifactId>

embedded-keycloak-server-plain/src/main/resources/application.yml

@@ -23,15 +23,15 @@ logging:
     org.keycloak.services.managers.UserSessionManager: DEBUG
     org.keycloak.timer.basic: DEBUG
 
-keycloak:
-#  custom:
-#    server:
-#      keycloak-path: "/auth"
-#
-#    adminUser:
-#      username: admin
-#      password: admin
-#      create-admin-user-enabled: true
+keycloak-embedded:
+  custom:
+    server:
+      keycloak-path: "/auth"
+
+    adminUser:
+      username: admin
+      password: admin
+      create-admin-user-enabled: true
 #
 #    migration:
 #      importProvider: singleFile

embedded-keycloak-server-plain/src/test/java/com/github/thomasdarimont/keycloak/EmbeddedSpringBootKeycloakServerXApplicationTests.java

@@ -1,9 +1,11 @@
 package com.github.thomasdarimont.keycloak;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@SpringBootTest
+@SpringBootConfiguration
 class EmbeddedSpringBootKeycloakServerXApplicationTests {
 
     @Test

embedded-keycloak-server-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.thomasdarimont.keycloak</groupId>
         <artifactId>embedded-keycloak-server-spring-boot-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,4 +21,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

embedded-keycloak-server-spring-boot-support/pom.xml

@@ -7,8 +7,8 @@
     <parent>
         <artifactId>embedded-keycloak-server-spring-boot-parent</artifactId>
         <groupId>com.github.thomasdarimont.keycloak</groupId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>embedded-keycloak-server-spring-boot-support</artifactId>
-</project>
+</project>

embedded-keycloak-server-spring-boot-support/src/main/java/com/github/thomasdarimont/keycloak/embedded/EmbeddedKeycloakConfig.java

@@ -113,7 +113,7 @@ private void initKeycloakEnvironmentFromProfiles() {
             profile.load(in);
 
             log.info("Found profile.properties on classpath.");
-            String profilePrefix = "keycloak.profile.";
+            String profilePrefix = "keycloak-embeded.profile.";
             for (Object key : profile.keySet()) {
                 String value = (String) profile.get(key);
                 String featureName = key.toString().toLowerCase();

embedded-keycloak-server-spring-boot-support/src/main/java/com/github/thomasdarimont/keycloak/embedded/KeycloakCustomProperties.java

@@ -9,7 +9,7 @@
 
 @Getter
 @Setter
-@ConfigurationProperties(prefix = "keycloak.custom")
+@ConfigurationProperties(prefix = "keycloak-embedded.custom")
 public class KeycloakCustomProperties {
 
     Server server = new Server();

embedded-keycloak-server-spring-boot-support/src/main/java/com/github/thomasdarimont/keycloak/embedded/KeycloakProperties.java

@@ -8,6 +8,6 @@
 
 @Getter
 @Setter
-@ConfigurationProperties(prefix = "keycloak")
+@ConfigurationProperties(prefix = "keycloak-embedded")
 public class KeycloakProperties extends HashMap<String, Object> {
 }

embedded-keycloak-server-spring-boot-support/src/main/resources/keycloak-defaults.yml

@@ -1,6 +1,6 @@
 # Default Keycloak configuration, adapted from Keycloak's keycloak-server.json
 
-keycloak:
+keycloak-embedded:
   hostname:
     provider: "default"
     default:

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.github.thomasdarimont.keycloak</groupId>
     <artifactId>embedded-keycloak-server-spring-boot-parent</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.3-SNAPSHOT</version>
 
     <packaging>pom</packaging>