Merge branch 'update-to-tika-3.x'

# Conflicts: # tika-gui-app/assemblies/assembly-linux_x64.xml # tika-gui-app/assemblies/assembly-macosx_aarch64.xml # tika-gui-app/assemblies/assembly-macosx_x64.xml # tika-gui-app/assemblies/assembly-win_x64.xml # tika-gui-app/bin/tika-gui-mac-aarch64.sh # tika-gui-app/bin/tika-gui-mac-x86.sh # tika-gui-app/bin/tika-gui.sh
tballison · Sep 18, 2023 · 79bb602 · 79bb602
2 parents 9317679 + 74b966e
commit 79bb602
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/tika-gui-app/assemblies/assembly-linux_x64.xml b/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.44.53-ca-fx-jre17.0.7-linux_x64.tar.gz</source>
+      <source>${project.basedir}/target/jres/linux_x64/zulu17.44.53-ca-fx-jre17.0.8.1-linux_x64.tar.gz</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

diff --git a/tika-gui-app/assemblies/assembly-macosx_aarch64.xml b/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.44.53-ca-fx-jre17.0.7-macosx_aarch64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_aarch64/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_aarch64.zip</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

diff --git a/tika-gui-app/assemblies/assembly-macosx_x64.xml b/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.44.53-ca-fx-jre17.0.7-macosx_x64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_x64/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_x64.zip</source>
       <outputDirectory>jre</outputDirectory>
     </file>
     <file>

diff --git a/tika-gui-app/assemblies/assembly-win_x64.xml b/tika-gui-app/assemblies/assembly-win_x64.xml
@@ -31,7 +31,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/target/jres/win_x64/zulu17.44.53-ca-fx-jre17.0.7-win_x64</directory>
+      <directory>${project.basedir}/target/jres/win_x64/zulu17.44.53-ca-fx-jre17.0.8.1-win_x64</directory>
       <outputDirectory>jre</outputDirectory>
     </fileSet>
     <fileSet>

diff --git a/tika-gui-app/bin/tika-gui-mac-aarch64.sh b/tika-gui-app/bin/tika-gui-mac-aarch64.sh
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.5-macosx_aarch64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_aarch64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_aarch64.zip jre
-  mv jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_aarch64/* jre
+  ditto -xk jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_aarch64.zip jre
+  mv jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_aarch64/* jre
 fi
 
 #this is barely a start. Initially targeting linux

diff --git a/tika-gui-app/bin/tika-gui-mac-x86.sh b/tika-gui-app/bin/tika-gui-mac-x86.sh
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_x64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_x64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_x64.zip jre
-  mv jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_x64/* jre
+  ditto -xk jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_x64.zip jre
+  mv jre/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_x64/* jre
 fi
 
 #this is barely a start. Initially targeting linux

diff --git a/tika-gui-app/bin/tika-gui.sh b/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.44.53-ca-fx-jre17.0.7-linux_x64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.8.1-linux_x64" ]
 then
   echo "Unpacking zipped jre."
   cd jre
-  tar -xzvf zulu17.44.53-ca-fx-jre17.0.7-linux_x64.tar.gz
-  cd .. && mv jre/zulu17.44.53-ca-fx-jre17.0.7-linux_x64/* jre
+  tar -xzvf zulu17.44.53-ca-fx-jre17.0.8.1-linux_x64.tar.gz
+  cd .. && mv jre/zulu17.44.53-ca-fx-jre17.0.8.1-linux_x64/* jre
 fi
 
 JAVA_HOME="jre"