Skip to content

Commit daf4a16

Browse files
senivamsenivam
committed
Adjust build profiles to the current JDK
Signed-off-by: Maxim Nesen <[email protected]>
1 parent 861c5f8 commit daf4a16

File tree

15 files changed

+45
-189
lines changed

15 files changed

+45
-189
lines changed

‎connectors/jetty-connector/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@
124124
<plugin>
125125
<groupId>org.apache.maven.plugins</groupId>
126126
<artifactId>maven-compiler-plugin</artifactId>
127-
<configuration>
128-
<source>9</source>
129-
<target>9</target>
130-
</configuration>
131127
</plugin>
132128
<plugin>
133129
<groupId>org.apache.felix</groupId>

‎connectors/netty-connector/pom.xml‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
--add-opens org.glassfish.jersey.core.common/org.glassfish.jersey.innate.virtual=ALL-UNNAMED
4141
--add-opens java.base/java.lang=org.glassfish.jersey.netty.connector
4242
--add-opens java.base/java.lang.reflect=org.glassfish.jersey.netty.connector
43+
--add-opens java.base/java.lang=ALL-UNNAMED
44+
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
4345
--add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate=ALL-UNNAMED
4446
--add-modules=ALL-MODULE-PATH
4547
</surefire.coverage.argline>
@@ -100,26 +102,4 @@
100102
</plugin>
101103
</plugins>
102104
</build>
103-
104-
<profiles>
105-
<profile>
106-
<id>JettyExclude</id>
107-
<activation>
108-
<jdk>(1.8,17)</jdk>
109-
</activation>
110-
<build>
111-
<plugins>
112-
<plugin>
113-
<groupId>org.apache.maven.plugins</groupId>
114-
<artifactId>maven-compiler-plugin</artifactId>
115-
<configuration>
116-
<testExcludes>
117-
<testExclude>org/glassfish/jersey/netty/connector/HugeHeaderTest.java</testExclude>
118-
</testExcludes>
119-
</configuration>
120-
</plugin>
121-
</plugins>
122-
</build>
123-
</profile>
124-
</profiles>
125105
</project>

‎connectors/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,4 @@
7979
</dependency>
8080
</dependencies>
8181

82-
<profiles>
83-
<profile>
84-
<id>HelidonConnector</id>
85-
<!-- TODO: activate after Helidon is jakartified -->
86-
<!--<activation>
87-
<jdk>11</jdk>
88-
</activation>-->
89-
<modules>
90-
<module>helidon-connector</module>
91-
</modules>
92-
</profile>
93-
</profiles>
9482
</project>

‎containers/jersey-servlet/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
exports org.glassfish.jersey.servlet.async;
3030
exports org.glassfish.jersey.servlet.init;
31-
exports org.glassfish.jersey.servlet.internal;
31+
// exports org.glassfish.jersey.servlet.internal;
3232
exports org.glassfish.jersey.servlet.spi;
3333
exports org.glassfish.jersey.servlet;
3434

‎examples/osgi-helloworld-webapp/pom.xml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,15 @@
2525
<name>jersey-examples-osgi-helloworld-webapp</name>
2626
<packaging>pom</packaging>
2727

28+
<modules>
29+
<module>war-bundle</module>
30+
<module>functional-test</module>
31+
<module>lib-bundle</module>
32+
<module>additional-bundle</module>
33+
<module>alternate-version-bundle</module>
34+
</modules>
35+
2836
<profiles>
29-
<profile>
30-
<id>securityOn</id>
31-
<activation>
32-
<jdk>[11,24)</jdk>
33-
</activation>
34-
<modules>
35-
<module>war-bundle</module>
36-
<module>functional-test</module>
37-
<module>lib-bundle</module>
38-
<module>additional-bundle</module>
39-
<module>alternate-version-bundle</module>
40-
</modules>
41-
</profile>
4237
<profile>
4338
<id>pre-release</id>
4439
<build>

‎ext/microprofile/mp-config/pom.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
<scope>test</scope>
8181
</dependency>
8282

83+
<dependency>
84+
<groupId>io.smallrye.config</groupId>
85+
<artifactId>smallrye-config</artifactId>
86+
<version>${smallrye.config.version}</version>
87+
<scope>test</scope>
88+
</dependency>
89+
8390
<dependency>
8491
<groupId>org.junit.jupiter</groupId>
8592
<artifactId>junit-jupiter</artifactId>
@@ -117,20 +124,6 @@
117124
</build>
118125

