This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 5a3a93574f93cbfc0cf51b8288be7c02666ea27f Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Tue Sep 30 20:03:02 2025 +0200 Update dependencies --- Dockerfile | 4 ++-- Jenkinsfile | 18 ++++++++---------- README.md | 8 +++----- ReleaseNotes | 5 +++++ pom.xml | 11 +++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb026771b..dd9ddceb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM maven:3.9-eclipse-temurin-11 as package +FROM maven:3.9-eclipse-temurin-17 as package WORKDIR /tmp @@ -27,7 +27,7 @@ RUN set -x \ # fastest, minimum build && mvn -B clean package -pl jspwiki-war,jspwiki-wikipages/en -am -DskipTests -FROM tomcat:10.1 +FROM tomcat:10.1-jdk17 COPY --from=package /tmp/jspwiki-war/target/JSPWiki.war /tmp COPY --from=package /tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*-jspwiki.zip /tmp diff --git a/Jenkinsfile b/Jenkinsfile index ad9d0095c..0218c3344 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,25 +18,25 @@ */ buildRepo = 'https://github.com/apache/jspwiki' -buildJdk11 = 'jdk_11_latest' buildJdk17 = 'jdk_17_latest' buildJdk21 = 'jdk_21_latest' +buildJdk25 = 'jdk_25_latest' buildMvn = 'maven_3_latest' errMsg = '' try { stage( 'build source' ) { - parallel jdk11Build: { - buildSonarAndDeployIfSnapshotWith( buildJdk11 ) - }, - jdk17Build: { - buildWith( buildJdk17 ) + parallel jdk17Build: { + buildSonarAndDeployIfSnapshotWith( buildJdk17 ) }, jdk21Build: { - // don't fail build if jdk-21 build doesn't succeed + buildWith( buildJdk21 ) + }, + jdk25Build: { + // don't fail build if jdk-25 build doesn't succeed catchError( buildResult: 'SUCCESS', stageResult: 'FAILURE' ) { - buildWith( buildJdk21 ) + buildWith( buildJdk25 ) } } } @@ -72,8 +72,6 @@ def buildSonarAndDeployIfSnapshotWith( jdk ) { git url: buildRepo, poll: true withMaven( jdk: jdk, maven: buildMvn, publisherStrategy: 'EXPLICIT', options: [ jacocoPublisher(), junitPublisher() ] ) { sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report -T 1C" - } - withMaven( jdk: buildJdk17, maven: buildMvn ) { withCredentials( [ string( credentialsId: 'sonarcloud-jspwiki', variable: 'SONAR_TOKEN' ) ] ) { def sonarOptions = "-Dsonar.projectKey=jspwiki-builder -Dsonar.organization=apache -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN" echo 'Will use SonarQube instance at https://sonarcloud.io' diff --git a/README.md b/README.md index 3d43a5131..4972fa055 100644 --- a/README.md +++ b/README.md @@ -35,17 +35,15 @@ Okay, so you wanna Wiki? You'll need the following things: REQUIRED: -* A JSP engine that supports Servlet API 3.1. We recommend [Apache Tomcat](https://tomcat.apache.org/) - for a really easy installation. Tomcat 9.x or later is recommended, although Tomcat 8.x - is supported too; see [additional configuration](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Started#section-Getting+Started-Tomcat8.x) - that must be set up in order to run JSPWiki on Tomcat 8.x. +* A JSP engine that supports Servlet API 6.0. We recommend [Apache Tomcat](https://tomcat.apache.org/) + for a really easy installation. Tomcat 10.1 or later is recommended. * Some previous administration experience... If you've ever installed Apache or any other web server, you should be pretty well off. * And of course, a server to run the JSP engine on. -* JDK 11+ +* JDK 17+ OPTIONAL: diff --git a/ReleaseNotes b/ReleaseNotes index 35fcf5b78..5fb286972 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,3 +1,8 @@ +Apache JSPWiki 2.12.x Release Notes can be found at https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.12 + +Apache JSPWiki 2.11.x Release Notes can be found at https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11 + +===================================== Apache JSPWiki 2.10.4 - Release Notes ===================================== diff --git a/pom.xml b/pom.xml index e4ad62222..3fa279027 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.build.outputTimestamp>2025-07-25T13:24:36Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases --> - <jdk.version>11</jdk.version> + <jdk.version>17</jdk.version> <jdk.javadoc.doclet.version>2.2.3</jdk.javadoc.doclet.version> <maven.version>3.5</maven.version> @@ -72,18 +72,17 @@ <javax-jsp-api.version>2.3.3</javax-jsp-api.version> <jdom2.version>2.0.6</jdom2.version> <jrcs-diff.version>0.4.2</jrcs-diff.version> - <junit.version>5.13.4</junit.version> + <junit.version>6.0.0</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.20.0</mockito.version> <nekohtml.version>2.1.2</nekohtml.version> <oro.version>2.0.8</oro.version> <sandler.version>0.5</sandler.version> - <selenide.version>6.19.0</selenide.version> - <slf4j.version>1.7.36</slf4j.version> + <selenide.version>7.10.1</selenide.version> + <slf4j.version>2.0.17</slf4j.version> <tika.version>3.2.3</tika.version> <tomcat.version>10.1.46</tomcat.version> - <wro4j.version>1.8.0</wro4j.version> <xmlrpc.version>2.0.1</xmlrpc.version> <xstream.version>1.4.21</xstream.version>
