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 10695bcf44cb6037cff85f7c1ff5a9dd52b47aa6 Merge: c0a1cf51b 7f8cb4db6 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Sat Sep 27 14:43:27 2025 +0200 merge branch 'master' into jakarta ChangeLog.md | 39 ++++++++++++++++++ LICENSE | 44 ++++++++++----------- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../WikiBootstrapServletContextListener.java | 13 +++++- .../WikiBootstrapServletContextListenerTest.java | 2 - .../main/java/org/apache/wiki/ajax/AjaxUtil.java | 5 +++ .../main/resources/templates/default_es.properties | 10 ++--- .../apache/wiki/auth/DefaultUserManagerTest.java | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35726 -> 35725 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 52593 -> 52628 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3903275 -> 3909593 bytes pom.xml | 30 +++++++------- 12 files changed, 99 insertions(+), 48 deletions(-) diff --cc LICENSE index 1199486a9,9500ddea5..c22f264a5 --- a/LICENSE +++ b/LICENSE @@@ -288,9 -288,10 +288,9 @@@ hsqldb-2.7.4.ja 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.12.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl - mockito-core-5.16.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit + 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 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 JS LIBRARY LICENSE FILE diff --cc jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java index 65073d309,4b2b85e1b..07de185c4 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java @@@ -24,12 -24,10 +24,10 @@@ import org.junit.jupiter.api.extension. import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import java.util.Properties; - import static org.junit.jupiter.api.Assertions.assertEquals; - @ExtendWith( MockitoExtension.class ) public class WikiBootstrapServletContextListenerTest { diff --cc jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java index bd80be347,bd80be347..c3c4b5f3f --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/DefaultUserManagerTest.java @@@ -26,7 -26,7 +26,7 @@@ import org.apache.wiki.auth.user.UserPr import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; --import javax.servlet.http.HttpServletRequest; ++import jakarta.servlet.http.HttpServletRequest; import java.util.Properties; import static org.mockito.Mockito.mock; diff --cc pom.xml index f54d80187,333d62d21..5ec77d88d --- a/pom.xml +++ b/pom.xml @@@ -45,37 -45,32 +45,37 @@@ <maven.version>3.5</maven.version> <akismet-java.version>1.02</akismet-java.version> - <awaitility.version>4.2.1</awaitility.version> + <awaitility.version>4.3.0</awaitility.version> <aws-java-sdk-kendra.version>1.12.565</aws-java-sdk-kendra.version> <commons-collections.version>4.5.0</commons-collections.version> - <commons-fileupload.version>1.6.0</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> + <commons-io.version>2.20.0</commons-io.version> + <commons-lang.version>3.18.0</commons-lang.version> <commons-text.version>1.13.1</commons-text.version> <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.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.3</log4j2.version> - <lucene.version>9.12.0</lucene.version> - <mockito.version>5.17.0</mockito.version> + <junit.version>5.13.4</junit.version> + <log4j2.version>2.25.1</log4j2.version> + <lucene.version>9.12.2</lucene.version> + <mockito.version>5.18.0</mockito.version> <nekohtml.version>2.1.2</nekohtml.version> <oro.version>2.0.8</oro.version> <sandler.version>0.5</sandler.version> @@@ -106,11 -102,11 +106,11 @@@ <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.build-helper.version>3.6.1</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> + <plugin.cargo.version>1.10.20</plugin.cargo.version> <plugin.clirr.version>2.8</plugin.clirr.version> <plugin.cobertura.version>2.7</plugin.cobertura.version> <plugin.cyclonedx.version>2.9.1</plugin.cyclonedx.version>
