Post merge Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/containers/jersey-servlet/src/test/java/org/glassfish/jersey/servlet/async/AsyncContextClosedTest.java b/containers/jersey-servlet/src/test/java/org/glassfish/jersey/servlet/async/AsyncContextClosedTest.java index f038bf4..220d832 100644 --- a/containers/jersey-servlet/src/test/java/org/glassfish/jersey/servlet/async/AsyncContextClosedTest.java +++ b/containers/jersey-servlet/src/test/java/org/glassfish/jersey/servlet/async/AsyncContextClosedTest.java
@@ -20,10 +20,10 @@ import org.glassfish.jersey.servlet.internal.ResponseWriter; import org.junit.jupiter.api.Test; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method;
diff --git a/core-client/pom.xml b/core-client/pom.xml index f4c8017..f7eac8c 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml
@@ -144,6 +144,12 @@ </dependency> <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${project.version}</version>
diff --git a/examples/expect-100-continue-netty-client/pom.xml b/examples/expect-100-continue-netty-client/pom.xml index 7b1714c..e09b0bd 100644 --- a/examples/expect-100-continue-netty-client/pom.xml +++ b/examples/expect-100-continue-netty-client/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.glassfish.jersey.examples</groupId> <artifactId>project</artifactId> - <version>2.47-SNAPSHOT</version> + <version>3.0.99-SNAPSHOT</version> </parent>
diff --git a/examples/expect-100-continue-netty-client/src/main/java/org/glassfish/jersey/examples/expect100continue/netty/connector/NettyClient.java b/examples/expect-100-continue-netty-client/src/main/java/org/glassfish/jersey/examples/expect100continue/netty/connector/NettyClient.java index a91fd92..fa27674 100644 --- a/examples/expect-100-continue-netty-client/src/main/java/org/glassfish/jersey/examples/expect100continue/netty/connector/NettyClient.java +++ b/examples/expect-100-continue-netty-client/src/main/java/org/glassfish/jersey/examples/expect100continue/netty/connector/NettyClient.java
@@ -17,13 +17,13 @@ import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.netty.connector.NettyConnectorProvider; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger;
diff --git a/pom.xml b/pom.xml index 21c1712..eb7f65a 100644 --- a/pom.xml +++ b/pom.xml
@@ -2217,13 +2217,13 @@ <freemarker.version>2.3.33</freemarker.version> <gae.version>2.0.36</gae.version> <groovy.version>5.0.0-alpha-12</groovy.version> - <groovy.jdk8.version>4.0.24</groovy.jdk8.version> + <groovy.jdk8.version>4.0.27</groovy.jdk8.version> <gson.version>2.13.1</gson.version> <!--versions, extracted here due to maven-enforcer-plugin --> <!-- <commons.codec.version>1.15</commons.codec.version>--> <com.uber.jaeger.version>0.27.0</com.uber.jaeger.version> - <org.codehaus.gmavenplus.version>3.0.2</org.codehaus.gmavenplus.version> + <org.codehaus.gmavenplus.version>4.2.0</org.codehaus.gmavenplus.version> <!-- end of versions extracted here due to maven-enforcer-plugin --> <!-- micrometer -->
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index f96df74..b01f938 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml
@@ -198,6 +198,13 @@ </dependency> <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.glassfish.jersey.test-framework</groupId> <artifactId>jersey-test-framework-util</artifactId> <scope>test</scope>
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/RedirectLargeFileTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/RedirectLargeFileTest.java index 56e5d71..52e6cd2 100644 --- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/RedirectLargeFileTest.java +++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/RedirectLargeFileTest.java
@@ -16,11 +16,11 @@ package org.glassfish.jersey.tests.e2e.client; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml index 15a8d13..e0d7298 100644 --- a/tests/e2e-server/pom.xml +++ b/tests/e2e-server/pom.xml
@@ -237,6 +237,34 @@ <profiles> <profile> + <id>JettyTestExclude</id> + <activation> + <jdk>1.8</jdk> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <testExcludes> + <testExclude>org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java</testExclude> + </testExcludes> + </configuration> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>xdk</id> <properties> <!-- do not use security manager for xdk -->
diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java index 8eb3c04..cedad3a 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java
@@ -33,25 +33,25 @@ import org.glassfish.jersey.test.spi.TestContainerFactory; import org.junit.jupiter.api.Test; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ReadListener; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException;
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index a6f43f6..180a564 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved. Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the
diff --git a/tests/integration/resteasy-client/pom.xml b/tests/integration/resteasy-client/pom.xml index 74815a1..7c4c056 100644 --- a/tests/integration/resteasy-client/pom.xml +++ b/tests/integration/resteasy-client/pom.xml
@@ -41,7 +41,8 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>5.0.10.Final</version> <!-- Can use 3.5.16.Final --> + <version>6.0.3.Final</version> <!-- according to https://docs.resteasy.dev/6.2/userguide/ --> +<!-- the 6.0.x versions are for Jakarta EE9 (Jakarta RESTful Web Services API 3.0 )--> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> @@ -76,6 +77,11 @@ <artifactId>jersey-test-framework-provider-grizzly2</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>commons-logging</groupId>