Skip to content

Commit 6816d88

Browse files
committed
release-test for 4.0 Jersey
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent 78980f7 commit 6816d88

File tree

4 files changed

+19
-24
lines changed

4 files changed

+19
-24
lines changed

tests/release-test/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2022, 2025 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,6 +40,7 @@
4040
<maven.compiler.target>11</maven.compiler.target>
4141
<maven.version>3.8.6</maven.version>
4242
<maven.resolver.version>1.7.3</maven.resolver.version> <!-- 1.8.2 does not work-->
43+
<httpcore.version>4.4.16</httpcore.version>
4344
</properties>
4445

4546
<build>
@@ -131,6 +132,12 @@
131132
</exclusions>
132133
</dependency>
133134

135+
<dependency>
136+
<groupId>org.apache.httpcomponents</groupId>
137+
<artifactId>httpcore</artifactId>
138+
<version>${httpcore.version}</version>
139+
</dependency>
140+
134141
<dependency>
135142
<groupId>org.glassfish.jersey.core</groupId>
136143
<artifactId>jersey-common</artifactId>

tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/DownloadBomPomDependencies.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -72,9 +72,6 @@ public void testDownloadNonBomPomDependencies() throws Exception {
7272
MavenEnvironment mavenEnvironment = new MavenEnvironment();
7373
MavenProject project = mavenEnvironment.getMavenProjectForResourceFile("/non-bom-pom-deps.xml");
7474
for (Dependency dependency : project.getDependencies()) {
75-
if (dependency.getArtifactId().contains("jackson1") && mavenEnvironment.jerseyVersion.startsWith("3")) {
76-
continue;
77-
}
7875

7976
Artifact m = mavenEnvironment.resolveArtifact(dependency);
8077
System.out.append("Resolved ").append(dependency.getGroupId()).append(":")

tests/release-test/src/test/java/org/glassfish/jersey/test/artifacts/MultiReleaseTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,16 +37,12 @@ public class MultiReleaseTest {
3737
private static final File localRepository = MavenUtil.getLocalMavenRepository();
3838
private static final Properties properties = MavenUtil.getMavenProperties();
3939

40-
private static final DependencyPair[] jdk11multiRelease = jdk11multiRelease(properties);
41-
private static final DependencyPair[] jdk12multiRelease = jdk12multiRelease(properties);
4240
private static final DependencyPair[] jdk17multiRelease = jdk17multiRelease(properties);
4341
private static final DependencyPair[] jdk21multiRelease = jdk21multiRelease(properties);
4442

4543
@Test
4644
public void testIsJdkMultiRelease() throws IOException, XmlPullParserException {
47-
TestResult result = testJdkVersions("11", jdk11multiRelease);
48-
result.append(testJdkVersions("12", jdk12multiRelease));
49-
result.append(testJdkVersions("17", jdk17multiRelease));
45+
TestResult result = testJdkVersions("17", jdk17multiRelease);
5046
result.append(testJdkVersions("21", jdk21multiRelease));
5147
//Assertions.assertTrue(result.result(), "Some error occurred, see previous messages");
5248
Assert.assertTrue("Some error occurred, see previous messages", result.result());

tests/release-test/src/test/resources/non-bom-pom-deps.xml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2023, 2025 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,45 +32,40 @@
3232
<version>0.0.1-SNAPSHOT</version>
3333

3434
<dependencies>
35-
<dependency>
36-
<groupId>org.glassfish.jersey.media</groupId>
37-
<artifactId>jersey-media-json-jackson1</artifactId>
38-
<version>2.27</version>
39-
</dependency>
4035
<dependency>
4136
<groupId>org.glassfish.jersey.security</groupId>
4237
<artifactId>oauth1-client</artifactId>
43-
<version>2.27</version>
38+
<version>4.0.0-M2</version>
4439
</dependency>
4540
<dependency>
4641
<groupId>org.glassfish.jersey.security</groupId>
4742
<artifactId>oauth1-server</artifactId>
48-
<version>2.27</version>
43+
<version>4.0.0-M2</version>
4944
</dependency>
5045
<dependency>
5146
<groupId>org.glassfish.jersey.security</groupId>
5247
<artifactId>oauth1-signature</artifactId>
53-
<version>2.27</version>
48+
<version>4.0.0-M2</version>
5449
</dependency>
5550
<dependency>
5651
<groupId>org.glassfish.jersey.incubator</groupId>
5752
<artifactId>jersey-injectless-client</artifactId>
58-
<version>2.27</version>
53+
<version>4.0.0-M2</version>
5954
</dependency>
6055
<dependency>
6156
<groupId>org.glassfish.jersey.incubator</groupId>
6257
<artifactId>jersey-open-tracing</artifactId>
63-
<version>2.27</version>
58+
<version>4.0.0-M2</version>
6459
</dependency>
6560
<dependency>
6661
<groupId>org.glassfish.jersey.media</groupId>
6762
<artifactId>jersey-media-kryo</artifactId>
68-
<version>2.27</version>
63+
<version>4.0.0-M2</version>
6964
</dependency>
7065
<dependency>
7166
<groupId>org.glassfish.jersey.ext</groupId>
7267
<artifactId>jersey-declarative-linking</artifactId>
73-
<version>2.27</version>
68+
<version>4.0.0-M2</version>
7469
</dependency>
7570
</dependencies>
7671

0 commit comments

Comments
 (0)