JPMS Jetty 12 multiversions set properly Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/jetty-http2-connector/pom.xml b/connectors/jetty-http2-connector/pom.xml index efede54..2ace413 100644 --- a/connectors/jetty-http2-connector/pom.xml +++ b/connectors/jetty-http2-connector/pom.xml
@@ -143,6 +143,7 @@ <configuration> <testExcludes> <testExclude>org/glassfish/jersey/jetty/http2/connector/*.java</testExclude> + <testExclude>module-info.java</testExclude> </testExcludes> </configuration> </plugin>
diff --git a/connectors/jetty-http2-connector/src/main/java/module-info.java b/connectors/jetty-http2-connector/src/main/java17/module-info.java similarity index 100% rename from connectors/jetty-http2-connector/src/main/java/module-info.java rename to connectors/jetty-http2-connector/src/main/java17/module-info.java
diff --git a/containers/jetty-http2/pom.xml b/containers/jetty-http2/pom.xml index ece6322..3ccd66f 100644 --- a/containers/jetty-http2/pom.xml +++ b/containers/jetty-http2/pom.xml
@@ -151,6 +151,7 @@ <configuration> <testExcludes> <testExclude>org/glassfish/jersey/jetty/http2/*.java</testExclude> + <testExclude>module-info.java</testExclude> </testExcludes> </configuration> </plugin>
diff --git a/containers/jetty-http2/src/main/java/module-info.java b/containers/jetty-http2/src/main/java17/module-info.java similarity index 100% rename from containers/jetty-http2/src/main/java/module-info.java rename to containers/jetty-http2/src/main/java17/module-info.java
diff --git a/test-framework/providers/jetty-http2/pom.xml b/test-framework/providers/jetty-http2/pom.xml index 2d19c0f..310e176 100644 --- a/test-framework/providers/jetty-http2/pom.xml +++ b/test-framework/providers/jetty-http2/pom.xml
@@ -86,9 +86,15 @@ <configuration> <testExcludes> <testExclude>org/glassfish/jersey/test/jetty/http2/*.java</testExclude> + <testExclude>module-info.java</testExclude> </testExcludes> </configuration> </plugin> + <plugin> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-maven-plugin</artifactId> + <inherited>true</inherited> + </plugin> </plugins> </build> </profile>
diff --git a/test-framework/providers/jetty-http2/src/main/java11/org/glassfish/jersey/test/jetty/http2/JettyHttp2TestContainerFactory.java b/test-framework/providers/jetty-http2/src/main/java11/org/glassfish/jersey/test/jetty/http2/JettyHttp2TestContainerFactory.java index 44fa02a..e8b4a3e 100644 --- a/test-framework/providers/jetty-http2/src/main/java11/org/glassfish/jersey/test/jetty/http2/JettyHttp2TestContainerFactory.java +++ b/test-framework/providers/jetty-http2/src/main/java11/org/glassfish/jersey/test/jetty/http2/JettyHttp2TestContainerFactory.java
@@ -17,7 +17,6 @@ package org.glassfish.jersey.test.jetty.http2; import jakarta.ws.rs.ProcessingException; -import org.glassfish.jersey.jetty.http2.LocalizationMessages; import org.glassfish.jersey.test.DeploymentContext; import org.glassfish.jersey.test.spi.TestContainer; import org.glassfish.jersey.test.spi.TestContainerFactory;
diff --git a/test-framework/providers/jetty-http2/src/main/java/module-info.java b/test-framework/providers/jetty-http2/src/main/java17/module-info.java similarity index 100% rename from test-framework/providers/jetty-http2/src/main/java/module-info.java rename to test-framework/providers/jetty-http2/src/main/java17/module-info.java
diff --git a/test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty11/http2/localization.properties b/test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty/http2/localization.properties similarity index 100% rename from test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty11/http2/localization.properties rename to test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty/http2/localization.properties
diff --git a/test-framework/providers/jetty/pom.xml b/test-framework/providers/jetty/pom.xml index ea1bb3a..00b598d 100644 --- a/test-framework/providers/jetty/pom.xml +++ b/test-framework/providers/jetty/pom.xml
@@ -69,6 +69,11 @@ <directory>${java11.build.outputDirectory}</directory> <plugins> <plugin> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-maven-plugin</artifactId> + <inherited>true</inherited> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -91,6 +96,7 @@ <configuration> <testExcludes> <testExclude>org/glassfish/jersey/test/jetty/*.java</testExclude> + <testExclude>module-info.java</testExclude> </testExcludes> </configuration> </plugin>
diff --git a/test-framework/providers/jetty/src/main/java/module-info.java b/test-framework/providers/jetty/src/main/java17/module-info.java similarity index 96% rename from test-framework/providers/jetty/src/main/java/module-info.java rename to test-framework/providers/jetty/src/main/java17/module-info.java index 8f4fa25..7d43bf5 100644 --- a/test-framework/providers/jetty/src/main/java/module-info.java +++ b/test-framework/providers/jetty/src/main/java17/module-info.java
@@ -17,7 +17,6 @@ module org.glassfish.jersey.tests.framework.provider.jetty { requires java.logging; -// requires jakarta.servlet; requires jakarta.ws.rs; requires org.eclipse.jetty.server;
diff --git a/test-framework/providers/jetty/src/main/resources/org/glassfish/jersey/jetty/test/internal/localization.properties b/test-framework/providers/jetty/src/main/resources/org/glassfish/jersey/jetty/test/internal/localization.properties deleted file mode 100644 index 6504f0e..0000000 --- a/test-framework/providers/jetty/src/main/resources/org/glassfish/jersey/jetty/test/internal/localization.properties +++ /dev/null
@@ -1,18 +0,0 @@ -# -# Copyright (c) 2020, 2023 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 -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -# {0} - status code; {1} - status reason message -not.supported=Jetty container is not supported on JDK version less than 17.
diff --git a/test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty11/http2/localization.properties b/test-framework/providers/jetty/src/main/resources/org/glassfish/jersey/test/jetty/internal/localization.properties similarity index 100% copy from test-framework/providers/jetty-http2/src/main/resources/org/glassfish/jersey/test/jetty11/http2/localization.properties copy to test-framework/providers/jetty/src/main/resources/org/glassfish/jersey/test/jetty/internal/localization.properties