This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push: new 4f84edd7e TIKA-3933 (#807) 4f84edd7e is described below commit 4f84edd7ebfac943661a8e043047c70b6da21be3 Author: Tim Allison <talli...@apache.org> AuthorDate: Fri Nov 18 10:12:34 2022 -0500 TIKA-3933 (#807) * TIKA-3933 -- upgrade bouncycastle with new jar names * TIKA-3933 -- readme --- CHANGES.txt | 2 ++ tika-parent/pom.xml | 32 ++++++++++++++++++---- .../tika-parser-crypto-module/pom.xml | 4 +-- .../tika-parser-digest-commons/pom.xml | 4 +-- .../tika-parser-microsoft-module/pom.xml | 14 ++-------- .../tika-parser-pdf-module/pom.xml | 4 +-- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 54d14214e..af854c029 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,7 @@ Release 2.6.1 - ??? + * Upgrade to Bouncy Castle 1.71 and jdk18on jars (TIKA-3933). + * Add a JDBCPipesReporter (TIKA-3931). * Add multivalued field strategy option in jdbc-emitter (TIKA-3930). diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index d27cd936b..f5f80300a 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -300,7 +300,7 @@ <asm.version>9.4</asm.version> <boilerpipe.version>1.1.0</boilerpipe.version> <!-- used by POI, PDFBox and Jackcess ...try to sync --> - <bouncycastle.version>1.70</bouncycastle.version> + <bouncycastle.version>1.71</bouncycastle.version> <!-- NOTE: sync brotli version with commons-compress--> <brotli.version>0.1.2</brotli.version> <commons.cli.version>1.5.0</commons.cli.version> @@ -326,8 +326,6 @@ <!-- versions greater than 62.2 are not compatible with icu4j handler in lucene 8.11.1 --> <icu4j.version>62.2</icu4j.version> <imageio.version>1.4.0</imageio.version> - <jackcess.version>4.0.4</jackcess.version> - <jackcess.encrypt.version>4.0.1</jackcess.encrypt.version> <jackrabbit.version>2.21.13</jackrabbit.version> <jackson.version>2.14.0</jackson.version> <jackson.databind.version>2.14.0</jackson.databind.version> @@ -538,6 +536,28 @@ <artifactId>h2</artifactId> <version>2.1.214</version> </dependency> + <dependency> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess</artifactId> + <version>4.0.4</version> + </dependency> + <dependency> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess-encrypt</artifactId> + <version>4.0.1</version> + <exclusions> + <!-- to avoid maven-enforcer convergence error, + let's make this explicit --> + <exclusion> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> @@ -817,17 +837,17 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> + <artifactId>bcpkix-jdk18on</artifactId> <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> <version>${bouncycastle.version}</version> </dependency> <dependency> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml index e916c6f99..9809416a4 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml @@ -32,11 +32,11 @@ <dependencies> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> </dependencies> <build> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml index 529c72797..46a8f792a 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml @@ -36,11 +36,11 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml index 294ff970c..35a4cc3c4 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml @@ -94,28 +94,18 @@ <dependency> <groupId>com.healthmarketscience.jackcess</groupId> <artifactId>jackcess</artifactId> - <version>${jackcess.version}</version> </dependency> <dependency> <groupId>com.healthmarketscience.jackcess</groupId> <artifactId>jackcess-encrypt</artifactId> - <version>${jackcess.encrypt.version}</version> - <exclusions> - <!-- to avoid maven-enforcer convergence error, - let's make this explicit --> - <exclusion> - <groupId>com.healthmarketscience.jackcess</groupId> - <artifactId>jackcess</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> <!-- logging --> <dependency> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml index e6c9eaddb..398630d23 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml @@ -62,11 +62,11 @@ problems with encrypted PDFs. --> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> <!-- for java 10 See TIKA-2778 for why we need to do this now.