diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 0484e49b..4f5f0513 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.0.29 + 3.0.4 2.29.1 false 1.2.1 @@ -127,22 +127,22 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.76 true ${project.build.directory}/dependencies org.bouncycastle - bcpkix-jdk15on - 1.70 + bcpkix-jdk18on + 1.76 true ${project.build.directory}/dependencies org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.76 true ${project.build.directory}/dependencies @@ -275,11 +275,23 @@ io.dropwizard - dropwizard-bom + dropwizard-dependencies ${dropwizard.version} pom import + + org.testcontainers + testcontainers-bom + 1.19.2 + pom + import + + + net.java.dev.jna + jna + 5.13.0 + org.apache.commons commons-text @@ -425,6 +437,12 @@ oxd-gen-client ${project.version} test + + + com.squareup.okio + okio + + org.gluu @@ -482,7 +500,7 @@ org.yaml snakeyaml - 1.32 + 2.0 compile @@ -532,10 +550,21 @@ zipkin-reporter 2.16.4 + + com.squareup.okio + okio + 3.4.0 + io.zipkin.reporter2 zipkin-sender-okhttp3 2.16.4 + + + com.squareup.okio + okio + + org.gluu @@ -573,15 +602,15 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bcutil-jdk15on + bcutil-jdk18on @@ -612,11 +641,23 @@ org.seleniumhq.selenium selenium-remote-driver test + + + com.squareup.okio + okio + + org.seleniumhq.selenium selenium-support test + + + com.squareup.okio + okio + + org.seleniumhq.selenium @@ -720,12 +761,12 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on runtime org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on runtime diff --git a/oxd-server/src/main/assembly/src.xml b/oxd-server/src/main/assembly/src.xml index 521ece6d..2293420b 100644 --- a/oxd-server/src/main/assembly/src.xml +++ b/oxd-server/src/main/assembly/src.xml @@ -39,7 +39,7 @@ ${project.build.directory}/dependencies /lib - *-jdk15on*.jar + *-jdk18on*.jar diff --git a/oxd-server/src/main/assembly/windows-exe-src.xml b/oxd-server/src/main/assembly/windows-exe-src.xml index cd6b903a..0bb93d6f 100644 --- a/oxd-server/src/main/assembly/windows-exe-src.xml +++ b/oxd-server/src/main/assembly/windows-exe-src.xml @@ -11,8 +11,8 @@ /lib false - org.bouncycastle:bcprov-jdk15on - org.bouncycastle:bcpkix-jdk15on + org.bouncycastle:bcprov-jdk18on + org.bouncycastle:bcpkix-jdk18on runtime diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 5de8fa8f..2891c72c 100644 --- a/oxd-server/src/main/bin/oxd-download.sh +++ b/oxd-server/src/main/bin/oxd-download.sh @@ -1,6 +1,6 @@ #!/bin/sh -warName=oxd-server-4.5.0-SNAPSHOT-distribution.zip +warName=oxd-server-4.5.3.Final-distribution.zip distDir=oxd-dist # Clean up @@ -8,5 +8,5 @@ rm -f $warName rm -f -r $destDir # Download and unzip -wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.0-SNAPSHOT/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.3.Final/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/Cli.java b/oxd-server/src/main/java/org/gluu/oxd/server/Cli.java index 974e9076..7d4583ab 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/Cli.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/Cli.java @@ -6,12 +6,12 @@ import io.dropwizard.configuration.ConfigurationException; import io.dropwizard.configuration.ConfigurationFactory; import io.dropwizard.configuration.DefaultConfigurationFactoryFactory; +import io.dropwizard.core.server.DefaultServerFactory; import io.dropwizard.jackson.Jackson; import io.dropwizard.jersey.validation.Validators; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.jetty.HttpsConnectorFactory; -import io.dropwizard.server.DefaultServerFactory; import org.apache.commons.cli.*; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Level; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerApplication.java b/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerApplication.java index 06abed07..d2b02fc8 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerApplication.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerApplication.java @@ -1,11 +1,11 @@ package org.gluu.oxd.server; import com.codahale.metrics.health.HealthCheck; -import io.dropwizard.Application; import io.dropwizard.configuration.EnvironmentVariableSubstitutor; import io.dropwizard.configuration.SubstitutingSourceProvider; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.Application; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerConfiguration.java b/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerConfiguration.java index 3ca26159..ec677ca0 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerConfiguration.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/OxdServerConfiguration.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import java.util.List; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/RestResource.java b/oxd-server/src/main/java/org/gluu/oxd/server/RestResource.java index bbf6889b..f6b85805 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/RestResource.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/RestResource.java @@ -1,6 +1,6 @@ package org.gluu.oxd.server; -import io.dropwizard.util.Strings; +import com.google.common.base.Strings; import io.opentracing.Scope; import org.gluu.oxd.common.Command; import org.gluu.oxd.common.CommandType; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectOperation.java b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectOperation.java index 8e771cb6..55bdfaa0 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectOperation.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectOperation.java @@ -1,7 +1,7 @@ package org.gluu.oxd.server.op; +import com.google.common.base.Strings; import com.google.inject.Injector; -import io.dropwizard.util.Strings; import org.gluu.oxd.common.Command; import org.gluu.oxd.common.ErrorResponseCode; import org.gluu.oxd.common.ExpiredObject; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectUriOperation.java b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectUriOperation.java index 51d6ba34..810fa985 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectUriOperation.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetRequestObjectUriOperation.java @@ -1,7 +1,7 @@ package org.gluu.oxd.server.op; import com.google.inject.Injector; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.apache.commons.lang.StringUtils; import org.gluu.oxauth.model.crypto.signature.SignatureAlgorithm; import org.gluu.oxauth.model.jwk.Algorithm; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetUserInfoOperation.java b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetUserInfoOperation.java index a750e6e6..ae1e9155 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/op/GetUserInfoOperation.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/op/GetUserInfoOperation.java @@ -1,7 +1,7 @@ package org.gluu.oxd.server.op; import com.google.inject.Injector; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.gluu.oxauth.client.UserInfoClient; import org.gluu.oxauth.client.UserInfoRequest; import org.gluu.oxauth.client.UserInfoResponse; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/service/DiscoveryService.java b/oxd-server/src/main/java/org/gluu/oxd/server/service/DiscoveryService.java index 81db1eba..edd57fdc 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/service/DiscoveryService.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/service/DiscoveryService.java @@ -4,7 +4,7 @@ package org.gluu.oxd.server.service; import com.google.inject.Inject; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.apache.commons.lang.StringUtils; import org.gluu.oxauth.client.OpenIdConfigurationClient; import org.gluu.oxauth.client.OpenIdConfigurationResponse; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/service/KeyGeneratorService.java b/oxd-server/src/main/java/org/gluu/oxd/server/service/KeyGeneratorService.java index df0eec75..758d90a0 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/service/KeyGeneratorService.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/service/KeyGeneratorService.java @@ -2,7 +2,7 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.gluu.oxauth.model.crypto.AbstractCryptoProvider; import org.gluu.oxauth.model.crypto.OxAuthCryptoProvider; import org.gluu.oxauth.model.crypto.encryption.KeyEncryptionAlgorithm; diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/service/PublicOpKeyService.java b/oxd-server/src/main/java/org/gluu/oxd/server/service/PublicOpKeyService.java index 68dfc7bd..d0bdc87f 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/service/PublicOpKeyService.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/service/PublicOpKeyService.java @@ -4,6 +4,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.gluu.oxauth.client.JwkClient; import org.gluu.oxauth.client.JwkResponse; import org.gluu.oxauth.model.crypto.PublicKey; @@ -24,7 +25,6 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.dropwizard.util.Strings; /** * @author Yuriy Zabrovarnyy diff --git a/oxd-server/src/test/java/org/gluu/oxd/server/GetTokensByCodeTest.java b/oxd-server/src/test/java/org/gluu/oxd/server/GetTokensByCodeTest.java index 0835782e..cb691907 100644 --- a/oxd-server/src/test/java/org/gluu/oxd/server/GetTokensByCodeTest.java +++ b/oxd-server/src/test/java/org/gluu/oxd/server/GetTokensByCodeTest.java @@ -1,7 +1,7 @@ package org.gluu.oxd.server; +import com.google.common.base.Strings; import com.google.common.collect.Lists; -import io.dropwizard.util.Strings; import org.apache.commons.codec.binary.Base64; import org.gluu.oxauth.model.common.AuthenticationMethod; import org.gluu.oxauth.model.util.Util; diff --git a/oxd-server/src/test/java/org/gluu/oxd/server/SetUpTest.java b/oxd-server/src/test/java/org/gluu/oxd/server/SetUpTest.java index e9ffc3a4..8ce54472 100644 --- a/oxd-server/src/test/java/org/gluu/oxd/server/SetUpTest.java +++ b/oxd-server/src/test/java/org/gluu/oxd/server/SetUpTest.java @@ -31,7 +31,7 @@ public class SetUpTest { @BeforeSuite public static void beforeSuite(String host, String opHost, String redirectUrls) { try { - LOG.debug("Running beforeSuite ..."); + LOG.info("Running beforeSuite ..."); ServerLauncher.setSetUpSuite(true); SUPPORT = new DropwizardTestSupport(OxdServerApplication.class, @@ -39,20 +39,20 @@ public static void beforeSuite(String host, String opHost, String redirectUrls) ConfigOverride.config("server.applicationConnectors[0].port", "0") // Optional, if not using a separate testing-specific configuration file, use a randomly selected port ); SUPPORT.before(); - LOG.debug("HTTP server started."); + LOG.info("HTTP server started."); removeExistingRps(); - LOG.debug("Existing RPs are removed."); + LOG.info("Existing RPs are removed."); RegisterSiteResponse setupClient = SetupClientTest.setupClient(Tester.newClient(host), opHost, redirectUrls); Tester.setSetupClient(setupClient, host, opHost); - LOG.debug("SETUP_CLIENT is set in Tester."); + LOG.info("SETUP_CLIENT is set in Tester."); Preconditions.checkNotNull(Tester.getAuthorization()); - LOG.debug("Tester's authorization is set."); + LOG.info("Tester's authorization is set."); setupSwaggerSuite(Tester.getTargetHost(host), opHost, redirectUrls); - LOG.debug("Finished beforeSuite!"); + LOG.info("Finished beforeSuite!"); } catch (Exception e) { LOG.error("Failed to start suite.", e); throw new AssertionError("Failed to start suite."); diff --git a/pom.xml b/pom.xml index 24bc7c57..223fbb7c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,14 +12,14 @@ UTF-8 3.0.3 - 4.5.4-SNAPSHOT + 4.5.3.Final 2.10.1 4.1.2 - 4.5.4-SNAPSHOT + 4.5.3.Final 1.1.0 3.0 [24.1.1,) - 4.5.4-SNAPSHOT + 4.5.3.Final 3.141.59 false