Drop JDK 11 profiles Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index e8cf5c0..796403e 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml
@@ -146,30 +146,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>jdk11</id> - <activation> - <jdk>[11,17)</jdk> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>default-testCompile</id> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> </project>
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml index ccc2999..49f88a1 100644 --- a/examples/osgi-http-service/functional-test/pom.xml +++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v. 1.0, which is available at @@ -18,7 +18,7 @@ <parent> <groupId>org.glassfish.jersey.examples</groupId> <artifactId>osgi-http-service</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.glassfish.jersey.examples.osgi-http-service</groupId> @@ -159,6 +159,11 @@ <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.angus</groupId> + <artifactId>angus-activation</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -233,38 +238,6 @@ <profiles> <profile> - <id>testsJdk11</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.eclipse.angus</groupId> - <artifactId>angus-activation</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdk8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/GrizzlyHttpServiceFelixTest.java</exclude> - <exclude>**/JettyHttpServiceFelixTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>release</id> <!-- do not create source zip bundles --> <build>
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 8555e68..a18bcb9 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml
@@ -209,150 +209,19 @@ <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.connectors</groupId> + <artifactId>jersey-jetty-connector</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-jetty</artifactId> + </dependency> </dependencies> <profiles> <profile> - <id>Jetty12Default</id> - <activation> - <jdk>[17,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.glassfish.jersey.connectors</groupId> - <artifactId>jersey-jetty-connector</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-jetty</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>Jetty11JDK11</id> - <activation> - <jdk>[11,17)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.glassfish.jersey.connectors</groupId> - <artifactId>jersey-jetty11-connector</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>${jetty11.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty11.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty11.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty11.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - </dependencies> - <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/client/connector/proxy/Proxy*Test.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.java</testExclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <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/client/connector/proxy/Proxy*Test.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.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-tls/pom.xml b/tests/e2e-tls/pom.xml index 6498b05..f59026b 100644 --- a/tests/e2e-tls/pom.xml +++ b/tests/e2e-tls/pom.xml
@@ -115,26 +115,16 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-osgi</artifactId> + <scope>test</scope> + </dependency> </dependencies> - <profiles> - <profile> - <id>jdk11+</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-osgi</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <!-- https://bugs.openjdk.java.net/browse/JDK-8211426 --> - <surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline> - </properties> - </profile> - </profiles> + <properties> + <!-- https://bugs.openjdk.java.net/browse/JDK-8211426 --> + <surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline> + </properties> </project>
diff --git a/tests/pom.xml b/tests/pom.xml index 7bc93fe..299e542 100644 --- a/tests/pom.xml +++ b/tests/pom.xml
@@ -49,8 +49,10 @@ <module>jmockit</module> <module>mem-leaks</module> <module>osgi</module> - <module>stress</module> + <module>release-test</module> <module>performance</module> + <module>stress</module> + <module>version-agnostic</module> </modules> <dependencyManagement> @@ -114,23 +116,5 @@ <build> </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> - </activation> - <modules> - <module>version-agnostic</module> - </modules> - </profile> </profiles> </project>