Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8 (#9255)

jetty · Feb 5, 2023 · 44cd3ee · 44cd3ee
1 parent 9916706
commit 44cd3ee
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 5 deletions.
diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml
@@ -23,7 +23,8 @@
           <argLine>
             @{argLine} ${jetty.surefire.argLine}
             --add-modules org.eclipse.jetty.jmx
-            --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http
+            --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api
+            --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>

diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
@@ -14,6 +14,20 @@
     <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine}
+            --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/jetty-core/jetty-http/pom.xml b/jetty-core/jetty-http/pom.xml
@@ -99,6 +99,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>

diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml
@@ -12,6 +12,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules jetty.servlet.api
+            --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api
+            --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>h2spec-maven-plugin</artifactId>

diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml
@@ -49,4 +49,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml
@@ -26,6 +26,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>

diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml
@@ -20,7 +20,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus
+            @{argLine} ${jetty.surefire.argLine} 
+            --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging 
+            --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus
           </argLine>
         </configuration>
       </plugin>

diff --git a/jetty-ee10/jetty-ee10-servlets/pom.xml b/jetty-ee10/jetty-ee10-servlets/pom.xml
@@ -22,7 +22,16 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-modules jakarta.servlet --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules jakarta.servlet 
+            --add-modules org.eclipse.jetty.util
+            --add-modules org.eclipse.jetty.io
+            --add-modules org.eclipse.jetty.http
+            --add-modules org.eclipse.jetty.server
+            --add-modules org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.servlets=java.management
+            --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>

diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml
@@ -21,7 +21,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.nested=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.ee9.nested=org.eclipse.jetty.logging 
+            --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
+            --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>

diff --git a/pom.xml b/pom.xml
@@ -150,7 +150,7 @@
     <maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>
     <maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
     <maven.site.plugin.version>3.12.0</maven.site.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.0.0-M8</maven.surefire.plugin.version>
     <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
     <maven.war.plugin.version>3.3.2</maven.war.plugin.version>
     <spotbugs.maven.plugin.version>4.7.2.0</spotbugs.maven.plugin.version>