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 2023/09/13 19:59:29 UTC
[tika] 01/01: TIKA-3948 -- migrate from bcmail to bcjmail for jakarta
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3948
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 558ed3fc11cfd10eafb44f8fcc2bbd20388e98d8
Author: tallison <ta...@apache.org>
AuthorDate: Wed Sep 13 15:59:13 2023 -0400
TIKA-3948 -- migrate from bcmail to bcjmail for jakarta
---
tika-app/src/main/appended-resources/META-INF/LICENSE | 2 +-
tika-parent/pom.xml | 2 +-
.../tika-parser-crypto-module/pom.xml | 2 +-
.../tika-parser-digest-commons/pom.xml | 2 +-
.../tika-parser-microsoft-module/pom.xml | 2 +-
.../tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml | 2 +-
tika-server/tika-server-standard/pom.xml | 8 ++++----
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tika-app/src/main/appended-resources/META-INF/LICENSE b/tika-app/src/main/appended-resources/META-INF/LICENSE
index f63badc0b..43dae2221 100644
--- a/tika-app/src/main/appended-resources/META-INF/LICENSE
+++ b/tika-app/src/main/appended-resources/META-INF/LICENSE
@@ -4,7 +4,7 @@ Apache Tika includes a number of subcomponents with separate copyright notices
and license terms. Your use of these subcomponents is subject to the terms and
conditions of the following licenses.
-Bouncy Castle libraries (bcmail and bcprov)
+Bouncy Castle libraries (bcjmail and bcprov)
Copyright (c) 2000-2009 The Legion Of The Bouncy Castle
(http://www.bouncycastle.org)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 991377b99..24c9ae7ed 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -799,7 +799,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
+ <artifactId>bcjmail-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 88aaf99d5..930019188 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,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
+ <artifactId>bcjmail-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
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 b75ce9803..174bf04b5 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,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
+ <artifactId>bcjmail-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
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 cd4b37326..d9b433c47 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
@@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
+ <artifactId>bcjmail-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
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 ab35e1ef9..f6d5912c7 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,7 +62,7 @@
problems with encrypted PDFs. -->
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
+ <artifactId>bcjmail-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml
index a6b2f9b72..f91956741 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -140,10 +140,10 @@
<exclude>org.apache.ws.xmlschema:xmlschema-core:jar:</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api:jar:</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api:jar:</exclude>
- <exclude>org.bouncycastle:bcmail-jdk15on:jar:</exclude>
- <exclude>org.bouncycastle:bcutil-jdk15on:jar:</exclude>
- <exclude>org.bouncycastle:bcpkix-jdk15on:jar:</exclude>
- <exclude>org.bouncycastle:bcprov-jdk15on:jar:</exclude>
+ <exclude>org.bouncycastle:bcjmail-jdk18on:jar:</exclude>
+ <exclude>org.bouncycastle:bcutil-jdk18on:jar:</exclude>
+ <exclude>org.bouncycastle:bcpkix-jdk18on:jar:</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk18on:jar:</exclude>
<exclude>de.l3s.boilerpipe:boilerpipe:jar:</exclude>
<exclude>com.optimaize.languagedetector:language-detector:jar:</exclude>
<exclude>net.arnx:jsonic:jar:</exclude>