diff --git a/CHANGES.txt b/CHANGES.txt index e949016d71..68f1c6c092 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,8 @@ Release 2.0.0 - ??? Release 1.20 - ??? + * Bulk upgrade of dependencies (TIKA-2775). + * Improve language id efficiency in tika-eval (TIKA-2777). * Upgrade sqlite "provided" dependency to 3.25.2 (TIKA-2773). diff --git a/NOTICE.txt b/NOTICE.txt index b555d9d8ae..379b4a7271 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -375,13 +375,16 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. + NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) + The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. + The GNU General Public License (GPL) Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml index 4fb10190f4..b17b9538f6 100644 --- a/tika-bundle/pom.xml +++ b/tika-bundle/pom.xml @@ -41,7 +41,9 @@ http://tika.apache.org/ - 4.12.0 + + 4.11.0 @@ -123,7 +125,7 @@ org.osgi org.osgi.core - 6.0.0 + ${osgi.core.version} test diff --git a/tika-core/pom.xml b/tika-core/pom.xml index f55de96daa..6e22eb3624 100644 --- a/tika-core/pom.xml +++ b/tika-core/pom.xml @@ -39,7 +39,7 @@ org.osgi org.osgi.core - 4.0.0 + ${osgi.core.version} provided true diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml index 96b27bb070..a7c350fba3 100644 --- a/tika-dl/pom.xml +++ b/tika-dl/pom.xml @@ -36,7 +36,7 @@ UTF-8 - 1.0.0-beta2 + 1.0.0-beta3 @@ -95,7 +95,7 @@ org.apache.commons commons-math3 - 3.4.1 + 3.6.1 org.deeplearning4j @@ -165,6 +165,10 @@ commons-io commons-io + + net.java.dev.jna + jna + @@ -240,7 +244,7 @@ org.objenesis objenesis - 2.6 + 3.0.1 org.nd4j @@ -299,7 +303,7 @@ org.projectlombok lombok - 1.16.22 + 1.18.4 com.google.guava @@ -309,7 +313,7 @@ joda-time joda-time - 2.9.2 + 2.10.1 commons-io diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 58d0308a0c..f1f4026b2d 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -259,12 +259,12 @@ biz.aQute bndlib - 1.43.0 + 1.50.0 org.apache.felix org.apache.felix.scr.annotations - 1.6.0 + 1.12.0 junit @@ -322,11 +322,12 @@ 2.6 3.8.1 2.8.5 - 3.2.6 + 6.0.0 + 3.2.7 1.7.25 - 2.9.6 + 2.9.7 2.3.0.1 - 2.20.0 + 2.23.0 diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index da50721630..895186fe2a 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -48,7 +48,7 @@ 1.8.16 4.5.5 0.8 - 2.0.9 + 2.0.10 1.60 1.3 @@ -60,7 +60,7 @@ org.osgi org.osgi.core - 4.0.0 + ${osgi.core.version} provided true @@ -189,7 +189,7 @@ com.github.luben zstd-jni - 1.3.5-3 + 1.3.7-1 provided @@ -281,7 +281,7 @@ org.ow2.asm asm - 6.2 + 7.0 com.googlecode.mp4parser @@ -301,7 +301,7 @@ com.rometools rome - 1.5.1 + 1.11.1 org.jdom @@ -497,7 +497,7 @@ net.java.dev.jna jna - 4.3.0 + 5.0.0