From f4b8d76ba44526a1e1ce38d0a4293fad9d48b86c Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Tue, 17 Nov 2026 06:41:05 +0100 Subject: [PATCH] Unpack the war of the portable module only when the war has been packaged jspwiki-portable unpacked the war of jspwiki-war, the wikipages and Tomcat in the generate-resources phase, and copied the exploded war in process-resources. mvn test does not package the war, so the build stopped at the unpack with MDEP-98. The unpacks and the copy now run in prepare-package, unpack first, which is when the war exists. The portable zip is the same as before. --- jspwiki-portable/pom.xml | 106 +++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml index 32b4f3b331..636e997723 100644 --- a/jspwiki-portable/pom.xml +++ b/jspwiki-portable/pom.xml @@ -116,62 +116,13 @@ - - maven-antrun-plugin - - - woas:copy-woas - process-resources - - - - - - - - - - run - - - - woas:copy-tomcat - prepare-package - - - - - - - - - run - - - - woas:copy-launchers - prepare-package - - - - - - - - - - run - - - - maven-dependency-plugin unpack-jspwiki-war - generate-resources + prepare-package unpack @@ -190,7 +141,7 @@ unpack-wikipages-personal - generate-resources + prepare-package unpack @@ -209,7 +160,7 @@ unpack-wikipages-department - generate-resources + prepare-package unpack @@ -228,7 +179,7 @@ unpack-tomcat-zip - generate-resources + prepare-package unpack @@ -246,6 +197,55 @@ + + maven-antrun-plugin + + + woas:copy-woas + prepare-package + + + + + + + + + + run + + + + woas:copy-tomcat + prepare-package + + + + + + + + + run + + + + woas:copy-launchers + prepare-package + + + + + + + + + + run + + + +