JPMS Jetty 12 multiversions set properly

Signed-off-by: Maxim Nesen <[email protected]>
senivam · Dec 22, 2023 · 56c6c48 · 56c6c48
1 parent 792b5c6
commit 56c6c48
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 3 deletions.
diff --git 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/...-connector/src/main/java/module-info.java → ...onnector/src/main/java17/module-info.java b/...-connector/src/main/java/module-info.java → ...onnector/src/main/java17/module-info.java
diff --git 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/...etty-http2/src/main/java/module-info.java → ...ty-http2/src/main/java17/module-info.java b/...etty-http2/src/main/java/module-info.java → ...ty-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
@@ -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/...src/main/java11/org/glassfish/jersey/test/jetty/http2/JettyHttp2TestContainerFactory.java b/...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/...etty-http2/src/main/java/module-info.java → ...ty-http2/src/main/java17/module-info.java b/...etty-http2/src/main/java/module-info.java → ...ty-http2/src/main/java17/module-info.java
diff --git a/...est/jetty11/http2/localization.properties → .../test/jetty/http2/localization.properties b/...est/jetty11/http2/localization.properties → .../test/jetty/http2/localization.properties
diff --git a/test-framework/providers/jetty/pom.xml b/test-framework/providers/jetty/pom.xml
@@ -68,6 +68,11 @@
             <build>
                 <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>
@@ -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/...ders/jetty/src/main/java/module-info.java → ...rs/jetty/src/main/java17/module-info.java b/...ders/jetty/src/main/java/module-info.java → ...rs/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/...tty/test/internal/localization.properties → ...st/jetty/internal/localization.properties b/...tty/test/internal/localization.properties → ...st/jetty/internal/localization.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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