Technical merge of released branch 4.0.0-M2-BRANCH
diff --git a/tests/e2e-tls/pom.xml b/tests/e2e-tls/pom.xml index d1e602b..7aa88b9 100644 --- a/tests/e2e-tls/pom.xml +++ b/tests/e2e-tls/pom.xml
@@ -146,26 +146,5 @@ --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED </http.patch.addopens> </properties> - - <profiles> - <profile> - <id>JDK_17-</id> - <activation> - <jdk>[11,17)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- The certificate is not working with JDK 11 --> - <excludes><exclude>**/ConcurrentHttpsUrlConnectionTest*</exclude></excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - + </project>
diff --git a/tests/pom.xml b/tests/pom.xml index a8ec2a9..01fdcf0 100644 --- a/tests/pom.xml +++ b/tests/pom.xml
@@ -117,15 +117,6 @@ </build> </profile> <profile> - <id>JDK11+</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <modules> - <module>release-test</module> - </modules> - </profile> - <profile> <id>JDK17+</id> <activation> <jdk>[17,)</jdk>
diff --git a/tests/release-test/pom.xml b/tests/release-test/pom.xml index 3a224b7..1be9c8f 100644 --- a/tests/release-test/pom.xml +++ b/tests/release-test/pom.xml
@@ -40,6 +40,7 @@ <maven.compiler.target>11</maven.compiler.target> <maven.version>3.8.6</maven.version> <maven.resolver.version>1.7.3</maven.resolver.version> <!-- 1.8.2 does not work--> + <httpcore.version>4.4.16</httpcore.version> </properties> <build> @@ -132,6 +133,12 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> + </dependency> + + <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> </dependency>
diff --git a/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/DownloadBomPomDependencies.java b/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/DownloadBomPomDependencies.java index 6a74f07..d5c753d 100644 --- a/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/DownloadBomPomDependencies.java +++ b/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/DownloadBomPomDependencies.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025 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 @@ -72,9 +72,6 @@ MavenEnvironment mavenEnvironment = new MavenEnvironment(); MavenProject project = mavenEnvironment.getMavenProjectForResourceFile("/non-bom-pom-deps.xml"); for (Dependency dependency : project.getDependencies()) { - if (dependency.getArtifactId().contains("jackson1") && mavenEnvironment.jerseyVersion.startsWith("3")) { - continue; - } Artifact m = mavenEnvironment.resolveArtifact(dependency); System.out.append("Resolved ").append(dependency.getGroupId()).append(":")
diff --git a/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/MultiReleaseTest.java b/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/MultiReleaseTest.java index 11a417e..1b06c49 100644 --- a/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/MultiReleaseTest.java +++ b/tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/MultiReleaseTest.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025 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 @@ -37,16 +37,12 @@ private static final File localRepository = MavenUtil.getLocalMavenRepository(); private static final Properties properties = MavenUtil.getMavenProperties(); - private static final DependencyPair[] jdk11multiRelease = jdk11multiRelease(properties); - private static final DependencyPair[] jdk12multiRelease = jdk12multiRelease(properties); private static final DependencyPair[] jdk17multiRelease = jdk17multiRelease(properties); private static final DependencyPair[] jdk21multiRelease = jdk21multiRelease(properties); @Test public void testIsJdkMultiRelease() throws IOException, XmlPullParserException { - TestResult result = testJdkVersions("11", jdk11multiRelease); - result.append(testJdkVersions("12", jdk12multiRelease)); - result.append(testJdkVersions("17", jdk17multiRelease)); + TestResult result = testJdkVersions("17", jdk17multiRelease); result.append(testJdkVersions("21", jdk21multiRelease)); //Assertions.assertTrue(result.result(), "Some error occurred, see previous messages"); Assert.assertTrue("Some error occurred, see previous messages", result.result());
diff --git a/tests/release-test/src/test/resources/non-bom-pom-deps.xml b/tests/release-test/src/test/resources/non-bom-pom-deps.xml index e3aca57..fa43bf1 100644 --- a/tests/release-test/src/test/resources/non-bom-pom-deps.xml +++ b/tests/release-test/src/test/resources/non-bom-pom-deps.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2023, 2025 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 @@ -33,44 +33,39 @@ <dependencies> <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson1</artifactId> - <version>2.27</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-client</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-server</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-signature</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.incubator</groupId> <artifactId>jersey-injectless-client</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.incubator</groupId> <artifactId>jersey-open-tracing</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-kryo</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-declarative-linking</artifactId> - <version>2.27</version> + <version>4.0.0-M2</version> </dependency> </dependencies>