119126
<profiles>
120-
<profile>
121-
<id>smallrye-dependency</id>
122-
<activation>
123-
<jdk>[11,)</jdk>
124-
</activation>
125-
<dependencies>
126-
<dependency>
127-
<groupId>io.smallrye.config</groupId>
128-
<artifactId>smallrye-config</artifactId>
129-
<version>${smallrye.config.version}</version>
130-
<scope>test</scope>
131-
</dependency>
132-
</dependencies>
133-
</profile>
134127
<profile>
135128
<id>helidon-config-dependency</id>
136129
<activation>

‎incubator/declarative-linking/pom.xml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535
Jersey support for declarative hyperlinking.
3636
</description>
3737

38+
<properties>
39+
<surefire.coverage.argline>
40+
--add-opens java.base/java.util.zip=ALL-UNNAMED
41+
--add-opens java.base/java.util=ALL-UNNAMED
42+
</surefire.coverage.argline>
43+
</properties>
44+
3845
<dependencies>
3946
<dependency>
4047
<groupId>org.glassfish.jersey.core</groupId>
@@ -123,16 +130,6 @@
123130
</dependency>
124131
</dependencies>
125132
</profile>
126-
<profile>
127-
<id>InaccessibleObjectException</id>
128-
<activation><jdk>[16,)</jdk></activation>
129-
<properties>
130-
<surefire.coverage.argline>
131-
--add-opens java.base/java.util.zip=ALL-UNNAMED
132-
--add-opens java.base/java.util=ALL-UNNAMED
133-
</surefire.coverage.argline>
134-
</properties>
135-
</profile>
136133
</profiles>
137134

138135
<!--<properties>

‎tests/e2e-jdk-specifics/pom.xml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
<description>Jersey E2E tests for testing JDK 17+ specifics</description>
3434

35+
<properties>
36+
<http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
37+
</properties>
38+
3539
<build>
3640
<plugins>
3741
<plugin>
@@ -74,25 +78,4 @@
7478
</dependency>
7579
</dependencies>
7680

77-
<profiles>
78-
<profile>
79-
<id>jdk15-</id>
80-
<activation>
81-
<jdk>[8, 16)</jdk>
82-
</activation>
83-
<properties>
84-
<http.patch.addopens> </http.patch.addopens>
85-
</properties>
86-
</profile>
87-
<profile>
88-
<id>jdk16+</id>
89-
<activation>
90-
<jdk>[16, )</jdk>
91-
</activation>
92-
<properties>
93-
<http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
94-
</properties>
95-
</profile>
96-
</profiles>
97-
9881
</project>

‎tests/e2e-server/pom.xml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -230,34 +230,6 @@
230230
</dependencies>
231231

232232
<profiles>
233-
<profile>
234-
<id>JettyTestExclude</id>
235-
<activation>
236-
<jdk>[11,17)</jdk>
237-
</activation>
238-
<build>
239-
<plugins>
240-
<plugin>
241-
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-compiler-plugin</artifactId>
243-
<executions>
244-
<execution>
245-
<id>default-testCompile</id>
246-
<phase>test-compile</phase>
247-
<configuration>
248-
<testExcludes>
249-
<testExclude>org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java</testExclude>
250-
</testExcludes>
251-
</configuration>
252-
<goals>
253-
<goal>testCompile</goal>
254-
</goals>
255-
</execution>
256-
</executions>
257-
</plugin>
258-
</plugins>
259-
</build>
260-
</profile>
261233
<profile>
262234
<id>xdk</id>
263235
<properties>

‎tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 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
@@ -23,7 +23,6 @@
2323

2424
import jakarta.inject.Singleton;
2525

26-
import org.glassfish.jersey.servlet.internal.ResponseWriter;
2726
import org.glassfish.jersey.tests.integration.jersey2730.exception.MappedException;
2827
import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedException;
2928
import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedRuntimeException;
@@ -90,7 +89,7 @@ public boolean lastThreadStuckRpc() {
9089
case TIMED_WAITING:
9190
case WAITING:
9291
for (StackTraceElement stackTraceElement : lastProcessingThread.getStackTrace()) {
93-
if (ResponseWriter.class.getName().equals(stackTraceElement.getClassName())) {
92+
if ("ResponseWriter".equals(stackTraceElement.getClassName())) {
9493
return true;
9594
}
9695
}

0 commit comments

Comments
 (0)