Adjust build profiles to the current JDK
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
index b45036b..5924fda 100644
--- a/connectors/jetty-connector/pom.xml
+++ b/connectors/jetty-connector/pom.xml
@@ -124,10 +124,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>9</source>
- <target>9</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/connectors/netty-connector/pom.xml b/connectors/netty-connector/pom.xml
index 5a40f3a..64e7d35 100644
--- a/connectors/netty-connector/pom.xml
+++ b/connectors/netty-connector/pom.xml
@@ -40,6 +40,8 @@
--add-opens org.glassfish.jersey.core.common/org.glassfish.jersey.innate.virtual=ALL-UNNAMED
--add-opens java.base/java.lang=org.glassfish.jersey.netty.connector
--add-opens java.base/java.lang.reflect=org.glassfish.jersey.netty.connector
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.lang.reflect=ALL-UNNAMED
--add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate=ALL-UNNAMED
--add-modules=ALL-MODULE-PATH
</surefire.coverage.argline>
@@ -100,26 +102,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>JettyExclude</id>
- <activation>
- <jdk>(1.8,17)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>org/glassfish/jersey/netty/connector/HugeHeaderTest.java</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 975c614..751659a 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -79,16 +79,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>HelidonConnector</id>
- <!-- TODO: activate after Helidon is jakartified -->
- <!--<activation>
- <jdk>11</jdk>
- </activation>-->
- <modules>
- <module>helidon-connector</module>
- </modules>
- </profile>
- </profiles>
</project>
diff --git a/containers/jersey-servlet/src/main/java/module-info.java b/containers/jersey-servlet/src/main/java/module-info.java
index 025fe3e..0410708 100644
--- a/containers/jersey-servlet/src/main/java/module-info.java
+++ b/containers/jersey-servlet/src/main/java/module-info.java
@@ -28,7 +28,7 @@
exports org.glassfish.jersey.servlet.async;
exports org.glassfish.jersey.servlet.init;
- exports org.glassfish.jersey.servlet.internal;
+// exports org.glassfish.jersey.servlet.internal;
exports org.glassfish.jersey.servlet.spi;
exports org.glassfish.jersey.servlet;
diff --git a/examples/osgi-helloworld-webapp/pom.xml b/examples/osgi-helloworld-webapp/pom.xml
index 511634a..8bdef3d 100644
--- a/examples/osgi-helloworld-webapp/pom.xml
+++ b/examples/osgi-helloworld-webapp/pom.xml
@@ -25,21 +25,16 @@
<name>jersey-examples-osgi-helloworld-webapp</name>
<packaging>pom</packaging>
+ <modules>
+ <module>war-bundle</module>
+ <module>functional-test</module>
+ <module>lib-bundle</module>
+ <module>additional-bundle</module>
+ <module>alternate-version-bundle</module>
+ </modules>
+
<profiles>
<profile>
- <id>securityOn</id>
- <activation>
- <jdk>[11,24)</jdk>
- </activation>
- <modules>
- <module>war-bundle</module>
- <module>functional-test</module>
- <module>lib-bundle</module>
- <module>additional-bundle</module>
- <module>alternate-version-bundle</module>
- </modules>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/ext/microprofile/mp-config/pom.xml b/ext/microprofile/mp-config/pom.xml
index d39a645..37bdc7a 100644
--- a/ext/microprofile/mp-config/pom.xml
+++ b/ext/microprofile/mp-config/pom.xml
@@ -81,6 +81,13 @@
</dependency>
<dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${smallrye.config.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
@@ -118,20 +125,6 @@
<profiles>
<profile>
- <id>smallrye-dependency</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>io.smallrye.config</groupId>
- <artifactId>smallrye-config</artifactId>
- <version>${smallrye.config.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>helidon-config-dependency</id>
<activation>
<jdk>[21,)</jdk>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index 4cf0839..c6deb93 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -35,6 +35,13 @@
Jersey support for declarative hyperlinking.
</description>
+ <properties>
+ <surefire.coverage.argline>
+ --add-opens java.base/java.util.zip=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED
+ </surefire.coverage.argline>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -123,16 +130,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>InaccessibleObjectException</id>
- <activation><jdk>[16,)</jdk></activation>
- <properties>
- <surefire.coverage.argline>
- --add-opens java.base/java.util.zip=ALL-UNNAMED
- --add-opens java.base/java.util=ALL-UNNAMED
- </surefire.coverage.argline>
- </properties>
- </profile>
</profiles>
<!--<properties>
diff --git a/tests/e2e-jdk-specifics/pom.xml b/tests/e2e-jdk-specifics/pom.xml
index b665f20..c31dc24 100644
--- a/tests/e2e-jdk-specifics/pom.xml
+++ b/tests/e2e-jdk-specifics/pom.xml
@@ -32,6 +32,10 @@
<description>Jersey E2E tests for testing JDK 17+ specifics</description>
+ <properties>
+ <http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -74,25 +78,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk15-</id>
- <activation>
- <jdk>[8, 16)</jdk>
- </activation>
- <properties>
- <http.patch.addopens> </http.patch.addopens>
- </properties>
- </profile>
- <profile>
- <id>jdk16+</id>
- <activation>
- <jdk>[16, )</jdk>
- </activation>
- <properties>
- <http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml
index f874d34..526e872 100644
--- a/tests/e2e-server/pom.xml
+++ b/tests/e2e-server/pom.xml
@@ -231,34 +231,6 @@
<profiles>
<profile>
- <id>JettyTestExclude</id>
- <activation>
- <jdk>[11,17)</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/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
index 13f01a4..f146d44 100644
--- a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
+++ b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,7 +23,6 @@
import jakarta.inject.Singleton;
-import org.glassfish.jersey.servlet.internal.ResponseWriter;
import org.glassfish.jersey.tests.integration.jersey2730.exception.MappedException;
import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedException;
import org.glassfish.jersey.tests.integration.jersey2730.exception.UnmappedRuntimeException;
@@ -90,7 +89,7 @@
case TIMED_WAITING:
case WAITING:
for (StackTraceElement stackTraceElement : lastProcessingThread.getStackTrace()) {
- if (ResponseWriter.class.getName().equals(stackTraceElement.getClassName())) {
+ if ("ResponseWriter".equals(stackTraceElement.getClassName())) {
return true;
}
}
diff --git a/tests/integration/jersey-5796/pom.xml b/tests/integration/jersey-5796/pom.xml
index 45a371c..437fb7f 100644
--- a/tests/integration/jersey-5796/pom.xml
+++ b/tests/integration/jersey-5796/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>3.1.99-SNAPSHOT</version>
+ <version>4.0.99-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tests/integration/microprofile/config/helidon/pom.xml b/tests/integration/microprofile/config/helidon/pom.xml
index 3822b47..1948dc3 100644
--- a/tests/integration/microprofile/config/helidon/pom.xml
+++ b/tests/integration/microprofile/config/helidon/pom.xml
@@ -57,6 +57,12 @@
<type>pom</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${smallrye.config.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -80,20 +86,6 @@
<profiles>
<profile>
- <id>smallrye-dependency</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>io.smallrye.config</groupId>
- <artifactId>smallrye-config</artifactId>
- <version>${smallrye.config.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>helidon-config-dependency</id>
<activation>
<jdk>[21,)</jdk>
diff --git a/tests/integration/microprofile/rest-client/pom.xml b/tests/integration/microprofile/rest-client/pom.xml
index 6f61a81..d65bd38 100644
--- a/tests/integration/microprofile/rest-client/pom.xml
+++ b/tests/integration/microprofile/rest-client/pom.xml
@@ -67,47 +67,16 @@
<artifactId>jersey-weld2-se</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${smallrye.config.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
- <id>TestExclude</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>org/glassfish/jersey/test/microprofile/restclient/ConsumesAndProducesTest.java</testExclude>
- <testExclude>org/glassfish/jersey/test/microprofile/restclient/ConnectorTest.java</testExclude>
- <testExclude>org/glassfish/jersey/test/microprofile/restclient/InboundHeadersProviderTest.java</testExclude>
- <testExclude>org/glassfish/jersey/test/microprofile/restclient/RestClientModelTest.java</testExclude>
- <testExclude>org/glassfish/jersey/restclient/PathParamTest.java</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>smallrye-dependency</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>io.smallrye.config</groupId>
- <artifactId>smallrye-config</artifactId>
- <version>${smallrye.config.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>securityOff</id>
<activation>
<jdk>[24,)</jdk>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index b28596f..48ce07a 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -94,6 +94,7 @@
<module>jersey-4722</module>
<module>jersey-4949</module>
<module>jersey-5087</module>
+ <module>jersey-5796</module>
<module>microprofile</module>
<module>property-check</module>
<module>reactive-streams</module>
diff --git a/tests/pom.xml b/tests/pom.xml
index 01fdcf0..82e071d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -117,15 +117,6 @@
</build>
</profile>
<profile>
- <id>JDK17+</id>
- <activation>
- <jdk>[17,)</jdk>
- </activation>
- <modules>
- <module>version-agnostic</module>
- </modules>
- </profile>
- <profile>
<id>JMOCKIT-MODULE-FOR-PRE-JDK24</id>
<activation>
<jdk>[11,24)</jdk>
