Updated Jetty dependency versions (#5033)
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
Co-authored-by: jansupol <jan.supol@oracle.com>
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
index cb47571..b261c00 100644
--- a/containers/glassfish/jersey-gf-ejb/pom.xml
+++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -112,12 +112,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
+ <!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 7.x-->
<Import-Package>
- 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},
*
</Import-Package>
diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml
index feaf63a..dbe618f 100644
--- a/containers/grizzly2-servlet/pom.xml
+++ b/containers/grizzly2-servlet/pom.xml
@@ -71,7 +71,7 @@
<configuration>
<instructions>
<Import-Package>
- jakarta.servlet.*;version="[5.0,6.0)",
+ jakarta.servlet.*;version="[5.0,7.0)",
*
</Import-Package>
</instructions>
diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml
index 439888c..2348e36 100644
--- a/containers/jersey-servlet-core/pom.xml
+++ b/containers/jersey-servlet-core/pom.xml
@@ -71,7 +71,7 @@
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
<Import-Package>
jakarta.persistence.*;resolution:=optional,
- jakarta.servlet.*;version="[5.0,6.0)",
+ jakarta.servlet.*;version="[5.0,7.0)",
${jakarta.annotation.osgi.version},
*
</Import-Package>
diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml
index db15ede..578e1e1 100644
--- a/containers/jersey-servlet/pom.xml
+++ b/containers/jersey-servlet/pom.xml
@@ -74,7 +74,7 @@
<instructions>
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
<Import-Package>
- jakarta.servlet.*;version="[5.0,6.0)",
+ jakarta.servlet.*;version="[5.0,7.0)",
${jakarta.annotation.osgi.version},
*
</Import-Package>
diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml
index 15537d3..f14891f 100644
--- a/containers/jetty-servlet/pom.xml
+++ b/containers/jetty-servlet/pom.xml
@@ -65,7 +65,7 @@
<configuration>
<instructions>
<Import-Package>
- jakarta.servlet.*;version="[5.0,6.0)",
+ jakarta.servlet.*;version="[5.0,7.0)",
*
</Import-Package>
</instructions>
diff --git a/examples/osgi-http-service/bundle/pom.xml b/examples/osgi-http-service/bundle/pom.xml
index 6c79fb4..efd62d4 100644
--- a/examples/osgi-http-service/bundle/pom.xml
+++ b/examples/osgi-http-service/bundle/pom.xml
@@ -72,7 +72,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.examples.osgihttpservice</Export-Package>
- <Import-Package>jakarta.servlet.*;version="[5.0,6.0)",*</Import-Package>
+ <Import-Package>jakarta.servlet.*;version="[5.0,7.0)",*</Import-Package>
<Bundle-Activator>org.glassfish.jersey.examples.osgihttpservice.Activator</Bundle-Activator>
<Implementation-Title>jersey-osgi-http-service-bundle</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/pom.xml b/pom.xml
index d50aee8..876f4cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1829,7 +1829,7 @@
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
- <version>${jsonp.ri.version}</version>
+ <version>${jakarta.jsonp.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -2143,12 +2143,12 @@
<slf4j.version>1.7.21</slf4j.version>
<spring4.version>4.3.20.RELEASE</spring4.version>
<spring5.version>5.1.5.RELEASE</spring5.version>
- <surefire.version>3.0.0-M3</surefire.version>
+ <surefire.version>3.0.0-M5</surefire.version>
<!-- Jakartified, eligible for CQ -->
<weld.version>4.0.2.Final</weld.version>
<weld3.version>3.1.7.SP1</weld3.version>
- <validation.impl.version>7.0.0.Final</validation.impl.version>
+ <validation.impl.version>7.0.1.Final</validation.impl.version>
<!-- END of Jakartified, eligible for CQ -->
<xerces.version>2.11.0</xerces.version>
@@ -2160,36 +2160,37 @@
<!-- Jakartified -->
<cdi.api.version>3.0.0</cdi.api.version>
<ejb.version>4.0.0</ejb.version>
- <grizzly2.version>3.0.0</grizzly2.version>
+ <grizzly2.version>3.0.1</grizzly2.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
- <hk2.version>3.0.1</hk2.version>
+ <hk2.version>3.0.2</hk2.version>
<jsp.version>3.0.0</jsp.version>
<jstl.version>2.0.0</jstl.version>
<jta.api.version>2.0.0</jta.api.version>
<servlet5.version>5.0.0</servlet5.version>
<istack.commons.runtime.version>4.0.0</istack.commons.runtime.version>
- <jakarta.activation-api.version>2.0.0</jakarta.activation-api.version>
+ <jakarta.activation-api.version>2.0.1</jakarta.activation-api.version>
<jakarta.activation.version>2.0.1</jakarta.activation.version>
<jakarta.el.version>4.0.0</jakarta.el.version>
- <jakarta.el.impl.version>4.0.0</jakarta.el.impl.version>
+ <jakarta.el.impl.version>4.0.2</jakarta.el.impl.version>
<jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>
<jakarta.annotation.version>2.0.0</jakarta.annotation.version>
- <jakarta.inject.version>2.0.0</jakarta.inject.version>
+ <jakarta.inject.version>2.0.1</jakarta.inject.version>
<jakarta.interceptor.version>2.0.0</jakarta.interceptor.version>
+ <jakarta.jsonp.version>2.0.1</jakarta.jsonp.version>
<jakarta.persistence.version>3.0.0</jakarta.persistence.version>
- <jakarta.validation.api.version>3.0.0</jakarta.validation.api.version>
+ <jakarta.validation.api.version>3.0.0</jakarta.validation.api.version> <!--Can't be updated to 3.0.1 /OSGi incompatibility with JDK 1.8 -->
<jakarta.jaxb.api.version>3.0.1</jakarta.jaxb.api.version>
<jaxb.ri.version>3.0.2</jaxb.ri.version>
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
<jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
- <jetty.version>11.0.0</jetty.version>
- <jetty.plugin.version>11.0.0</jetty.plugin.version>
+ <jetty.version>11.0.7</jetty.version>
+ <jetty.plugin.version>11.0.7</jetty.plugin.version>
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
<jsonb.api.version>2.0.0</jsonb.api.version>
- <jsonp.ri.version>2.0.0</jsonp.ri.version>
- <jsonp.jaxrs.version>2.0.0</jsonp.jaxrs.version>
- <moxy.version>3.0.0</moxy.version>
- <yasson.version>2.0.1</yasson.version>
+ <jsonp.ri.version>2.0.1</jsonp.ri.version>
+ <jsonp.jaxrs.version>2.0.1</jsonp.jaxrs.version>
+ <moxy.version>3.0.2</moxy.version>
+ <yasson.version>2.0.3</yasson.version>
<!-- END of Jakartified -->
<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
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 18de2d6..19ce489 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, 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
@@ -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 @@
@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 @@
@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");
