diff --git a/pom.xml b/pom.xml index 92f21018e0..2ef406b79a 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ pom - 2.5.4.Final + 2.7.0.Final - 4.7.3.Final - 2.12.5 + 4.7.5.Final + 2.13.1 ${jackson.version} - 5.6.1.Final - 8.0.27 + 5.6.5.Final + 8.0.28 42.3.1 3.0 1.5.4.Final-format-001 - 13.0.0.Final - + 13.0.5.Final diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/vault/QuarkusVaultProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/vault/QuarkusVaultProvider.java index 7b9cd278a6..ff882b1365 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/vault/QuarkusVaultProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/vault/QuarkusVaultProvider.java @@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.Optional; + import org.keycloak.vault.AbstractVaultProvider; import org.keycloak.vault.VaultKeyResolver; import org.keycloak.vault.VaultRawSecret; diff --git a/quarkus/runtime/src/main/resources/META-INF/services/quarkus.properties b/quarkus/runtime/src/main/resources/META-INF/services/quarkus.properties index 7de6fece8e..8e53b02dee 100644 --- a/quarkus/runtime/src/main/resources/META-INF/services/quarkus.properties +++ b/quarkus/runtime/src/main/resources/META-INF/services/quarkus.properties @@ -21,3 +21,6 @@ quarkus.log.level = INFO quarkus.log.category."org.jboss.resteasy.resteasy_jaxrs.i18n".level=WARN quarkus.log.category."org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup".level=WARN + +#jndi needed for LDAP lookups +quarkus.naming.enable-jndi=true diff --git a/quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java b/quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java index 4702c11a09..b0f496a8db 100644 --- a/quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java +++ b/quarkus/tests/integration/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java @@ -45,9 +45,10 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + +import io.quarkus.fs.util.ZipUtils; import org.apache.commons.io.FileUtils; -import io.quarkus.bootstrap.util.ZipUtils; import org.keycloak.common.Version; public final class RawKeycloakDistribution implements KeycloakDistribution { diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/src/main/content/conf/quarkus.properties b/testsuite/integration-arquillian/servers/auth-server/quarkus/src/main/content/conf/quarkus.properties new file mode 100644 index 0000000000..427d17491b --- /dev/null +++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/src/main/content/conf/quarkus.properties @@ -0,0 +1 @@ +quarkus.naming.enable-jndi=true