Merge pull request #637 from GluuFederation/version_4.5.3

chore: merge from 4.5.3
GluuFederation · Feb 7, 2024 · 5dedbee · 5dedbee
2 parents edb57e4 + 6a74a1e
commit 5dedbee
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 41 deletions.
diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <dbcp.version>1.4</dbcp.version>
         <h2.version>2.1.210</h2.version>
-        <dropwizard.version>2.0.29</dropwizard.version>
+        <dropwizard.version>3.0.4</dropwizard.version>
         <jersey-test-framework-provider>2.29.1</jersey-test-framework-provider>
         <generate.windows.exe>false</generate.windows.exe>
         <commons-daemon.bin.version>1.2.1</commons-daemon.bin.version>
@@ -127,22 +127,22 @@
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.bouncycastle</groupId>
-                            <artifactId>bcprov-jdk15on</artifactId>
-                            <version>1.70</version>
+                            <artifactId>bcprov-jdk18on</artifactId>
+                            <version>1.76</version>
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.bouncycastle</groupId>
-                            <artifactId>bcpkix-jdk15on</artifactId>
-                            <version>1.70</version>
+                            <artifactId>bcpkix-jdk18on</artifactId>
+                            <version>1.76</version>
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.bouncycastle</groupId>
-                            <artifactId>bcutil-jdk15on</artifactId>
-                            <version>1.70</version>
+                            <artifactId>bcutil-jdk18on</artifactId>
+                            <version>1.76</version>
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                         </artifactItem>
@@ -275,11 +275,23 @@
         <dependencies>
             <dependency>
                 <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-bom</artifactId>
+                <artifactId>dropwizard-dependencies</artifactId>
                 <version>${dropwizard.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>1.19.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>5.13.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
@@ -425,6 +437,12 @@
             <artifactId>oxd-gen-client</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.squareup.okio</groupId>
+            		<artifactId>okio</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.gluu</groupId>
@@ -482,7 +500,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.32</version>
+            <version>2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -532,10 +550,21 @@
             <artifactId>zipkin-reporter</artifactId>
             <version>2.16.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>3.4.0</version>
+        </dependency>
         <dependency>
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-sender-okhttp3</artifactId>
             <version>2.16.4</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.squareup.okio</groupId>
+            		<artifactId>okio</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.gluu</groupId>
@@ -573,15 +602,15 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
+                    <artifactId>bcprov-jdk18on</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcutil-jdk15on</artifactId>
+                    <artifactId>bcutil-jdk18on</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -612,11 +641,23 @@
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-remote-driver</artifactId>
             <scope>test</scope>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.squareup.okio</groupId>
+            		<artifactId>okio</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-support</artifactId>
             <scope>test</scope>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.squareup.okio</groupId>
+            		<artifactId>okio</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
@@ -720,12 +761,12 @@
             <dependencies>
                 <dependency>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
+                    <artifactId>bcprov-jdk18on</artifactId>
                     <scope>runtime</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
+                    <artifactId>bcpkix-jdk18on</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>

diff --git a/oxd-server/src/main/assembly/src.xml b/oxd-server/src/main/assembly/src.xml
@@ -39,7 +39,7 @@
             <directory>${project.build.directory}/dependencies</directory>
             <outputDirectory>/lib</outputDirectory>
             <includes>
-                <include>*-jdk15on*.jar</include>
+                <include>*-jdk18on*.jar</include>
             </includes>
         </fileSet>
         <fileSet>

diff --git a/oxd-server/src/main/assembly/windows-exe-src.xml b/oxd-server/src/main/assembly/windows-exe-src.xml
@@ -11,8 +11,8 @@
             <outputDirectory>/lib</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
             <includes>
-                <include>org.bouncycastle:bcprov-jdk15on</include>
-                <include>org.bouncycastle:bcpkix-jdk15on</include>
+                <include>org.bouncycastle:bcprov-jdk18on</include>
+                <include>org.bouncycastle:bcpkix-jdk18on</include>
             </includes>
             <scope>runtime</scope>
         </dependencySet>

diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh
@@ -1,12 +1,12 @@
 #!/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
 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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,28 +31,28 @@ 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<OxdServerConfiguration>(OxdServerApplication.class,
                     ResourceHelpers.resourceFilePath("oxd-server-jenkins.yml"),
                     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
@@ -12,14 +12,14 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.min-version>3.0.3</maven.min-version>
-        <oxCore.version>4.5.4-SNAPSHOT</oxCore.version>
+        <oxCore.version>4.5.3.Final</oxCore.version>
         <jackson.version>2.10.1</jackson.version>
         <httpcomponents.version>4.1.2</httpcomponents.version>
-        <oxauth.version>4.5.4-SNAPSHOT</oxauth.version>
+        <oxauth.version>4.5.3.Final</oxauth.version>
         <licensing.version>1.1.0</licensing.version>
         <guice.version>3.0</guice.version>
         <guava.version>[24.1.1,)</guava.version>
-        <oxlicense.version>4.5.4-SNAPSHOT</oxlicense.version>
+        <oxlicense.version>4.5.3.Final</oxlicense.version>
         <selenium.version>3.141.59</selenium.version>
 	<skip.swagger.client.generation>false</skip.swagger.client.generation>