general dependency upgrades, including to Tika 3.x.

Add higher-level mime key/capture group mapper for 'Content-Type'

pom.xml

@@ -52,12 +52,12 @@
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
-        <version>2.8.0</version>
+        <version>3.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.11.0</version>
+        <version>2.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
@@ -188,18 +188,11 @@
         <artifactId>ossindex-maven-plugin</artifactId>
         <configuration>
           <excludeCoordinates>
-            <!-- used only in tests and in tika-eval, and this problem requires the use of the console.
-                 https://github.com/h2database/h2database/issues/1294 -->
-            <exclude>
+            <coordinate>
               <groupId>com.h2database</groupId>
               <artifactId>h2</artifactId>
-              <version>2.1.214</version>
-            </exclude>
-            <exclude>
-              <groupId>com.fasterxml.jackson.core</groupId>
-              <artifactId>jackson-core</artifactId>
-              <version>2.14.2</version>
-            </exclude>
+              <version>2.2.224</version>
+            </coordinate>
           </excludeCoordinates>
           <fail>true</fail>
         </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.42.19-ca-fx-jre17.0.7-linux_x64.tar.gz</source>
+      <source>${project.basedir}/target/jres/linux_x64/zulu17.44.53-ca-fx-jre17.0.7-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.42.19-ca-fx-jre17.0.7-macosx_aarch64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_aarch64/zulu17.44.53-ca-fx-jre17.0.7-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.42.19-ca-fx-jre17.0.7-macosx_x64.zip</source>
+      <source>${project.basedir}/target/jres/macosx_x64/zulu17.44.53-ca-fx-jre17.0.7-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.42.19-ca-fx-jre17.0.7-win_x64</directory>
+      <directory>${project.basedir}/target/jres/win_x64/zulu17.44.53-ca-fx-jre17.0.7-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.38.21-ca-fx-jre17.0.5-macosx_aarch64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.5-macosx_aarch64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.42.19-ca-fx-jre17.0.7-macosx_aarch64.zip jre
-  mv jre/zulu17.42.19-ca-fx-jre17.0.7-macosx_aarch64/* 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
 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.42.19-ca-fx-jre17.0.7-macosx_x64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.7-macosx_x64" ]
 then
   echo "Unpacking zipped jre."
-  ditto -xk jre/zulu17.42.19-ca-fx-jre17.0.7-macosx_x64.zip jre
-  mv jre/zulu17.42.19-ca-fx-jre17.0.7-macosx_x64/* 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
 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.42.19-ca-fx-jre17.0.7-linux_x64" ]
+if [ ! -d "jre/zulu17.44.53-ca-fx-jre17.0.7-linux_x64" ]
 then
   echo "Unpacking zipped jre."
   cd jre
-  tar -xzvf zulu17.42.19-ca-fx-jre17.0.7-linux_x64.tar.gz
-  cd .. && mv jre/zulu17.42.19-ca-fx-jre17.0.7-linux_x64/* 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
 fi
 
 JAVA_HOME="jre"

tika-gui-app/examples/example-basic-metadata-mappings-jdbc.csv

@@ -7,7 +7,8 @@ X-TIKA:embedded_depth,embedded_depth,INTEGER
 embeddedResourceType,embedded_type,VARCHAR(64)
 X-TIKA:embedded_resource_path,embedded_path,VARCHAR(512)
 Content-Length,length,BIGINT
-Content-Type,mime,VARCHAR(64)
+mime-short,mime,VARCHAR(64)
+Content-Type,mime_detailed,VARCHAR(64)
 dcterms:created,created,TIMESTAMP
 dcterms:modified,modified,TIMESTAMP
 location,location,VARCHAR(64)

tika-gui-app/examples/example-digipres-metadata-mappings-jdbc.csv

@@ -7,7 +7,8 @@ X-TIKA:embedded_depth,embedded_depth,INTEGER
 X-TIKA:embedded_resource_path,embedded_path,VARCHAR(512)
 embeddedResourceType,embedded_type,VARCHAR(64)
 Content-Length,length,BIGINT
-Content-Type,mime,VARCHAR(64)
+mime-short,mime,VARCHAR(64)
+Content-Type,mime_detailed,VARCHAR(64)
 sf:pronom:mime,sf_mime,VARCHAR(64)
 sf:pronom:format,sf_format,VARCHAR(64)
 sf:pronom:version,sf_version,VARCHAR(64)