You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2026/05/29 18:24:02 UTC
(jspwiki) branch master-2.x updated (a29b257d8 -> 0339af0b1)
This is an automated email from the ASF dual-hosted git repository.
juanpablo-santos pushed a change to branch master-2.x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from a29b257d8 Sanitize link parameter in Image plugin
new ffa96f793 Update dependencies
new 0339af0b1 2.12.5-git-01
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 15 ++++++++++++++-
LICENSE | 6 +++---
.../src/main/java/org/apache/wiki/api/Release.java | 4 ++--
pom.xml | 6 +++---
4 files changed, 22 insertions(+), 9 deletions(-)
(jspwiki) 02/02: 2.12.5-git-01
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo-santos pushed a commit to branch master-2.x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 0339af0b1523f6c9fd80893ebe10731075ee68bb
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Fri May 29 20:23:32 2026 +0200
2.12.5-git-01
---
ChangeLog.md | 15 ++++++++++++++-
.../src/main/java/org/apache/wiki/api/Release.java | 4 ++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 1e2a2574e..5c8bdddb1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,13 +17,26 @@ specific language governing permissions and limitations
under the License.
-->
+**2026-05-28 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.5-git-01_
+
+* Backport Sanitize `link` parameter in `Image` plugin
+
+* Dependency updates
+ * JUnit to 5.14.4
+ * Mockito to 5.23.0
+ * Tomcat to 9.0.118
+
**2026-03-07 Alex O'Ree (alexoree AT apache DOT org)**
+
* _2.12.4-git-01_
* Backport of [JSPWIKI-1271](https://issues.apache.org/jira/browse/JSPWIKI-1271)
+
* Backport of [JSPWIKI-1270](https://issues.apache.org/jira/browse/JSPWIKI-1270)
-* Backport of [JSPWIKI-75](https://issues.apache.org/jira/browse/JSPWIKI-75)
+* Backport of [JSPWIKI-75](https://issues.apache.org/jira/browse/JSPWIKI-75)
**2025-07-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
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 ed4bb40e7..25c2a376a 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
@@ -50,7 +50,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "-git-01";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -59,7 +59,7 @@ public final class Release {
public static final int REVISION = 12;
/** The minor revision. */
- public static final int MINORREVISION = 4;
+ public static final int MINORREVISION = 5;
/** The build number/identifier. This is a String as opposed to an integer, just so that people can add other identifiers to it.
* The build number is incremented every time a committer checks in code, and reset when a release is made.
(jspwiki) 01/02: Update dependencies
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo-santos pushed a commit to branch master-2.x
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit ffa96f793155b16e31486f191d9169ac54271a8b
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Fri May 29 20:23:06 2026 +0200
Update dependencies
---
LICENSE | 6 +++---
pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9500ddea5..9e959771d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -288,8 +288,8 @@ hsqldb-2.7.4.jar ./jspwiki-war/src/main/config/doc/LI
sqltool-2.7.4.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
jamm-0.4.0.jar LICENSE
jetty-all-9.4.54.v20240208.jar LICENSE
-junit-5.13.4 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-5.18.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+junit-5.14.4 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
+mockito-core-5.23.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
@@ -306,7 +306,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.107 LICENSE
+Apache Tomcat 9.0.118 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
diff --git a/pom.xml b/pom.xml
index 0d543004c..f7e8160a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,10 +67,10 @@
<jdom2.version>2.0.6</jdom2.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
- <junit.version>5.13.4</junit.version>
+ <junit.version>5.14.4</junit.version>
<log4j2.version>2.25.1</log4j2.version>
<lucene.version>9.12.2</lucene.version>
- <mockito.version>5.18.0</mockito.version>
+ <mockito.version>5.23.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
@@ -78,7 +78,7 @@
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>3.2.1</tika.version>
- <tomcat.version>9.0.107</tomcat.version>
+ <tomcat.version>9.0.118</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
<xstream.version>1.4.21</xstream.version>