From f118191b835087bfac8121070241419d8aed8cdf Mon Sep 17 00:00:00 2001 From: jansupol Date: Tue, 5 Apr 2022 14:16:41 +0200 Subject: [PATCH 1/3] Updated dependency versions Signed-off-by: jansupol --- containers/glassfish/jersey-gf-ejb/pom.xml | 8 ++--- containers/grizzly2-servlet/pom.xml | 2 +- containers/jersey-servlet-core/pom.xml | 2 +- containers/jersey-servlet/pom.xml | 2 +- containers/jetty-servlet/pom.xml | 2 +- examples/osgi-http-service/bundle/pom.xml | 2 +- pom.xml | 31 ++++++++++--------- .../e2e/container/LeadingSlashesTest.java | 13 +++++++- 8 files changed, 37 insertions(+), 25 deletions(-) diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index cb47571cd7..b261c00f25 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml @@ -112,12 +112,12 @@ true - + - com.sun.*;version="[4.0,7)", + com.sun.*;version="[6.0,8)", ${jakarta.annotation.osgi.version}, - org.glassfish.ejb.*;version="[4.0,7)", - org.glassfish.internal.*;version="[4.0,7)", + org.glassfish.ejb.*;version="[6.0,8)", + org.glassfish.internal.*;version="[6.0,8)", ${hk2.osgi.version}, * diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml index feaf63ac2b..dbe618fa3d 100644 --- a/containers/grizzly2-servlet/pom.xml +++ b/containers/grizzly2-servlet/pom.xml @@ -71,7 +71,7 @@ - jakarta.servlet.*;version="[5.0,6.0)", + jakarta.servlet.*;version="[5.0,7.0)", * diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml index 439888c289..2348e36b13 100644 --- a/containers/jersey-servlet-core/pom.xml +++ b/containers/jersey-servlet-core/pom.xml @@ -71,7 +71,7 @@ jakarta.persistence.*;resolution:=optional, - jakarta.servlet.*;version="[5.0,6.0)", + jakarta.servlet.*;version="[5.0,7.0)", ${jakarta.annotation.osgi.version}, * diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml index db15edeee9..578e1e1576 100644 --- a/containers/jersey-servlet/pom.xml +++ b/containers/jersey-servlet/pom.xml @@ -74,7 +74,7 @@ - jakarta.servlet.*;version="[5.0,6.0)", + jakarta.servlet.*;version="[5.0,7.0)", ${jakarta.annotation.osgi.version}, * diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml index 15537d30b0..f14891f875 100644 --- a/containers/jetty-servlet/pom.xml +++ b/containers/jetty-servlet/pom.xml @@ -65,7 +65,7 @@ - jakarta.servlet.*;version="[5.0,6.0)", + jakarta.servlet.*;version="[5.0,7.0)", * diff --git a/examples/osgi-http-service/bundle/pom.xml b/examples/osgi-http-service/bundle/pom.xml index 6c79fb4d4e..efd62d4fa1 100644 --- a/examples/osgi-http-service/bundle/pom.xml +++ b/examples/osgi-http-service/bundle/pom.xml @@ -72,7 +72,7 @@ org.glassfish.jersey.examples.osgihttpservice - jakarta.servlet.*;version="[5.0,6.0)",* + jakarta.servlet.*;version="[5.0,7.0)",* org.glassfish.jersey.examples.osgihttpservice.Activator jersey-osgi-http-service-bundle ${project.version} diff --git a/pom.xml b/pom.xml index d50aee8150..3dfbf5d5b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1829,7 +1829,7 @@ jakarta.json jakarta.json-api - ${jsonp.ri.version} + ${jakarta.jsonp.version} org.glassfish @@ -2143,12 +2143,12 @@ 1.7.21 4.3.20.RELEASE 5.1.5.RELEASE - 3.0.0-M3 + 3.0.0-M5 4.0.2.Final 3.1.7.SP1 - 7.0.0.Final + 7.0.1.Final 2.11.0 @@ -2160,36 +2160,37 @@ 3.0.0 4.0.0 - 3.0.0 + 3.0.1 2.0.0 - 3.0.1 + 3.0.2 3.0.0 2.0.0 2.0.0 5.0.0 4.0.0 - 2.0.0 + 2.0.1 2.0.1 4.0.0 - 4.0.0 + 4.0.2 jakarta.annotation.*;version="[2.0,3)" 2.0.0 - 2.0.0 + 2.0.1 2.0.0 + 2.0.1 3.0.0 - 3.0.0 + 3.0.1 3.0.1 3.0.2 3.0 3.0.0 - 11.0.0 - 11.0.0 + 11.0.7 + 11.0.7 6.1.14 2.0.0 - 2.0.0 - 2.0.0 - 3.0.0 - 2.0.1 + 2.0.1 + 2.0.1 + 3.0.2 + 2.0.3 1.3.2 diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java index 18de2d603d..9af6cb54e1 100644 --- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java +++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -31,6 +31,7 @@ import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ServerProperties; +import org.glassfish.jersey.test.jetty.JettyTestContainerFactory; import org.junit.Test; import static org.junit.Assert.assertNotEquals; @@ -118,12 +119,19 @@ public void testSlashesWithBeginningEmpty() { @Test public void testSlashesWithBeginningEmptyPathParam() { + if (JettyTestContainerFactory.class.isInstance(factory)) { + return; // since Jetty 11.0.5 + } Response result = call("///test"); assertEquals("-", result.readEntity(String.class)); } @Test public void testSlashesWithBeginningEmptyPathParamWithQueryParams() { + if (JettyTestContainerFactory.class.isInstance(factory)) { + return; // since Jetty 11.0.5 + } + URI hostPort = UriBuilder.fromUri("http://localhost/").port(getPort()).build(); WebTarget target = client().target(hostPort).path("///testParams") .queryParam("bar", "Container") @@ -135,6 +143,9 @@ public void testSlashesWithBeginningEmptyPathParamWithQueryParams() { @Test public void testEncodedQueryParams() { + if (JettyTestContainerFactory.class.isInstance(factory)) { + return; // Jetty 11.0.5 + } URI hostPort = UriBuilder.fromUri("http://localhost/").port(getPort()).build(); WebTarget target = client().target(hostPort).path("///encoded") .queryParam("query", "%dummy23+a"); From 0be95a1c4c9b50bc8b711fcaaf27037bfb12de2a Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 8 Apr 2022 15:08:27 +0200 Subject: [PATCH 2/3] CP year Signed-off-by: Maxim Nesen --- .../jersey/tests/e2e/container/LeadingSlashesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java index 9af6cb54e1..19ce489e1a 100644 --- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java +++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at From 36852c085b5871297bf89fb185c59a7a8d61da6a Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 8 Apr 2022 18:33:42 +0200 Subject: [PATCH 3/3] jakarta.validation-api version correction Signed-off-by: Maxim Nesen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dfbf5d5b9..876f4cff6b 100644 --- a/pom.xml +++ b/pom.xml @@ -2178,7 +2178,7 @@ 2.0.0 2.0.1 3.0.0 - 3.0.1 + 3.0.0 3.0.1 3.0.2 3.0