From ec0b7eaa94d409dfeb0b8558dda176e6884c7520 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 8 Dec 2022 15:30:01 +0300 Subject: [PATCH 01/35] Version 4.5.0.Final --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index 1e8ff7db..59a59ac2 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.0-SNAPSHOT + 4.5.0.Final oxD Client https://www.gluu.org org.gluu oxd - 4.5.0-SNAPSHOT + 4.5.0.Final diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index b7593699..f7ee60c9 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.0-SNAPSHOT + 4.5.0.Final oxD Common https://www.gluu.org org.gluu oxd - 4.5.0-SNAPSHOT + 4.5.0.Final diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 20dac6f9..aecf37e6 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.0-SNAPSHOT + 4.5.0.Final https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.0-SNAPSHOT + 4.5.0.Final diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 17af3a1b..b0ff73b8 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.0-SNAPSHOT + 4.5.0.Final oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.0-SNAPSHOT + 4.5.0.Final diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 5de8fa8f..9a523575 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.0.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.0.Final/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 65d8e2ba..2d7b6f72 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.0-SNAPSHOT + 4.5.0.Final oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.0-SNAPSHOT + 4.5.0.Final 2.10.1 4.1.2 - 4.5.0-SNAPSHOT + 4.5.0.Final 1.1.0 3.0 [24.1.1,) - 4.5.0-SNAPSHOT + 4.5.0.Final 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.0-SNAPSHOT + 4.5.0.Final import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.0-SNAPSHOT + 4.5.0.Final org.gluu From eac0d34552100e802625aed861db713bef278ef5 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Mon, 17 Apr 2023 13:45:32 +0300 Subject: [PATCH 02/35] Version 4.5.1-SNAPSHOT --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index 59a59ac2..c965fb51 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.0.Final + 4.5.1.Final oxD Client https://www.gluu.org org.gluu oxd - 4.5.0.Final + 4.5.1.Final diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index f7ee60c9..7351b0dd 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.0.Final + 4.5.1.Final oxD Common https://www.gluu.org org.gluu oxd - 4.5.0.Final + 4.5.1.Final diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index aecf37e6..02ceb575 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.0.Final + 4.5.1.Final https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.0.Final + 4.5.1.Final diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index b0ff73b8..37295ec3 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.0.Final + 4.5.1.Final oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.0.Final + 4.5.1.Final diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 9a523575..46b45be5 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.Final-distribution.zip +warName=oxd-server-4.5.1.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.Final/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.1.Final/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2d7b6f72..1feb8586 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.0.Final + 4.5.1.Final oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.0.Final + 4.5.1.Final 2.10.1 4.1.2 - 4.5.0.Final + 4.5.1.Final 1.1.0 3.0 [24.1.1,) - 4.5.0.Final + 4.5.1.Final 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.0.Final + 4.5.1.Final import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.0.Final + 4.5.1.Final org.gluu From 83164709daa419bcd2bdd1454114f3a4c3c313d8 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Mon, 17 Apr 2023 13:48:30 +0300 Subject: [PATCH 03/35] Version 4.5.1-SNAPSHOT --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- pom.xml | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index c965fb51..5eabbee5 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.1.Final + 4.5.1-SNAPSHOT oxD Client https://www.gluu.org org.gluu oxd - 4.5.1.Final + 4.5.1-SNAPSHOT diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 7351b0dd..91251734 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.1.Final + 4.5.1-SNAPSHOT oxD Common https://www.gluu.org org.gluu oxd - 4.5.1.Final + 4.5.1-SNAPSHOT diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 02ceb575..048929eb 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.1.Final + 4.5.1-SNAPSHOT https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.1.Final + 4.5.1-SNAPSHOT diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 37295ec3..fe2054d3 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.1.Final + 4.5.1-SNAPSHOT oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.1.Final + 4.5.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1feb8586..867f0100 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.1.Final + 4.5.1-SNAPSHOT oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.1.Final + 4.5.1-SNAPSHOT 2.10.1 4.1.2 - 4.5.1.Final + 4.5.1-SNAPSHOT 1.1.0 3.0 [24.1.1,) - 4.5.1.Final + 4.5.1-SNAPSHOT 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.1.Final + 4.5.1-SNAPSHOT import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.1.Final + 4.5.1-SNAPSHOT org.gluu From b990c9930d2e2bc03a43fbf21c59053430d1bd9d Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Mon, 17 Apr 2023 13:50:12 +0300 Subject: [PATCH 04/35] Version 4.5.1-SNAPSHOT --- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 46b45be5..f89314c6 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.1.Final-distribution.zip +warName=oxd-server-4.5.1-SNAPSHOT-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.1.Final/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.1-SNAPSHOT/$warName unzip $warName -d $distDir \ No newline at end of file From 9c34a1c72a9a6c7a3793416994daf414921b0687 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 12:29:15 +0530 Subject: [PATCH 05/35] fix: update the dependencies to resolve vulnerability #623 --- oxd-server/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index fe2054d3..e64616fd 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.0.29 + 4.0.0 2.29.1 false 1.2.1 @@ -283,7 +283,7 @@ org.apache.commons commons-text - 1.8 + 1.10.0 @@ -482,7 +482,7 @@ org.yaml snakeyaml - 1.26 + 1.32 compile From 82fda2d0bbca2e719cbbf60963965d3f6ca433a5 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 12:54:33 +0530 Subject: [PATCH 06/35] fix: fixing compilation issues #623 --- oxd-server/src/main/java/org/gluu/oxd/server/Cli.java | 4 ++-- .../java/org/gluu/oxd/server/OxdServerApplication.java | 6 +++--- .../java/org/gluu/oxd/server/OxdServerConfiguration.java | 3 ++- .../src/main/java/org/gluu/oxd/server/RestResource.java | 7 +------ .../gluu/oxd/server/op/GetRequestObjectUriOperation.java | 2 +- .../java/org/gluu/oxd/server/op/GetUserInfoOperation.java | 2 +- .../java/org/gluu/oxd/server/service/DiscoveryService.java | 2 +- .../org/gluu/oxd/server/service/KeyGeneratorService.java | 2 +- .../org/gluu/oxd/server/service/PublicOpKeyService.java | 2 +- 9 files changed, 13 insertions(+), 17 deletions(-) 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..2a8f74a8 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; @@ -136,7 +136,7 @@ private static OxdServerConfiguration parseConfiguration(String pathToYaml) thro } DefaultConfigurationFactoryFactory configurationFactoryFactory = new DefaultConfigurationFactoryFactory<>(); - ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, Validators.newValidatorFactory().getValidator(), Jackson.newObjectMapper(), "dw"); + ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, Validators.newValidator(), Jackson.newObjectMapper(), "dw"); return configurationFactory.build(file); } 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..d9c5f56f 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,8 @@ 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 io.dropwizard.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 9150a4f1..48215adb 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,9 +1,6 @@ package org.gluu.oxd.server; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.google.common.collect.Lists; -import com.google.gson.JsonObject; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import io.opentracing.Scope; import org.gluu.oxd.common.Command; import org.gluu.oxd.common.CommandType; @@ -26,9 +23,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.io.IOException; -import java.lang.reflect.Field; import java.util.List; -import java.util.stream.IntStream; @Path("/") public class RestResource { 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 From eec8d8b9b4fb552088f8435a5b0ef109b94d8dbd Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 12:56:36 +0530 Subject: [PATCH 07/35] fix: fixing compilation issues #623 --- .../java/org/gluu/oxd/server/op/GetRequestObjectOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..99ceed29 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.inject.Injector; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.gluu.oxd.common.Command; import org.gluu.oxd.common.ErrorResponseCode; import org.gluu.oxd.common.ExpiredObject; From 97f101f564ec483e88f6dbd90a4494d6941bf692 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 13:13:13 +0530 Subject: [PATCH 08/35] fix: using BaseValidator #623 --- oxd-server/src/main/java/org/gluu/oxd/server/Cli.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2a8f74a8..6fd839e5 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 @@ -12,6 +12,7 @@ import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.jetty.HttpsConnectorFactory; +import io.dropwizard.validation.BaseValidator; import org.apache.commons.cli.*; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Level; @@ -136,7 +137,7 @@ private static OxdServerConfiguration parseConfiguration(String pathToYaml) thro } DefaultConfigurationFactoryFactory configurationFactoryFactory = new DefaultConfigurationFactoryFactory<>(); - ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, Validators.newValidator(), Jackson.newObjectMapper(), "dw"); + ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, BaseValidator.newValidator(), Jackson.newObjectMapper(), "dw"); return configurationFactory.build(file); } From ed1491dfc5f9864910f66b79ebdc9f2eb936de87 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 13:18:24 +0530 Subject: [PATCH 09/35] fix: using BaseValidator #623 --- oxd-server/src/main/java/org/gluu/oxd/server/Cli.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6fd839e5..5f8e5767 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 @@ -137,7 +137,7 @@ private static OxdServerConfiguration parseConfiguration(String pathToYaml) thro } DefaultConfigurationFactoryFactory configurationFactoryFactory = new DefaultConfigurationFactoryFactory<>(); - ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, BaseValidator.newValidator(), Jackson.newObjectMapper(), "dw"); + ConfigurationFactory configurationFactory = configurationFactoryFactory.create(OxdServerConfiguration.class, Validators.newValidatorFactory().getValidator(), Jackson.newObjectMapper(), "dw"); return configurationFactory.build(file); } From 19a898b1d0b3e8ad3dbd85b8e4291faebd50c818 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 15:20:13 +0530 Subject: [PATCH 10/35] fix: using BaseValidator #623 --- oxd-server/pom.xml | 6 ++++++ oxd-server/src/main/java/org/gluu/oxd/server/Cli.java | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index e64616fd..2f463d08 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -17,6 +17,7 @@ false 1.2.1 true + 3.0.2 @@ -557,6 +558,11 @@ org.gluu gluu-orm-couchbase + + jakarta.validation + jakarta.validation-api + ${jakarta.validation.version} + org.gluu gluu-orm-sql 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 5f8e5767..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 @@ -12,7 +12,6 @@ import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.jetty.HttpsConnectorFactory; -import io.dropwizard.validation.BaseValidator; import org.apache.commons.cli.*; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Level; From 446b5b06385c4644a3f3a3d2d6f072f3241160b6 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 15:30:17 +0530 Subject: [PATCH 11/35] fix: fix test cases #623 --- .../src/test/java/org/gluu/oxd/server/GetTokensByCodeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..7cb38833 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.collect.Lists; -import io.dropwizard.util.Strings; +import io.dropwizard.logback.shaded.guava.base.Strings; import org.apache.commons.codec.binary.Base64; import org.gluu.oxauth.model.common.AuthenticationMethod; import org.gluu.oxauth.model.util.Util; From 40bc4de83d528431d3948975728a10a13c10517b Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 16:08:08 +0530 Subject: [PATCH 12/35] fix: fix test cases #623 --- .../org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java index 74805252..06e24b56 100644 --- a/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java +++ b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java @@ -17,8 +17,9 @@ import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; + +import jakarta.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; import org.glassfish.jersey.message.internal.OutboundJaxrsResponse; import org.glassfish.jersey.message.internal.OutboundMessageContext; @@ -285,7 +286,7 @@ public synchronized RptPreProcessInterceptor createRptPreProcessInterceptor(Reso OutboundJaxrsResponse response = new OutboundJaxrsResponse(Response.Status.FORBIDDEN, outboundMessageContext); - when(client.registerTicketResponse(any(List.class), any())).thenReturn(response); + //when(client.registerTicketResponse(any(List.class), any())).thenReturn(response); opClientCache.put("RptPreProcessInterceptor", client); } else { client = (RptPreProcessInterceptor) opClientCache.getIfPresent("RptPreProcessInterceptor"); From 1e6a1d452440247bde42c28273b957f9e54ce908 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 16:12:22 +0530 Subject: [PATCH 13/35] fix: fix test cases #623 --- .../java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java index 06e24b56..6fdc6b4f 100644 --- a/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java +++ b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java @@ -359,7 +359,7 @@ public synchronized Builder createClientRequest(String uriTemplate, ClientHttpEn when(client.header(any(), any())).thenReturn(client); when(form.param(any(), any())).thenReturn(form); when(form.param(any(), any())).thenReturn(form); - when(client.buildPost(Entity.form(form)).invoke()).thenReturn(response); + //when(client.buildPost(Entity.form(form)).invoke()).thenReturn(response); opClientCache.put("Builder", client); opClientCache.put("Response", response); } else { From 3a9fb790269b2e5c8409bbf277c304b464411879 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 17:03:17 +0530 Subject: [PATCH 14/35] fix: fix compilation issues #623 --- oxd-server/pom.xml | 8 +------- oxd-server/src/main/java/org/gluu/oxd/server/Cli.java | 2 +- .../java/org/gluu/oxd/server/OxdServerApplication.java | 6 +++--- .../java/org/gluu/oxd/server/OxdServerConfiguration.java | 3 +-- .../src/main/java/org/gluu/oxd/server/RestResource.java | 2 +- .../org/gluu/oxd/server/op/GetRequestObjectOperation.java | 2 +- .../gluu/oxd/mock/service/OpClientFactoryMockImpl.java | 7 +++---- .../java/org/gluu/oxd/server/GetTokensByCodeTest.java | 2 +- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 2f463d08..5486ce65 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,12 +12,11 @@ 1.4 2.1.210 - 4.0.0 + 2.0.29 2.29.1 false 1.2.1 true - 3.0.2 @@ -558,11 +557,6 @@ org.gluu gluu-orm-couchbase - - jakarta.validation - jakarta.validation-api - ${jakarta.validation.version} - org.gluu gluu-orm-sql 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 7d4583ab..974e9076 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 d2b02fc8..06abed07 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.core.Application; -import io.dropwizard.core.setup.Bootstrap; -import io.dropwizard.core.setup.Environment; +import io.dropwizard.setup.Bootstrap; +import io.dropwizard.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 d9c5f56f..3ca26159 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,8 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.dropwizard.core.Configuration; -//import io.dropwizard.Configuration; +import io.dropwizard.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 48215adb..bbf6889b 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.logback.shaded.guava.base.Strings; +import io.dropwizard.util.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 99ceed29..8e771cb6 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.inject.Injector; -import io.dropwizard.logback.shaded.guava.base.Strings; +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/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java index 6fdc6b4f..74805252 100644 --- a/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java +++ b/oxd-server/src/test/java/org/gluu/oxd/mock/service/OpClientFactoryMockImpl.java @@ -17,9 +17,8 @@ import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.core.Form; +import javax.ws.rs.core.Response; - -import jakarta.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; import org.glassfish.jersey.message.internal.OutboundJaxrsResponse; import org.glassfish.jersey.message.internal.OutboundMessageContext; @@ -286,7 +285,7 @@ public synchronized RptPreProcessInterceptor createRptPreProcessInterceptor(Reso OutboundJaxrsResponse response = new OutboundJaxrsResponse(Response.Status.FORBIDDEN, outboundMessageContext); - //when(client.registerTicketResponse(any(List.class), any())).thenReturn(response); + when(client.registerTicketResponse(any(List.class), any())).thenReturn(response); opClientCache.put("RptPreProcessInterceptor", client); } else { client = (RptPreProcessInterceptor) opClientCache.getIfPresent("RptPreProcessInterceptor"); @@ -359,7 +358,7 @@ public synchronized Builder createClientRequest(String uriTemplate, ClientHttpEn when(client.header(any(), any())).thenReturn(client); when(form.param(any(), any())).thenReturn(form); when(form.param(any(), any())).thenReturn(form); - //when(client.buildPost(Entity.form(form)).invoke()).thenReturn(response); + when(client.buildPost(Entity.form(form)).invoke()).thenReturn(response); opClientCache.put("Builder", client); opClientCache.put("Response", response); } else { 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 7cb38833..0835782e 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.collect.Lists; -import io.dropwizard.logback.shaded.guava.base.Strings; +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; From 86d900c40cf785a97c2869de94c00d634a6aafed Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 16 May 2023 18:07:36 +0530 Subject: [PATCH 15/35] fix: upgrade gson to 2.8.9 #623 --- oxd-gen-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 048929eb..796bcf69 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -282,7 +282,7 @@ ${java.version} 1.8.0 2.7.5 - 2.8.1 + 2.8.9 2.0.0 1.3.5 1.0.0 From d73845098640d4b432417881f444edc2c6d0bdb2 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 16 May 2023 20:36:53 +0300 Subject: [PATCH 16/35] Version 4.5.1.Final --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index 5eabbee5..c965fb51 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.1-SNAPSHOT + 4.5.1.Final oxD Client https://www.gluu.org org.gluu oxd - 4.5.1-SNAPSHOT + 4.5.1.Final diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 91251734..7351b0dd 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.1-SNAPSHOT + 4.5.1.Final oxD Common https://www.gluu.org org.gluu oxd - 4.5.1-SNAPSHOT + 4.5.1.Final diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 796bcf69..cc23e2e7 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.1-SNAPSHOT + 4.5.1.Final https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.1-SNAPSHOT + 4.5.1.Final diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 5486ce65..cc036a59 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.1-SNAPSHOT + 4.5.1.Final oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.1-SNAPSHOT + 4.5.1.Final diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index f89314c6..46b45be5 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.1-SNAPSHOT-distribution.zip +warName=oxd-server-4.5.1.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.1-SNAPSHOT/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.1.Final/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 867f0100..1feb8586 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.1-SNAPSHOT + 4.5.1.Final oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.1-SNAPSHOT + 4.5.1.Final 2.10.1 4.1.2 - 4.5.1-SNAPSHOT + 4.5.1.Final 1.1.0 3.0 [24.1.1,) - 4.5.1-SNAPSHOT + 4.5.1.Final 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.1-SNAPSHOT + 4.5.1.Final import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.1-SNAPSHOT + 4.5.1.Final org.gluu From 67820cb4841d122d34ebba7cc40eedc795468141 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Wed, 17 May 2023 12:54:28 +0530 Subject: [PATCH 17/35] feat: upgrade opentracing dependencies --- oxd-server/pom.xml | 16 ++++++++-------- .../java/org/gluu/oxd/server/TracingUtil.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index cc036a59..788b6fa9 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -495,21 +495,21 @@ commons-cli 1.4 + io.opentracing.contrib opentracing-web-servlet-filter - 0.1.1 + 0.4.1 io.opentracing.contrib opentracing-okhttp3 - 0.1.0 + 3.0.0 - com.lightstep.tracer lightstep-tracer-jre - 0.14.2 + 0.32.0 com.google.protobuf @@ -520,22 +520,22 @@ io.jaegertracing jaeger-core - 0.27.0 + 1.8.1 io.opentracing.brave brave-opentracing - 0.31.2 + 1.0.0 io.zipkin.reporter2 zipkin-reporter - 2.7.6 + 2.16.4 io.zipkin.reporter2 zipkin-sender-okhttp3 - 2.7.6 + 2.16.4 org.gluu diff --git a/oxd-server/src/main/java/org/gluu/oxd/server/TracingUtil.java b/oxd-server/src/main/java/org/gluu/oxd/server/TracingUtil.java index f8251c7e..aa80b63b 100644 --- a/oxd-server/src/main/java/org/gluu/oxd/server/TracingUtil.java +++ b/oxd-server/src/main/java/org/gluu/oxd/server/TracingUtil.java @@ -5,7 +5,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Maps; import io.jaegertracing.Configuration; -import io.jaegertracing.samplers.ConstSampler; +import io.jaegertracing.internal.samplers.ConstSampler; import io.opentracing.Scope; import io.opentracing.Tracer; import io.opentracing.log.Fields; @@ -71,7 +71,7 @@ private static Tracer getGlobalTracer() { } public static Scope buildSpan(String spanName, boolean startActive) { - return getGlobalTracer().buildSpan(spanName).startActive(startActive); + return getGlobalTracer().scopeManager().activate(getGlobalTracer().activeSpan()); } public static io.opentracing.Span buildChildSpan(io.opentracing.Span parentSpan, String childSpanName) { From 16ee91fcad67eca173bd62ae4f210e0199a29a3e Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Wed, 14 Jun 2023 16:39:32 +0300 Subject: [PATCH 18/35] Version 4.5.2-SNAPSHOT --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index c965fb51..55dd4464 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.1.Final + 4.5.2-SNAPSHOT oxD Client https://www.gluu.org org.gluu oxd - 4.5.1.Final + 4.5.2-SNAPSHOT diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 7351b0dd..2c2b28c0 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.1.Final + 4.5.2-SNAPSHOT oxD Common https://www.gluu.org org.gluu oxd - 4.5.1.Final + 4.5.2-SNAPSHOT diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index cc23e2e7..07408728 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.1.Final + 4.5.2-SNAPSHOT https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.1.Final + 4.5.2-SNAPSHOT diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 788b6fa9..c83c7cf4 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.1.Final + 4.5.2-SNAPSHOT oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.1.Final + 4.5.2-SNAPSHOT diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 46b45be5..2d87700c 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.1.Final-distribution.zip +warName=oxd-server-4.5.2-SNAPSHOT-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.1.Final/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.2-SNAPSHOT/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1feb8586..635d5ea3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.1.Final + 4.5.2-SNAPSHOT oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.1.Final + 4.5.2-SNAPSHOT 2.10.1 4.1.2 - 4.5.1.Final + 4.5.2-SNAPSHOT 1.1.0 3.0 [24.1.1,) - 4.5.1.Final + 4.5.2-SNAPSHOT 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.1.Final + 4.5.2-SNAPSHOT import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.1.Final + 4.5.2-SNAPSHOT org.gluu From b0d93cb7a3b4f946450e97b291cb6a5f3bbb81e0 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Mon, 7 Aug 2023 22:53:09 +0300 Subject: [PATCH 19/35] Version 4.5.2.Final --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index 55dd4464..f843306d 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.2-SNAPSHOT + 4.5.2.Final oxD Client https://www.gluu.org org.gluu oxd - 4.5.2-SNAPSHOT + 4.5.2.Final diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 2c2b28c0..93d88b0b 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.2-SNAPSHOT + 4.5.2.Final oxD Common https://www.gluu.org org.gluu oxd - 4.5.2-SNAPSHOT + 4.5.2.Final diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 07408728..6c0a2e2b 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.2-SNAPSHOT + 4.5.2.Final https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.2-SNAPSHOT + 4.5.2.Final diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index c83c7cf4..ce2eb73f 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.2-SNAPSHOT + 4.5.2.Final oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.2-SNAPSHOT + 4.5.2.Final diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 2d87700c..694f1942 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.2-SNAPSHOT-distribution.zip +warName=oxd-server-4.5.2.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.2-SNAPSHOT/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.2.Final/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 635d5ea3..7853776a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.2-SNAPSHOT + 4.5.2.Final oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.2-SNAPSHOT + 4.5.2.Final 2.10.1 4.1.2 - 4.5.2-SNAPSHOT + 4.5.2.Final 1.1.0 3.0 [24.1.1,) - 4.5.2-SNAPSHOT + 4.5.2.Final 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.2-SNAPSHOT + 4.5.2.Final import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.2-SNAPSHOT + 4.5.2.Final org.gluu From 7939a653e273b6fa942860f5e71dbb95d44477f4 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 19 Oct 2023 22:17:38 +0300 Subject: [PATCH 20/35] Version 4.5.3-SNAPSHOT --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- pom.xml | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index f843306d..247b16e7 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.2.Final + 4.5.3-SNAPSHOT oxD Client https://www.gluu.org org.gluu oxd - 4.5.2.Final + 4.5.3-SNAPSHOT diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 93d88b0b..0020dc69 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.2.Final + 4.5.3-SNAPSHOT oxD Common https://www.gluu.org org.gluu oxd - 4.5.2.Final + 4.5.3-SNAPSHOT diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 6c0a2e2b..96526565 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.2.Final + 4.5.3-SNAPSHOT https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.2.Final + 4.5.3-SNAPSHOT diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index ce2eb73f..6179ae63 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.2.Final + 4.5.3-SNAPSHOT oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.2.Final + 4.5.3-SNAPSHOT diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 694f1942..72a63ec3 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.2.Final-distribution.zip +warName=oxd-server-4.5.3-SNAPSHOT-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.2.Final/$warName +wget http://ox.gluu.org/maven/org/xdi/oxd-server/4.5.3-SNAPSHOT/$warName unzip $warName -d $distDir \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7853776a..3e524ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.2.Final + 4.5.3-SNAPSHOT oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.2.Final + 4.5.3-SNAPSHOT 2.10.1 4.1.2 - 4.5.2.Final + 4.5.3-SNAPSHOT 1.1.0 3.0 [24.1.1,) - 4.5.2.Final + 4.5.3-SNAPSHOT 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.2.Final + 4.5.3-SNAPSHOT import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.2.Final + 4.5.3-SNAPSHOT org.gluu From eb4fefaf3076a8824507b03637267262f9bcba2f Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 14 Nov 2023 18:21:59 +0300 Subject: [PATCH 21/35] chore: update BC libs --- oxd-server/pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 6179ae63..a48b6cc9 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -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 @@ -573,15 +573,15 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bcutil-jdk15on + bcutil-jdk18on @@ -720,12 +720,12 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on runtime org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on runtime From 097b05df0a19f6fa7a4191cf59ee28dfa6f6f197 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Wed, 15 Nov 2023 22:25:53 +0300 Subject: [PATCH 22/35] chore: update libs --- oxd-server/pom.xml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index a48b6cc9..d7d935a9 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.0.29 + 2.0.35 2.29.1 false 1.2.1 @@ -482,7 +482,7 @@ org.yaml snakeyaml - 1.32 + 2.2 compile @@ -602,7 +602,30 @@ org.apache.logging.log4j log4j-api - + + + + org.eclipse.jetty + jetty-client + 9.4.53.v20231009 + + + org.eclipse.jetty + jetty-http + 9.4.53.v20231009 + + + org.glassfish.jersey.core + jersey-common + 2.41 + + + com.squareup.okio + okio + 3.6.0 + + + junit junit From e8b2a7297663c87c300e8e1d1e208d6d1d8563c6 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 18:23:27 +0300 Subject: [PATCH 23/35] chore: restore old snakeyaml lib --- oxd-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index d7d935a9..9b30e97b 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -482,7 +482,7 @@ org.yaml snakeyaml - 2.2 + 1.33 compile From ec34dc97e08ef596e55efe436c64b0477a46f207 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 18:38:21 +0300 Subject: [PATCH 24/35] chore: update libs --- oxd-server/pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 9b30e97b..333e26f2 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.0.35 + 2.1.10 2.29.1 false 1.2.1 @@ -604,16 +604,6 @@ - - org.eclipse.jetty - jetty-client - 9.4.53.v20231009 - - - org.eclipse.jetty - jetty-http - 9.4.53.v20231009 - org.glassfish.jersey.core jersey-common From 3be885bbd98e8467ed6ad8b966225ba8743e1ee8 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 18:48:04 +0300 Subject: [PATCH 25/35] chore: update libs --- oxd-server/pom.xml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 333e26f2..2dd308d0 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -604,16 +604,11 @@ - - org.glassfish.jersey.core - jersey-common - 2.41 - - - com.squareup.okio - okio - 3.6.0 - + + com.squareup.okio + okio + 3.6.0 + From 52d4425743a6fa5a058cfb78389dc8c598dfdf0b Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 18:58:59 +0300 Subject: [PATCH 26/35] chore: update libs --- oxd-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 2dd308d0..937873ca 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.1.10 + 2.0.35 2.29.1 false 1.2.1 From 794c9063cbbf6d4f3cd115d5de72bef5ad02c4ec Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 19:04:11 +0300 Subject: [PATCH 27/35] chore: update libs --- oxd-server/pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 937873ca..5e254090 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -603,14 +603,8 @@ log4j-api - - - com.squareup.okio - okio - 3.6.0 - - + junit junit From 493985272fbc6cf83fe9b2f0f67cc2e1d510201c Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Thu, 16 Nov 2023 20:27:04 +0300 Subject: [PATCH 28/35] chore: update libs --- oxd-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 9b30e97b..ebbe13da 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 2.0.35 + 2.0.29 2.29.1 false 1.2.1 From 19710cb721c60e111d27dc2786caa0ebba8ef0a0 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 21 Nov 2023 14:04:39 +0530 Subject: [PATCH 29/35] Issue#629 (#630) * fix runtime errors in version_4.5.3 #629 Signed-off-by: Arnab Dutta * fix runtime errors in version_4.5.3 #629 Signed-off-by: Arnab Dutta --------- Signed-off-by: Arnab Dutta --- oxd-server/pom.xml | 20 ++++++++++++++----- .../main/java/org/gluu/oxd/server/Cli.java | 2 +- .../gluu/oxd/server/OxdServerApplication.java | 6 +++--- .../oxd/server/OxdServerConfiguration.java | 2 +- .../org/gluu/oxd/server/RestResource.java | 2 +- .../server/op/GetRequestObjectOperation.java | 2 +- .../gluu/oxd/server/GetTokensByCodeTest.java | 2 +- .../java/org/gluu/oxd/server/SetUpTest.java | 12 +++++------ 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index a1ec7934..bf7113f0 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.0 2.29.1 false 1.2.1 @@ -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 @@ -602,9 +614,7 @@ org.apache.logging.log4j log4j-api - - - + junit junit 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/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."); From de15e6a65cae5eb2d5579794c6c211fe642a69a6 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 21 Nov 2023 15:56:00 +0300 Subject: [PATCH 30/35] chore: update libs --- oxd-server/src/main/assembly/src.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c90fd5d91810079b4ca833bb4234c5033c0511d7 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 21 Nov 2023 16:26:00 +0300 Subject: [PATCH 31/35] chore: update libs --- oxd-server/src/main/assembly/windows-exe-src.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From f2d7c27436f289569c45ee04237e999642b8cf18 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 21 Nov 2023 19:32:18 +0530 Subject: [PATCH 32/35] chore: upgrade libs Signed-off-by: Arnab Dutta --- oxd-server/pom.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index bf7113f0..9d94ef45 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -12,7 +12,7 @@ 1.4 2.1.210 - 3.0.0 + 3.0.4 2.29.1 false 1.2.1 @@ -494,7 +494,7 @@ org.yaml snakeyaml - 1.33 + 2.0 compile diff --git a/pom.xml b/pom.xml index 3e524ca9..defc0c76 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 3.0 [24.1.1,) 4.5.3-SNAPSHOT - 3.141.59 + 4.0.0 false GluuFederation_oxd From 02037286fb455f217afdc22166d95622b05614a9 Mon Sep 17 00:00:00 2001 From: Arnab Dutta Date: Tue, 21 Nov 2023 19:41:33 +0530 Subject: [PATCH 33/35] chore: upgrade libs Signed-off-by: Arnab Dutta --- oxd-server/pom.xml | 29 +++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index 9d94ef45..e637f420 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -437,6 +437,12 @@ oxd-gen-client ${project.version} test + + + com.squareup.okio + okio + + org.gluu @@ -544,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 @@ -624,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 diff --git a/pom.xml b/pom.xml index defc0c76..3e524ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 3.0 [24.1.1,) 4.5.3-SNAPSHOT - 4.0.0 + 3.141.59 false GluuFederation_oxd From 124f6004119b40ca8d97dd69df3c0703ef15cc91 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 5 Dec 2023 15:19:02 +0300 Subject: [PATCH 34/35] Version 4.5.3.Final --- oxd-client/pom.xml | 4 ++-- oxd-common/pom.xml | 4 ++-- oxd-gen-client/pom.xml | 4 ++-- oxd-server/pom.xml | 4 ++-- pom.xml | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/oxd-client/pom.xml b/oxd-client/pom.xml index 247b16e7..05a8c65f 100644 --- a/oxd-client/pom.xml +++ b/oxd-client/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-client jar - 4.5.3-SNAPSHOT + 4.5.3.Final oxD Client https://www.gluu.org org.gluu oxd - 4.5.3-SNAPSHOT + 4.5.3.Final diff --git a/oxd-common/pom.xml b/oxd-common/pom.xml index 0020dc69..debc8994 100644 --- a/oxd-common/pom.xml +++ b/oxd-common/pom.xml @@ -5,14 +5,14 @@ 4.0.0 oxd-common jar - 4.5.3-SNAPSHOT + 4.5.3.Final oxD Common https://www.gluu.org org.gluu oxd - 4.5.3-SNAPSHOT + 4.5.3.Final diff --git a/oxd-gen-client/pom.xml b/oxd-gen-client/pom.xml index 96526565..36c43996 100644 --- a/oxd-gen-client/pom.xml +++ b/oxd-gen-client/pom.xml @@ -4,14 +4,14 @@ oxd-gen-client jar oxd-gen-client - 4.5.3-SNAPSHOT + 4.5.3.Final https://github.com/swagger-api/swagger-codegen Swagger Java org.gluu oxd - 4.5.3-SNAPSHOT + 4.5.3.Final diff --git a/oxd-server/pom.xml b/oxd-server/pom.xml index e637f420..cc65e076 100644 --- a/oxd-server/pom.xml +++ b/oxd-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 oxd-server jar - 4.5.3-SNAPSHOT + 4.5.3.Final oxD Server https://www.gluu.org @@ -22,7 +22,7 @@ org.gluu oxd - 4.5.3-SNAPSHOT + 4.5.3.Final diff --git a/pom.xml b/pom.xml index 3e524ca9..d4ce8249 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,21 @@ org.gluu oxd pom - 4.5.3-SNAPSHOT + 4.5.3.Final oxD https://jenkins.gluu.org UTF-8 3.0.3 - 4.5.3-SNAPSHOT + 4.5.3.Final 2.10.1 4.1.2 - 4.5.3-SNAPSHOT + 4.5.3.Final 1.1.0 3.0 [24.1.1,) - 4.5.3-SNAPSHOT + 4.5.3.Final 3.141.59 false @@ -75,7 +75,7 @@ org.gluu gluu-core-bom - 4.5.3-SNAPSHOT + 4.5.3.Final import pom @@ -89,7 +89,7 @@ org.gluu uma-rs-resteasy - 4.5.3-SNAPSHOT + 4.5.3.Final org.gluu From 769c1f8ea242138ecb499ee2d7a42efafc6d1505 Mon Sep 17 00:00:00 2001 From: Yuriy Movchan Date: Tue, 5 Dec 2023 15:24:44 +0300 Subject: [PATCH 35/35] Version 4.5.3.Final --- oxd-server/src/main/bin/oxd-download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oxd-server/src/main/bin/oxd-download.sh b/oxd-server/src/main/bin/oxd-download.sh index 72a63ec3..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.3-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.3-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