From a6005061559d00bc9b6190165aab961fd1ae9991 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 5 Feb 2023 16:08:11 +1000
Subject: [PATCH] fix merge

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml | 13 -------------
 jetty-core/jetty-io/pom.xml                     | 13 -------------
 2 files changed, 26 deletions(-)

diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
index 097a8d4f9fe..d7072d177ef 100644
--- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
+++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
@@ -62,17 +62,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <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>
 </project>
diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml
index 83c2cceb5b6..db2938b2ba2 100644
--- a/jetty-core/jetty-io/pom.xml
+++ b/jetty-core/jetty-io/pom.xml
@@ -49,17 +49,4 @@
       <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>