diff --git a/ChangeLog.md b/ChangeLog.md index 184114d06e..65955fc112 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,13 @@ specific language governing permissions and limitations under the License. --> +**2026-11-17 Arturo Bernal (abernal AT apache DOT org)** + +* _2.12.6-git-03_ + +* Backport of [JSPWIKI-1368](https://issues.apache.org/jira/browse/JSPWIKI-1368): the portable module unpacks the war and copies the wikis when the package is built, so `mvn test` no longer fails on it + + **2026-11-08 Arturo Bernal (abernal AT apache DOT org)** * _2.12.6-git-02_ diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java index 942789eb8e..bf3c4cc44b 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java @@ -69,7 +69,7 @@ public final class Release { *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "02"; + public static final String BUILD = "03"; /** * This is the generic version string you should use when printing out the version. It is of diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml index 893811a2e0..d5cb7877e5 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 + + + +