From 2158c0385afd6ebfdb2b73ab8c0bc363c7138337 Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Wed, 21 Jan 2026 20:54:26 +0100 Subject: [PATCH 1/2] Stop using jboss-parent Closes: #40125 Signed-off-by: Peter Zaoral --- pom.xml | 9 +++------ .../keycloak/it/cli/dist/JavaOptsScriptTest.java | 2 +- .../it/cli/dist/QuarkusPropertiesDistTest.java | 14 ++++++++++++-- .../it/cli/dist/ShowConfigCommandDistTest.java | 10 ++++++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 55bae21be50d..6dc82bee67df 100644 --- a/pom.xml +++ b/pom.xml @@ -19,12 +19,6 @@ 4.0.0 - - org.jboss - jboss-parent - 39 - - Keycloak Keycloak SSO @@ -52,6 +46,8 @@ ${timestamp} Keycloak + UTF-8 + UTF-8 keycloak @@ -190,6 +186,7 @@ 3.13.1 + 3.6.2 1.4.1 7.5.Final 1.9.0 diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java index 2df4164f663e..cd036e4f9bc1 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java @@ -129,7 +129,7 @@ void testPicocliClosuresDisabled(LaunchResult result) { void testKcHomeDirPathFormat(LaunchResult result) { String output = result.getOutput(); assertThat(output, containsString("kc.home.dir=")); - assertThat(output, matchesPattern("(?s).*kc\\.home\\.dir=\"[A-Z]:/.*/target/kc-tests/keycloak-\\d+\\.\\d+\\.\\d+.*?/bin/\\.\\.\".*")); + assertThat(output, matchesPattern("(?s).*kc\\.home\\.dir=\"[A-Z]:/[^\"]*kc-tests/keycloak-\\d+\\.\\d+\\.\\d+[^\"]*?/bin/\\.\\.\".*")); } } diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java index 6cc32ab1f935..c725460181a0 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java @@ -17,6 +17,7 @@ package org.keycloak.it.cli.dist; +import java.nio.file.Path; import java.util.Optional; import java.util.function.Consumer; @@ -112,7 +113,8 @@ void testUnknownQuarkusBuildTimePropertyApplied(CLIResult cliResult) { } @Test - @Launch({ "start", "--http-enabled=true", "--hostname-strict=false", "--config-keystore=../../../../src/test/resources/keystore" }) + @BeforeStartDistribution(QuarkusPropertiesDistTest.CopyKeystoreToConf.class) + @Launch({ "start", "--http-enabled=true", "--hostname-strict=false", "--config-keystore=../conf/keystore" }) @Order(9) void testMissingSmallRyeKeyStorePasswordProperty(CLIResult cliResult) { assertTrue( @@ -151,8 +153,9 @@ void testInvalidSmallRyeKeyStorePathPropertyWin(CLIResult cliResult) { } @Test + @BeforeStartDistribution(QuarkusPropertiesDistTest.CopyKeystoreToConf.class) @Launch({ "start", "--http-enabled=true", "--hostname-strict=false", - "--config-keystore=../../../../src/test/resources/keystore", "--config-keystore-password=secret" }) + "--config-keystore=../conf/keystore", "--config-keystore-password=secret" }) @Order(12) void testSmallRyeKeyStoreConfigSource(CLIResult cliResult) { // keytool -importpass -alias kc.log-level -keystore keystore -storepass secret -storetype PKCS12 -v (with "org.keycloak.timer:debug" as the stored password) @@ -219,4 +222,11 @@ public void accept(KeycloakDistribution distribution) { } } + public static class CopyKeystoreToConf implements Consumer { + @Override + public void accept(KeycloakDistribution distribution) { + distribution.copyOrReplaceFileFromClasspath("/keystore", Path.of("conf", "keystore")); + } + } + } diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java index c46211a6fc3f..14eb9cf72f4e 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java @@ -78,7 +78,10 @@ void testShowConfigCommandHidesCredentialsInProfiles(KeycloakDistribution distri @RawDistOnly(reason = "Containers are immutable") void testSmallRyeKeyStoreConfigSource(KeycloakDistribution distribution) { // keystore is shared with QuarkusPropertiesDistTest#testSmallRyeKeyStoreConfigSource - CLIResult result = distribution.run(String.format("%s=%s", CONFIG_FILE_LONG_NAME, Paths.get("src/test/resources/ShowConfigCommandTest/keycloak-keystore.conf").toAbsolutePath().normalize()), ShowConfig.NAME, "all"); + CLIResult result = distribution.run( + String.format("%s=%s", CONFIG_FILE_LONG_NAME, Paths.get("src/test/resources/ShowConfigCommandTest/keycloak-keystore.conf").toAbsolutePath().normalize()), + "--config-keystore=" + Paths.get("src/test/resources/keystore").toAbsolutePath().normalize(), + ShowConfig.NAME, "all"); String output = result.getOutput(); assertThat(output, containsString("kc.config-keystore-password = " + PropertyMappers.VALUE_MASK)); assertThat(output, containsString("kc.log-level = " + PropertyMappers.VALUE_MASK)); @@ -108,7 +111,10 @@ void testConfigSourceNames(KeycloakDistribution distribution) { distribution.setEnvVar("KC_LOG", "file"); distribution.copyOrReplaceFile(Paths.get("src/test/resources/ShowConfigCommandTest/quarkus.properties"), Path.of("conf", "quarkus.properties")); - result = distribution.run(String.format("%s=%s", CONFIG_FILE_LONG_NAME, Paths.get("src/test/resources/ShowConfigCommandTest/keycloak-keystore.conf").toAbsolutePath().normalize()), ShowConfig.NAME, "all", "--db=dev-file"); + result = distribution.run( + String.format("%s=%s", CONFIG_FILE_LONG_NAME, Paths.get("src/test/resources/ShowConfigCommandTest/keycloak-keystore.conf").toAbsolutePath().normalize()), + "--config-keystore=" + Paths.get("src/test/resources/keystore").toAbsolutePath().normalize(), + ShowConfig.NAME, "all", "--db=dev-file"); result.assertMessage("(CLI)"); result.assertMessage("(ENV)"); From 68acdb62840b4a0e3fca85c2cd8c5d25d5e356c8 Mon Sep 17 00:00:00 2001 From: Badiuzzaman Iskhandar Date: Fri, 20 Feb 2026 10:52:48 +0000 Subject: [PATCH 2/2] Add Maven plugins version from jboss-parent Should match the versions from jboss-parent to prevent conflicting versions. Signed-off-by: Badiuzzaman Iskhandar --- pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pom.xml b/pom.xml index 6dc82bee67df..40e9b10c93b2 100644 --- a/pom.xml +++ b/pom.xml @@ -202,6 +202,14 @@ 6.3.0 3.2.0 3.0.0 + 3.1.1 + 2.8.2 + 3.5.0 + 3.13.0 + 3.2.0 + 3.3.1 + 2.22.2 + 3.0.0 512m @@ -1357,6 +1365,7 @@ org.apache.maven.plugins maven-assembly-plugin + ${maven-assembly-plugin.version} posix @@ -1388,6 +1397,7 @@ org.apache.maven.plugins maven-jar-plugin + ${maven-jar-plugin.version} org.apache.maven.plugins @@ -1498,6 +1508,36 @@ target/verifier/verifications.xml + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + org.keycloak keycloak-distribution-licenses-maven-plugin