This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 6fd567b8b6d1986801e842a69d53c6b19408e65a
Merge: faf66b896 8f92f38ca
Author: Juan Pablo Santos RodrÃguez <juanpablo.san...@gmail.com>
AuthorDate: Fri May 9 20:14:26 2025 +0200
merge branch 'master' into jakarta
ChangeLog.md | 15 ++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../java/org/apache/wiki/cache/CachingManager.java | 9 +++++++
.../apache/wiki/cache/EhcacheCachingManager.java | 19 +++++++++++++++
.../wiki/providers/CachingAttachmentProvider.java | 8 ++++---
.../org/apache/wiki/providers/CachingProvider.java | 8 ++++---
jspwiki-portable/build.xml | 3 ++-
jspwiki-portable/pom.xml | 26 +++++++++++++++++----
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35459 -> 35726 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 52799 -> 52593 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3892373 -> 3903275
bytes
pom.xml | 17 ++++++++++----
13 files changed, 91 insertions(+), 18 deletions(-)
diff --cc pom.xml
index ae56b9ff0,33c2589f7..f54d80187
--- a/pom.xml
+++ b/pom.xml
@@@ -47,8 -47,8 +47,8 @@@
<akismet-java.version>1.02</akismet-java.version>
<awaitility.version>4.2.1</awaitility.version>
<aws-java-sdk-kendra.version>1.12.565</aws-java-sdk-kendra.version>
- <commons-collections.version>4.4</commons-collections.version>
+ <commons-collections.version>4.5.0</commons-collections.version>
- <commons-fileupload.version>1.5</commons-fileupload.version>
+ <commons-fileupload.version>2.0.0-M2</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.19.0</commons-io.version>
<commons-lang.version>3.17.0</commons-lang.version>
@@@ -56,26 -56,21 +56,26 @@@
<ehcache.version>2.10.9.2</ehcache.version>
<flexmark.version>0.64.8</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.11.0</gson.version>
+ <gson.version>2.13.1</gson.version>
<hsqldb.version>2.7.4</hsqldb.version>
+ <jakarta-activation.version>2.0.1</jakarta-activation.version>
+ <jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>
+ <jakarta-jsp-api.version>4.0.0</jakarta-jsp-api.version>
+ <jakarta-jstl.version>3.0.1</jakarta-jstl.version>
+ <jakarta-jstl-api.version>3.0.2</jakarta-jstl-api.version>
+ <jakarta-mail.version>2.0.1</jakarta-mail.version>
+ <jakarta-mail-api.version>2.1.3</jakarta-mail-api.version>
+ <jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
<jamm.version>0.4.0</jamm.version>
<jaxen.version>2.0.0</jaxen.version>
- <javax-jstl.version>1.2</javax-jstl.version>
<javax-mail.version>1.6.2</javax-mail.version>
<javax-jsp-api.version>2.3.3</javax-jsp-api.version>
- <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
<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.12.2</junit.version>
- <log4j2.version>2.24.2</log4j2.version>
+ <log4j2.version>2.24.3</log4j2.version>
<lucene.version>9.12.0</lucene.version>
- <mockito.version>5.16.0</mockito.version>
+ <mockito.version>5.17.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
@@@ -106,7 -102,8 +106,8 @@@
<plugin.surefire.junit5-tree-reporter.version>1.4.0</plugin.surefire.junit5-tree-reporter.version>
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
- <plugin.jspc.version>3.2.2</plugin.jspc.version>
+ <plugin.jspc.version>5.0.0</plugin.jspc.version>
+ <plugin.build-helper.version>3.6.0</plugin.build-helper.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
<plugin.cargo.version>1.10.15</plugin.cargo.version>
