Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down
2 changes: 1 addition & 1 deletion jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public final class Release {
* <p>
* 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
Expand Down
106 changes: 53 additions & 53 deletions jspwiki-portable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,62 +116,13 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>woas:copy-woas</id>
<phase>process-resources</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-woas" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>woas:copy-tomcat</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>woas:copy-launchers</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-launchers" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!-- Unpack the JSP Wiki web archive -->
<execution>
<id>unpack-jspwiki-war</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -190,7 +141,7 @@
<!-- Unpack the JSP Wiki Pages for the "personal" wiki -->
<execution>
<id>unpack-wikipages-personal</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -209,7 +160,7 @@
<!-- Unpack the JSP Wiki Pages for the "department" wiki -->
<execution>
<id>unpack-wikipages-department</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -228,7 +179,7 @@
<!-- Unpack the tomcat distribution -->
<execution>
<id>unpack-tomcat-zip</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -246,6 +197,55 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>woas:copy-woas</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-woas" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>woas:copy-tomcat</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>woas:copy-launchers</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-launchers" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down