From ff2e36e23943ceea4b583ab87efb351bec587d51 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 25 Aug 2023 09:34:41 +1000
Subject: [PATCH] Jetty 12.0.x fix cache issue with maven invoker (#10393)

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .mvn/maven-build-cache-config.xml                          | 7 -------
 Jenkinsfile                                                | 2 ++
 .../jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml      | 4 ++--
 .../jetty/ee10/webapp/MetaInfConfigurationTest.java        | 3 +++
 pom.xml                                                    | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
index 94b509037bb..fd0e369e6b2 100644
--- a/.mvn/maven-build-cache-config.xml
+++ b/.mvn/maven-build-cache-config.xml
@@ -94,12 +94,5 @@
       </plugins>
     </reconcile>
   </executionControl>
-  <output>
-    <exclude>
-      <patterns>
-        <pattern>.*\.zip</pattern>
-      </patterns>
-    </exclude>
-  </output>
 </cache>
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 0b45920c3f2..77803964105 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -125,6 +125,8 @@ def mavenBuild(jdk, cmdline, mvnName) {
     finally
     {
       junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
+      // debug purpose
+      //sh "cat jetty-ee10/jetty-ee10-maven-plugin/target/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/target/jetty-start-war.out"
     }
   }
 }
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml
index 2c6bd15e5ef..66e2cbcae76 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml
@@ -118,8 +118,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee9.demos</groupId>
-      <artifactId>jetty-ee9-demo-jndi-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee10.demos</groupId>
+      <artifactId>jetty-ee10-demo-jndi-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/MetaInfConfigurationTest.java b/jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/MetaInfConfigurationTest.java
index d86c797282f..6cf334c03ef 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/MetaInfConfigurationTest.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/MetaInfConfigurationTest.java
@@ -40,6 +40,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
@@ -47,8 +48,10 @@ import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.is;
 
 @ExtendWith(WorkDirExtension.class)
+@Isolated("Access static method of FileSystemPool")
 public class MetaInfConfigurationTest
 {
+
     @BeforeEach
     public void beforeEach()
     {
diff --git a/pom.xml b/pom.xml
index 18646f4daed..e426ae4a69e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2103,7 +2103,7 @@
               <execution>
                 <phase>package</phase>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>javadoc-no-fork</goal>
                 </goals>
               </execution>
             </executions>