require JDK-11, drop JDK-8 build, tentatively build with jdk-19

apache · Oct 19, 2022 · 4aa268c · 4aa268c
1 parent 278f17c
commit 4aa268c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,9 +18,9 @@
  */
 
 buildRepo = 'https://github.com/apache/jspwiki'
-buildJdk8 = 'jdk_1.8_latest'
 buildJdk11 = 'jdk_11_latest'
 buildJdk17 = 'jdk_17_latest'
+buildJdk19 = 'jdk_19_latest'
 buildMvn = 'maven_3_latest'
 errMsg = ''
 
@@ -30,11 +30,14 @@ try {
         parallel jdk11Build: {
             buildAndSonarWith( buildJdk11 )
         },
-        jdk8Build: {
-            buildWith( buildJdk8 )
-        },
         jdk17Build: {
             buildWith( buildJdk17 )
+        },
+        jdk19Build: {
+            // don't fail build if jdk-19 build doesn't succeed
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                buildWith( buildJdk19 )
+            }
         }
     }
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Apache JSPWiki 2.11 - Documentation
+# Apache JSPWiki 2.12 - Documentation
 
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -45,7 +45,7 @@ REQUIRED:
 
 * And of course, a server to run the JSP engine on.
 
-* JDK 8+
+* JDK 11+
 
 
 OPTIONAL:

diff --git a/UPGRADING b/UPGRADING
@@ -1,5 +1,5 @@
 
-Apache JSPWiki 2.11.0 - Upgrading Notes
+Apache JSPWiki 2.12.0 - Upgrading Notes
 ==================================================
 
     Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,16 @@ Apache JSPWiki 2.11.0 - Upgrading Notes
 
 The license file can be found in LICENSE.
 
+Upgrading JSPWiki to 2.12.0
+---------------------------
+
+Please see https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.12 for details
+
+1. New requirements
+  * Java 11 needed to run JSPWiki
+
+2. Backwards API incompatible changes: https://jspwiki.apache.org/japicmp/2.12.0/
+
 Upgrading JSPWiki to 2.11.0
 ---------------------------
 

diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
@@ -26,7 +26,7 @@
   <property environment="env"/>
 
   <!-- the build version if not overwritten by the caller -->
-  <property name="jspwiki.woas.version" value="2.11.0" />
+  <property name="jspwiki.woas.version" value="2.12.0" />
 
   <!-- define the temporary build directory -->
   <property name="jspwiki.woas.target.dir" value="${basedir}/target" />
@@ -159,7 +159,7 @@
           <cp>${basedir}/target/unpack/tomcat/${jspwiki.tomcat.distribution}/bin/tomcat-juli.jar</cp>
         </classPath>
         <singleInstance mutexName="org.apache.jspwiki.jspwiki-portable" />
-        <jre minVersion="1.8.0" />
+        <jre minVersion="11.0.0" />
         <versionInfo
           fileVersion="${jspwiki.woas.version}.0"
           txtFileVersion="JSPWiki ${jspwiki.woas.version}"

diff --git a/pom.xml b/pom.xml
@@ -40,8 +40,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <project.build.outputTimestamp>2022-07-30T11:42:48Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
-    <jdk.version>1.8</jdk.version>
-    <jdk.javadoc.doclet.version>1.1.4</jdk.javadoc.doclet.version>
+    <jdk.version>11</jdk.version>
+    <jdk.javadoc.doclet.version>2.0.19</jdk.javadoc.doclet.version>
     <maven.version>3.5</maven.version>
 
     <akismet-java.version>1.02</akismet-java.version>