Issue #204 -- update java to 21 and other updates

.github/workflows/main-jdk17-build.yml → .github/workflows/main-jdk21-build.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-name: main jdk17 build
+name: main jdk21 build
 
 on:
   push:
@@ -28,11 +28,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17.0.10
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21.0.10
         uses: actions/setup-java@v2
         with:
-          java-version: 17.0.10
+          java-version: 21.0.05
           distribution: 'zulu'#may need to move to liberica
           java-package: jdk+fx
           cache: 'maven'

.github/workflows/maven-build-all-installer.yml

@@ -26,11 +26,11 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17.0.10
+          java-version: 21.0.5
           distribution: 'zulu'#may need to move to liberica
           java-package: jdk+fx
           cache: 'maven'

pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>32</version>
+    <version>33</version>
     <relativePath/>
   </parent>
 
@@ -35,10 +35,13 @@
   <packaging>pom</packaging>
 
   <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>5.10.2</junit.version>
-    <jackson.version>2.17.0</jackson.version>
-    <log4j2.version>2.23.1</log4j2.version>
+    <junit.version>5.11.3</junit.version>
+    <jackson.version>2.18.0</jackson.version>
+    <log4j2.version>2.24.1</log4j2.version>
     <puppycrawl.version>10.15.0</puppycrawl.version>
   </properties>
 
@@ -52,12 +55,12 @@
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.16.1</version>
+        <version>2.17.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
@@ -133,12 +136,12 @@
         <plugin>
           <groupId>de.thetaphi</groupId>
           <artifactId>forbiddenapis</artifactId>
-          <version>3.7</version>
+          <version>3.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -148,22 +151,22 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.1.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.5</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
@@ -182,8 +185,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>17</source>
-          <target>17</target>
+          <source>21</source>
+          <target>21</target>
         </configuration>
       </plugin>
       <!-- to run just this: mvn ossindex:audit -Dossindex.fail=(true|false)
@@ -196,7 +199,7 @@
             <coordinate>
               <groupId>com.h2database</groupId>
               <artifactId>h2</artifactId>
-              <version>2.2.224</version>
+              <version>2.3.232</version>
             </coordinate>
           </excludeCoordinates>
           <fail>true</fail>
@@ -219,7 +222,7 @@
         <groupId>de.thetaphi</groupId>
         <artifactId>forbiddenapis</artifactId>
         <configuration>
-          <targetVersion>17</targetVersion>
+          <targetVersion>21</targetVersion>
           <ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses>
           <failOnUnsupportedJava>false</failOnUnsupportedJava>
           <excludes>test-documents/*.class</excludes>
@@ -286,7 +289,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.16.2</version>
+        <version>2.17.1</version>
         <configuration>
           <generateBackupPoms>false</generateBackupPoms>
         </configuration>

tika-gui-app/assemblies/assembly-linux_x64.xml

@@ -46,7 +46,7 @@
       <outputDirectory>config</outputDirectory>
     </file>
     <file>
-      <source>${project.basedir}/target/jres/linux_x64/zulu17.48.15-ca-fx-jre17.0.10-linux_x64.tar.gz</source>
+      <source>${project.basedir}/target/jres/linux_x64/zulu21.38.21-ca-fx-jre21.0.5-linux_x64.tar.gz</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

tika-gui-app/assemblies/assembly-macosx_aarch64.xml

@@ -46,7 +46,7 @@
       <outputDirectory>config</outputDirectory>
     </file>
     <file>
-      <source>${project.basedir}/target/jres/macosx_aarch64/zulu17.48.15-ca-fx-jre17.0.10-macosx_aarch64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_aarch64/zulu21.38.21-ca-fx-jre21.0.5-macosx_aarch64.zip</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

tika-gui-app/assemblies/assembly-macosx_x64.xml

@@ -46,7 +46,7 @@
       <outputDirectory>config</outputDirectory>
     </file>
     <file>
-      <source>${project.basedir}/target/jres/macosx_x64/zulu17.48.15-ca-fx-jre17.0.10-macosx_x64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_x64/zulu21.38.21-ca-fx-jre21.0.5-macosx_x64.zip</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

tika-gui-app/assemblies/assembly-win_x64.xml

@@ -31,7 +31,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/target/jres/win_x64/zulu17.48.15-ca-fx-jre17.0.10-win_x64</directory>
+      <directory>${project.basedir}/target/jres/win_x64/zulu21.38.21-ca-fx-jre21.0.5-win_x64</directory>
       <outputDirectory>jre</outputDirectory>
     </fileSet>
     <fileSet>

tika-gui-app/bin/tika-gui-mac-aarch64.sh

@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-if [ ! -d "jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_aarch64" ]
+if [ ! -d "jre/zulu21.38.21-ca-fx-jre21.0.5-macosx_aarch64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_aarch64.zip jre
-  mv jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_aarch64/* jre
+  ditto -xk jre/zulu21.38.21-ca-fx-jre21.0.5-macosx_aarch64.zip jre
+  mv jre/zulu21.38.21-ca-fx-jre21.0.5-macosx_aarch64/* jre
 fi
 
 #this is barely a start. Initially targeting linux

tika-gui-app/bin/tika-gui-mac-x86.sh

@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-if [ ! -d "jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_x64" ]
+if [ ! -d "jre/zulu21.38.21-ca-fx-jre21.0.5.0.10-macosx_x64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_x64.zip jre
-  mv jre/zulu17.48.15-ca-fx-jre17.0.10-macosx_x64/* jre
+  ditto -xk jre/zulu21.38.21-ca-fx-jre21.0.5-macosx_x64.zip jre
+  mv jre/zulu21.38.21-ca-fx-jre21.0.5-macosx_x64/* jre
 fi
 
 #this is barely a start. Initially targeting linux

tika-gui-app/bin/tika-gui.sh

@@ -18,12 +18,12 @@
 #TODO: update the script to find the executable, whether it
 # is under the jdk name or the aarch Contents/Home/ stuff.
 # Can we do anything better than chmod?
-if [ ! -d "jre/zulu17.48.15-ca-fx-jre17.0.10-linux_x64" ]
+if [ ! -d "jre/zulu21.38.21-ca-fx-jre21.0.5-linux_x64" ]
 then
   echo "Unpacking zipped jre."
   cd jre
-  tar -xzvf zulu17.48.15-ca-fx-jre17.0.10-linux_x64.tar.gz
-  cd .. && mv jre/zulu17.48.15-ca-fx-jre17.0.10-linux_x64/* jre
+  tar -xzvf zulu21.38.21-ca-fx-jre21.0.5-linux_x64.tar.gz
+  cd .. && mv jre/zulu21.38.21-ca-fx-jre21.0.5-linux_x64/* jre
 fi
 
 JAVA_HOME="jre"