From fc466ac8cb2f3ea9952cab46705db4e5f41a4247 Mon Sep 17 00:00:00 2001 From: Ivan Kyosev <89931850+ivan-kyosev-gs@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:51:18 +0000 Subject: [PATCH 1/3] Upgrading to Dropwizard 2 --- legend-shared-opentracing-jersey/pom.xml | 12 ++- .../pom.xml | 8 +- legend-shared-pac4j-kerberos/pom.xml | 4 +- legend-shared-pac4j/pom.xml | 8 +- .../server/pac4j/LegendPac4JBundleTest.java | 4 +- legend-shared-server/pom.xml | 16 +--- pom.xml | 85 ++++++++++--------- 7 files changed, 73 insertions(+), 64 deletions(-) diff --git a/legend-shared-opentracing-jersey/pom.xml b/legend-shared-opentracing-jersey/pom.xml index 0d4ec30f..d0f415eb 100644 --- a/legend-shared-opentracing-jersey/pom.xml +++ b/legend-shared-opentracing-jersey/pom.xml @@ -37,17 +37,21 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api org.glassfish.jersey.core jersey-client + + org.glassfish.jersey.inject + jersey-hk2 + diff --git a/legend-shared-opentracing-servlet-filter/pom.xml b/legend-shared-opentracing-servlet-filter/pom.xml index 681649d6..efb9e457 100644 --- a/legend-shared-opentracing-servlet-filter/pom.xml +++ b/legend-shared-opentracing-servlet-filter/pom.xml @@ -37,12 +37,12 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api io.opentracing.contrib diff --git a/legend-shared-pac4j-kerberos/pom.xml b/legend-shared-pac4j-kerberos/pom.xml index e5df9fd6..7990c27d 100644 --- a/legend-shared-pac4j-kerberos/pom.xml +++ b/legend-shared-pac4j-kerberos/pom.xml @@ -35,8 +35,8 @@ pac4j-kerberos - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api com.fasterxml.jackson.core diff --git a/legend-shared-pac4j/pom.xml b/legend-shared-pac4j/pom.xml index e65fef35..03d330dd 100644 --- a/legend-shared-pac4j/pom.xml +++ b/legend-shared-pac4j/pom.xml @@ -38,6 +38,10 @@ org.pac4j dropwizard-pac4j + + org.pac4j + jersey-pac4j + org.commonjava.mimeparse mimeparse @@ -56,8 +60,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api com.google.guava diff --git a/legend-shared-pac4j/src/test/java/org/finos/legend/server/pac4j/LegendPac4JBundleTest.java b/legend-shared-pac4j/src/test/java/org/finos/legend/server/pac4j/LegendPac4JBundleTest.java index dc92528a..617324a5 100644 --- a/legend-shared-pac4j/src/test/java/org/finos/legend/server/pac4j/LegendPac4JBundleTest.java +++ b/legend-shared-pac4j/src/test/java/org/finos/legend/server/pac4j/LegendPac4JBundleTest.java @@ -29,6 +29,8 @@ import org.pac4j.dropwizard.Pac4jFactory; import org.pac4j.j2e.filter.SecurityFilter; +import javax.validation.Validation; + import static org.junit.Assert.*; public class LegendPac4JBundleTest @@ -57,7 +59,7 @@ public void testPac4jFactoryWithMultipleClients() throws Exception LegendPac4jBundle bundle = new LegendPac4jBundle<>(c -> config); Pac4jFactory factory = bundle.getPac4jFactory(new Configuration()); Config builtConfig = factory.build(); - Environment e = new Environment("serverEnv", null, null, new MetricRegistry(), null, new HealthCheckRegistry()); + Environment e = new Environment("serverEnv", null, Validation.buildDefaultValidatorFactory(), new MetricRegistry(), null, new HealthCheckRegistry(), new Configuration()); bundle.run(new Configuration(),e); assertEquals("/test/callback", factory.getCallbackUrl()); assertEquals(config.getClients(), factory.getClients()); diff --git a/legend-shared-server/pom.xml b/legend-shared-server/pom.xml index ec646228..ad0b7e2d 100644 --- a/legend-shared-server/pom.xml +++ b/legend-shared-server/pom.xml @@ -93,10 +93,6 @@ - - jakarta.xml.bind - jakarta.xml.bind-api - org.glassfish.jaxb jaxb-runtime @@ -116,20 +112,16 @@ - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-core + jakarta.xml.bind + jakarta.xml.bind-api com.sun.xml.bind jaxb-impl - javax.activation - activation + jakarta.activation + jakarta.activation-api diff --git a/pom.xml b/pom.xml index bfd02c52..b1a1b3d5 100644 --- a/pom.xml +++ b/pom.xml @@ -45,19 +45,18 @@ 2.6 - 1.3.29 + 2.0.21 3.0.0 + 3.0.3 30.0-jre 2.10.1 - 2.11.2 - 2.3.2 - 2.1.1 - 1.1.1 - 3.1.0 - 2.3.0 - 2.3.2 - 2.23.2 - 2.23.1 + 2.12.6 + 2.1.6 + 1.2.2 + 4.0.4 + 2.3.3 + 2.3.5 + 2.33 9.4.44.v20210927 2.10.1 4.13.1 @@ -71,7 +70,7 @@ 0.5.0 0.37.2 0.32.0 - 3.8.3 + 3.9.0 0.8.1 4.3.24.RELEASE 2.3.3.RELEASE @@ -486,8 +485,17 @@ org.pac4j pac4j-core + + org.pac4j + jersey225-pac4j + + + org.pac4j + jersey-pac4j + ${jersay.pac4j.version} + @@ -504,6 +512,13 @@ + + io.dropwizard + dropwizard-dependencies + ${dropwizard.version} + pom + import + io.dropwizard dropwizard-assets @@ -557,12 +572,17 @@ org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 - ${jersey.test.framework.version} + ${jersey.version} org.glassfish.jersey.core jersey-client - ${jersey.client.version} + ${jersey.version} + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} @@ -599,13 +619,8 @@ - javax.xml.bind - jaxb-api - ${jaxb.version} - - - com.sun.xml.bind - jaxb-core + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb.version} @@ -622,31 +637,23 @@ ${jaxb.runtime.version} - + - javax.servlet - javax.servlet-api - ${javax.servlet.api.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} - javax.activation - activation - ${javax.activation.version} + jakarta.activation + jakarta.activation-api + ${jakarta.activation.version} - - javax.ws.rs - javax.ws.rs-api - ${javax.jax-rs.version} - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} + From 35c87aae967ca26716a818ef832d038b8d986290 Mon Sep 17 00:00:00 2001 From: Ivan Kyosev <89931850+ivan-kyosev-gs@users.noreply.github.com> Date: Thu, 6 Jan 2022 16:46:59 +0000 Subject: [PATCH 2/3] Bumping dependency versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1a1b3d5..b46fe3ab 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.6 - 2.0.21 + 2.0.28 3.0.0 3.0.3 30.0-jre @@ -74,7 +74,7 @@ 0.8.1 4.3.24.RELEASE 2.3.3.RELEASE - 2.4.2 + 2.4.7 3.3.1 From 73c5aded27b896b707fdf94aae4a82d26d8979e1 Mon Sep 17 00:00:00 2001 From: Ivan Kyosev <89931850+ivan-kyosev-gs@users.noreply.github.com> Date: Thu, 6 Jan 2022 17:06:37 +0000 Subject: [PATCH 3/3] Updating Jersey dependencies --- pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b46fe3ab..cc517ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 4.0.4 2.3.3 2.3.5 - 2.33 + 2.35 9.4.44.v20210927 2.10.1 4.13.1 @@ -579,6 +579,16 @@ jersey-client ${jersey.version} + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + org.glassfish.jersey.inject jersey-hk2