You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/11/18 14:10:23 UTC
[tika] branch TIKA-3933 created (now 216ca1888)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-3933
in repository https://gitbox.apache.org/repos/asf/tika.git
at 216ca1888 TIKA-3933 -- upgrade bouncycastle with new jar names
This branch includes the following new commits:
new 216ca1888 TIKA-3933 -- upgrade bouncycastle with new jar names
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tika] 01/01: TIKA-3933 -- upgrade bouncycastle with new jar names
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3933
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 216ca1888d348a5082dddff84f09d241f1c0fbf3
Author: tallison <ta...@apache.org>
AuthorDate: Fri Nov 18 09:10:06 2022 -0500
TIKA-3933 -- upgrade bouncycastle with new jar names
---
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 +--
5 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 5f202222d..5dfa49e00 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.