diff --git a/pom.xml b/pom.xml index 7a9fbd5..885562c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,12 +52,12 @@ org.apache.tika tika-core - 2.8.0 + 3.0.0-SNAPSHOT commons-io commons-io - 2.11.0 + 2.13.0 org.apache.logging.log4j @@ -188,18 +188,11 @@ ossindex-maven-plugin - - + com.h2database h2 - 2.1.214 - - - com.fasterxml.jackson.core - jackson-core - 2.14.2 - + 2.2.224 + true diff --git a/tika-gui-app/assemblies/assembly-linux_x64.xml b/tika-gui-app/assemblies/assembly-linux_x64.xml index e3fb753..6d6f0e0 100644 --- a/tika-gui-app/assemblies/assembly-linux_x64.xml +++ b/tika-gui-app/assemblies/assembly-linux_x64.xml @@ -46,7 +46,7 @@ config - ${project.basedir}/target/jres/linux_x64/zulu17.42.19-ca-fx-jre17.0.7-linux_x64.tar.gz + ${project.basedir}/target/jres/linux_x64/zulu17.44.53-ca-fx-jre17.0.7-linux_x64.tar.gz jre diff --git a/tika-gui-app/assemblies/assembly-macosx_aarch64.xml b/tika-gui-app/assemblies/assembly-macosx_aarch64.xml index 1bff3bd..c5b13a0 100644 --- a/tika-gui-app/assemblies/assembly-macosx_aarch64.xml +++ b/tika-gui-app/assemblies/assembly-macosx_aarch64.xml @@ -46,7 +46,7 @@ config - ${project.basedir}/target/jres/macosx_aarch64/zulu17.42.19-ca-fx-jre17.0.7-macosx_aarch64.zip + ${project.basedir}/target/jres/macosx_aarch64/zulu17.44.53-ca-fx-jre17.0.7-macosx_aarch64.zip jre diff --git a/tika-gui-app/assemblies/assembly-macosx_x64.xml b/tika-gui-app/assemblies/assembly-macosx_x64.xml index 2b085d9..8a2536c 100644 --- a/tika-gui-app/assemblies/assembly-macosx_x64.xml +++ b/tika-gui-app/assemblies/assembly-macosx_x64.xml @@ -46,7 +46,7 @@ config - ${project.basedir}/target/jres/macosx_x64/zulu17.42.19-ca-fx-jre17.0.7-macosx_x64.zip + ${project.basedir}/target/jres/macosx_x64/zulu17.44.53-ca-fx-jre17.0.7-macosx_x64.zip jre diff --git a/tika-gui-app/assemblies/assembly-win_x64.xml b/tika-gui-app/assemblies/assembly-win_x64.xml index 547a162..f6b5f1f 100644 --- a/tika-gui-app/assemblies/assembly-win_x64.xml +++ b/tika-gui-app/assemblies/assembly-win_x64.xml @@ -31,7 +31,7 @@ - ${project.basedir}/target/jres/win_x64/zulu17.42.19-ca-fx-jre17.0.7-win_x64 + ${project.basedir}/target/jres/win_x64/zulu17.44.53-ca-fx-jre17.0.7-win_x64 jre diff --git a/tika-gui-app/bin/tika-gui-mac-aarch64.sh b/tika-gui-app/bin/tika-gui-mac-aarch64.sh index a98bc1f..aa5e138 100644 --- 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.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 diff --git a/tika-gui-app/bin/tika-gui-mac-x86.sh b/tika-gui-app/bin/tika-gui-mac-x86.sh index b84edc6..c160b43 100644 --- 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.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 diff --git a/tika-gui-app/bin/tika-gui.sh b/tika-gui-app/bin/tika-gui.sh index 5086efe..9bdc59c 100644 --- 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.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" diff --git a/tika-gui-app/examples/example-basic-metadata-mappings-jdbc.csv b/tika-gui-app/examples/example-basic-metadata-mappings-jdbc.csv index 6c9fe56..d13535c 100644 --- a/tika-gui-app/examples/example-basic-metadata-mappings-jdbc.csv +++ b/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) diff --git a/tika-gui-app/examples/example-digipres-metadata-mappings-jdbc.csv b/tika-gui-app/examples/example-digipres-metadata-mappings-jdbc.csv index cbda45a..ea3afd5 100644 --- a/tika-gui-app/examples/example-digipres-metadata-mappings-jdbc.csv +++ b/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) diff --git a/tika-gui-app/pom.xml b/tika-gui-app/pom.xml index d586108..5dc3012 100644 --- a/tika-gui-app/pom.xml +++ b/tika-gui-app/pom.xml @@ -96,7 +96,7 @@ com.h2database h2 - 2.2.222 + 2.2.224 org.xerial @@ -188,22 +188,21 @@ app-release - com.googlecode.maven-download-plugin download-maven-plugin - tika-async-cli-2.8.1-20230616.123148-44 + tika-async-cli-3.0.0-20230916.113230-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/2.8.1-SNAPSHOT/tika-async-cli-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/3.0.0-SNAPSHOT/tika-async-cli-3.0.0-20230916.113230-19.jar false ${project.build.directory}/lib/tika-core - 845bb36bbca060dc0f592652159a3b7d + 2162c7e9a3f4a93c0c5566323ad65cf7 @@ -220,211 +219,198 @@ - tika-fetcher-s3-2.8.1-20230616.123148-44 + tika-fetcher-s3-3.0.0-20230916.113250-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/2.8.1-SNAPSHOT/tika-fetcher-s3-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/3.0.0-SNAPSHOT/tika-fetcher-s3-3.0.0-20230916.113250-19.jar false ${project.build.directory}/lib/tika-fetcher-s3 - bfca731d895458fc24f347cbce13ea1c + 902ba0eba30eb70f16603359285ec796 - tika-parser-sqlite3-package-2.8.1-20230616.123148-44 + tika-parser-sqlite3-package-3.0.0-20230916.113313-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/2.8.1-SNAPSHOT/tika-parser-sqlite3-package-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/3.0.0-SNAPSHOT/tika-parser-sqlite3-package-3.0.0-20230916.113313-19.jar false ${project.build.directory}/lib/tika-app - f8d8d23121188f1208c580d49a866609 + 30c2565c8e051cb30da52f3d778e1078 - tika-pipes-reporter-fs-status-2.8.1-20230616.123148-44 + tika-pipes-reporter-fs-status-3.0.0-20230916.113325-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/2.8.1-SNAPSHOT/tika-pipes-reporter-fs-status-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/3.0.0-SNAPSHOT/tika-pipes-reporter-fs-status-3.0.0-20230916.113325-19.jar false ${project.build.directory}/lib/tika-core - ad7066a9f561065cae2de5e746606a3b + 874b8819dec38cdd83a2258f195a1856 - h2-2.1.214 + h2-2.2.224 prepare-package wget - https://repo1.maven.org/maven2/com/h2database/h2/2.1.214/h2-2.1.214.jar + https://repo1.maven.org/maven2/com/h2database/h2/2.2.224/h2-2.2.224.jar false ${project.build.directory}/lib/db/h2 - 93628fb706e682dd989f697394039025 + 769d5a85d19ccc2b06620f8c81d6d8f8 - tika-emitter-fs-2.8.1-20230616.123148-44 + tika-emitter-fs-3.0.0-20230916.113236-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/2.8.1-SNAPSHOT/tika-emitter-fs-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/3.0.0-SNAPSHOT/tika-emitter-fs-3.0.0-20230916.113236-19.jar false ${project.build.directory}/lib/tika-emitter-fs - f6f40a7bfe485c0bb29a60f2ceb435f6 + 4ddc6102f326ef4905b8ec297f6930d7 - tika-emitter-jdbc-2.8.1-20230616.123148-44 + tika-emitter-jdbc-3.0.0-20230916.113239-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/2.8.1-SNAPSHOT/tika-emitter-jdbc-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/3.0.0-SNAPSHOT/tika-emitter-jdbc-3.0.0-20230916.113239-19.jar false ${project.build.directory}/lib/tika-emitter-jdbc - 954a7ae5821497f1edabe139f0414a48 + aef47a06adb481e5ed922695fe94ad3b - tika-pipes-reporter-jdbc-2.8.1-20230616.123148-44 + tika-pipes-reporter-jdbc-3.0.0-20230916.113326-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/2.8.1-SNAPSHOT/tika-pipes-reporter-jdbc-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/3.0.0-SNAPSHOT/tika-pipes-reporter-jdbc-3.0.0-20230916.113326-19.jar false ${project.build.directory}/lib/tika-core - ead857585a01562c0258cc441b0ede7d + f4e80ec1445287e000d2ad22a440764a - sqlite-jdbc-3.42.0.0 + tika-eval-core-3.0.0-20230916.113245-19 prepare-package wget - https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar - false - ${project.build.directory}/lib/db/sqlite - 6a46db3a6f38043ffb7e6782708cd401 - - - - tika-eval-core-2.8.1-20230616.123148-44 - prepare-package - - wget - - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/2.8.1-SNAPSHOT/tika-eval-core-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/3.0.0-SNAPSHOT/tika-eval-core-3.0.0-20230916.113245-19.jar false ${project.build.directory}/lib/tika-extras - f868b1e345782b3d5dc49d3a3c5fb619 + a224e425b7bbc0f8e8d959e97734676b - tika-pipes-iterator-s3-2.8.1-20230616.123148-44 + tika-pipes-iterator-s3-3.0.0-20230916.113323-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/2.8.1-SNAPSHOT/tika-pipes-iterator-s3-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/3.0.0-SNAPSHOT/tika-pipes-iterator-s3-3.0.0-20230916.113323-19.jar false ${project.build.directory}/lib/tika-pipes-iterator-s3 - 32ecdb8b12a67e79387b3eb1f7afee2e + 7ece173d822a4e639b7de850c1b8ff0a - tika-serialization-2.8.1-20230616.123148-45 + tika-serialization-3.0.0-20230916.113329-20 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/2.8.1-SNAPSHOT/tika-serialization-2.8.1-20230616.123148-45.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/3.0.0-SNAPSHOT/tika-serialization-3.0.0-20230916.113329-20.jar false ${project.build.directory}/lib/tika-core - 7d2e021015354628578cf6e171ca447a + 98384bcac2c450b613c6ffde5cbe43dd - tika-detector-siegfried-2.8.1-20230616.123148-44 + tika-detector-siegfried-3.0.0-20230916.113234-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/2.8.1-SNAPSHOT/tika-detector-siegfried-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/3.0.0-SNAPSHOT/tika-detector-siegfried-3.0.0-20230916.113234-19.jar false ${project.build.directory}/lib/tika-extras - 93c46073b85ca916b820a8f0a931961c + 945a1fae320b3a89a1062701dc6c354b - tika-emitter-opensearch-2.8.1-20230616.123148-44 + tika-emitter-opensearch-3.0.0-20230916.113240-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/2.8.1-SNAPSHOT/tika-emitter-opensearch-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/3.0.0-SNAPSHOT/tika-emitter-opensearch-3.0.0-20230916.113240-19.jar false ${project.build.directory}/lib/tika-emitter-opensearch - dbbb772b329ddd6135cd77c86a020a07 + 94920de26db8c229ee1dc4145d7b6df4 - tika-emitter-s3-2.8.1-20230616.123148-44 + tika-emitter-s3-3.0.0-20230916.113241-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/2.8.1-SNAPSHOT/tika-emitter-s3-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/3.0.0-SNAPSHOT/tika-emitter-s3-3.0.0-20230916.113241-19.jar false ${project.build.directory}/lib/tika-emitter-s3 - d522b97931a295af2d6d4f3dac67fe18 + d69e1cfef10e12626aad209efcb97691 - tika-app-2.8.1-20230616.123148-44 + tika-app-3.0.0-20230916.113228-19 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/2.8.1-SNAPSHOT/tika-app-2.8.1-20230616.123148-44.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/3.0.0-SNAPSHOT/tika-app-3.0.0-20230916.113228-19.jar false ${project.build.directory}/lib/tika-app - 36fcb252f110d2514078282fd982f0bd + 4af4bb225cdb80782aee65f1edee7000 - win_x64 + sqlite-jdbc-3.43.0.0 prepare-package wget - https://cdn.azul.com/zulu/bin/zulu17.42.19-ca-fx-jre17.0.7-win_x64.zip - true - ${project.build.directory}/jres/win_x64 - 417eb52fa283b54c10da9484c9696a56c44e32ce9f565c19e80727ce74cd8b9b + https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar + false + ${project.build.directory}/lib/db/sqlite + ce4481c5a3e9d4c97613fd263b651883 @@ -434,10 +420,10 @@ wget - https://cdn.azul.com/zulu/bin/zulu17.42.19-ca-fx-jre17.0.7-linux_x64.tar.gz + https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-fx-jre17.0.8.1-linux_x64.tar.gz false ${project.build.directory}/jres/linux_x64 - 6cf6fe3d1a6f2adf586d4f30240dddfd1d4a0919b139cd2845ef112f51769797 + 379df7b77a3adcc5145d30106ca3f8c4f3d2be7e6710805d750051ef39898190 @@ -447,10 +433,10 @@ wget - https://cdn.azul.com/zulu/bin/zulu17.42.19-ca-fx-jre17.0.7-macosx_x64.zip + https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_x64.zip false ${project.build.directory}/jres/macosx_x64 - ee9a802b966cfef9918b6d27a86778332428a0649ae0f4917048d83b122e8c1b + 8d88dc528a76322b4f049a806efa04f38be8e5de5e0328b6257a577a7fd921e0 @@ -460,10 +446,23 @@ wget - https://cdn.azul.com/zulu/bin/zulu17.42.19-ca-fx-jre17.0.7-macosx_aarch64.zip + https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-fx-jre17.0.8.1-macosx_aarch64.zip false ${project.build.directory}/jres/macosx_aarch64 - 94131b38fe1b0ffc656c6c11d9db71f015642c7a89a999e79dcd783cfbaf11ce + c816c075106f5c51ab353858a2fc5252693c26cc444c7bb574de04fb328bc23b + + + + win_x64 + prepare-package + + wget + + + https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-fx-jre17.0.8.1-win_x64.zip + true + ${project.build.directory}/jres/win_x64 + 16c841753cd72576810c570d22e25f22c03269be137450fabfa2bab5a8de74fa diff --git a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java index 0602a7e..bca599d 100644 --- a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java +++ b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java @@ -377,20 +377,30 @@ private void appendMetadataFilter(BatchProcessConfig batchProcessConfig, DomWrit writer.appendLeafElement(metadataFilters, "metadataFilter", "class", "org.apache.tika.eval.core.metadata.TikaEvalMetadataFilter"); + + Element captureGroupFilter = writer.createAndGetElement(metadataFilters, + "metadataFilter", "class", + "org.apache.tika.metadata.filter.CaptureGroupMetadataFilter"); + Element captureGroupParams = writer.createAndGetElement(captureGroupFilter, "params"); + writer.appendTextElement(captureGroupParams, "sourceField", "Content-Type"); + writer.appendTextElement(captureGroupParams, "targetField", "mime-short"); + writer.appendTextElement(captureGroupParams, "regex", "\\A([^;]+)"); + BaseEmitterSpec emitter = (BaseEmitterSpec) emitterSpec.get(); + List metadataTuples = emitter.getMetadataTuples(); if (metadataTuples.size() == 0) { return; } - Element filter = writer.createAndGetElement(metadataFilters, "metadataFilter", "class", + Element fieldNameMappingFilter = writer.createAndGetElement(metadataFilters, "metadataFilter", "class", "org.apache.tika.metadata.filter.FieldNameMappingFilter"); - Element params = writer.createAndGetElement(filter, "params"); - writer.appendTextElement(params, "excludeUnmapped", "true"); + Element fieldNameMappingParams = writer.createAndGetElement(fieldNameMappingFilter, "params"); + writer.appendTextElement(fieldNameMappingParams, "excludeUnmapped", "true"); Map map = new LinkedHashMap<>(); metadataTuples.stream().forEach(e -> map.put(e.getTika(), e.getOutput())); - writer.appendMap(params, "mappings", "mapping", map); + writer.appendMap(fieldNameMappingParams, "mappings", "mapping", map); } diff --git a/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/PackageBinaries.java b/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/PackageBinaries.java index aa97bcb..d55d52b 100644 --- a/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/PackageBinaries.java +++ b/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/PackageBinaries.java @@ -41,7 +41,7 @@ public class PackageBinaries { //and the apache repo for tika artifacts //Further, we should parameterize all dependencies. - private static final String TIKA_VERSION = "2.8.1-SNAPSHOT"; + private static final String TIKA_VERSION = "3.0.0-SNAPSHOT"; private static final Map JARS_TO_PATH = new HashMap<>(); private static final Path LOCAL_M2 = Paths.get(System.getProperty("user.home")).resolve(".m2" + @@ -98,10 +98,10 @@ public class PackageBinaries { TIKA_VERSION + "/tika-emitter-opensearch-" + TIKA_VERSION + ".jar", "lib/tika-emitter-opensearch"); JARS_TO_PATH.put( - "com/h2database/h2/2.1.214/h2-2.1.214.jar", + "com/h2database/h2/2.2.224/h2-2.2.224.jar", "lib/db/h2"); JARS_TO_PATH.put( - "org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar", "lib/db/sqlite"); + "org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar", "lib/db/sqlite"); JARS_TO_PATH.put( "org/apache/tika/tika-pipes-iterator-s3/" + TIKA_VERSION + "/tika-pipes-iterator-s3-" + TIKA_VERSION + ".jar", diff --git a/tika-gui-tools/src/main/resources/snapshot-dependencies.properties b/tika-gui-tools/src/main/resources/snapshot-dependencies.properties index c8393a5..bb3cea5 100644 --- a/tika-gui-tools/src/main/resources/snapshot-dependencies.properties +++ b/tika-gui-tools/src/main/resources/snapshot-dependencies.properties @@ -28,7 +28,7 @@ org/apache/tika/tika-pipes-iterator-s3=tika-pipes-iterator-s3 org/apache/tika/tika-emitter-jdbc=tika-emitter-jdbc org/apache/tika/tika-emitter-s3=tika-emitter-s3 org/apache/tika/tika-fetcher-s3=tika-fetcher-s3 -com/h2database/h2/2.1.214/h2-2.1.214.jar=db/h2 -org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar=db/sqlite +com/h2database/h2/2.2.224/h2-2.2.224.jar=db/h2 +org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar=db/sqlite org/postgresql/postgresql/42.6.0/postgresql-42.6.0.jar=db/postgresql