This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 97ec2a52ee0f871e17171cc2aa5e9b2e6d0269b7 Merge: 9c2e784b8 ff3e6c638 Author: spyhunter99 <[email protected]> AuthorDate: Sat Nov 29 15:27:32 2025 -0500 Merge pull request #442 from spyhunter99/feature/JSPWIKI-1250 JSPWIKI-1250 product update checker, can be disabled, frequency is ad… .github/workflows/maven.yml | 2 +- jspwiki-main/pom.xml | 6 + .../java/org/apache/wiki/ProductUpdateChecker.java | 188 +++++++++++++++++++++ .../src/main/java/org/apache/wiki/WikiEngine.java | 6 + .../java/org/apache/wiki/tags/UserCheckTag.java | 6 + .../main/resources/templates/default.properties | 4 +- .../main/resources/templates/default_de.properties | 3 + .../main/resources/templates/default_es.properties | 4 + .../main/resources/templates/default_fi.properties | 3 + .../main/resources/templates/default_fr.properties | 3 + .../main/resources/templates/default_it.properties | 3 + .../main/resources/templates/default_nl.properties | 3 + .../resources/templates/default_pt_BR.properties | 3 + .../main/resources/templates/default_ru.properties | 3 + .../resources/templates/default_zh_CN.properties | 3 + .../src/test/resources/jspwiki-custom.properties | 2 + .../src/main/webapp/templates/default/UserBox.jsp | 39 +++++ pom.xml | 8 + 18 files changed, 287 insertions(+), 2 deletions(-) diff --cc pom.xml index d5a5a8e60,776c90229..0dfbd1d80 --- a/pom.xml +++ b/pom.xml @@@ -57,10 -57,11 +57,11 @@@ <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> + <gson.version>2.13.2</gson.version> <hsqldb.version>2.7.4</hsqldb.version> + <jackson-version>3.0.2</jackson-version> <jakarta-activation.version>2.0.1</jakarta-activation.version> - <jakarta-activation-api.version>2.1.3</jakarta-activation-api.version> + <jakarta-activation-api.version>2.1.4</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>
