Jetty 12 - Move test JPMS out of main module-info.java (#9203)

* Move test jpms out of main module-info.java * There's no jetty-core/jetty-security anymore
jetty · Jan 26, 2023 · 7f0294d · 7f0294d
1 parent 177fc23
commit 7f0294d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/jetty-core/jetty-jndi/src/main/java/module-info.java b/jetty-core/jetty-jndi/src/main/java/module-info.java
@@ -20,7 +20,6 @@
 
     // Only required if using DataSourceCloser.
     requires static java.sql;
-    // requires static org.eclipse.jetty.security;
 
     exports org.eclipse.jetty.jndi;
     exports org.eclipse.jetty.jndi.java;

diff --git a/jetty-core/jetty-server/pom.xml b/jetty-core/jetty-server/pom.xml
@@ -21,7 +21,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
+            @{argLine} ${jetty.surefire.argLine}
+            --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging
+            --add-reads org.eclipse.jetty.server=java.xml
           </argLine>
         </configuration>
       </plugin>

diff --git a/jetty-core/jetty-server/src/main/java/module-info.java b/jetty-core/jetty-server/src/main/java/module-info.java
@@ -19,9 +19,6 @@
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
 
-    // TODO needed for testing??
-    requires static java.xml;
-
     exports org.eclipse.jetty.server;
     exports org.eclipse.jetty.server.handler;
     exports org.eclipse.jetty.server.handler.gzip;
@@ -31,7 +28,4 @@
 
     exports org.eclipse.jetty.server.jmx to
          org.eclipse.jetty.jmx;
-
-    // TODO required for testing ????
-    exports org.eclipse.jetty.server.ssl;
 }
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/FixJPMS.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/FixJPMS.java