This is an automated email from the ASF dual-hosted git repository.
chriss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 5cd49c32e6 NIFI-14305 Removed unnecessary declaration of Bouncy Castle
dependencies
5cd49c32e6 is described below
commit 5cd49c32e6ada5f1063b866f781940cccf89c009
Author: exceptionfactory <[email protected]>
AuthorDate: Sat Mar 1 20:44:17 2025 -0600
NIFI-14305 Removed unnecessary declaration of Bouncy Castle dependencies
- Removed exclusions of jdk15on and direct declaration of jdk18on as no
longer needed with transitive version upgrades
Signed-off-by: Chris Sampson <[email protected]>
This closes #9757.
---
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 4 --
.../nifi-media-processors/pom.xml | 44 ----------------------
.../nifi-smb-bundle/nifi-smb-processors/pom.xml | 4 --
.../nifi-smb-bundle/nifi-smb-smbj-client/pom.xml | 4 --
nifi-extension-bundles/nifi-smb-bundle/pom.xml | 6 ---
5 files changed, 62 deletions(-)
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index c959a01ed7..dce383d36a 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -62,10 +62,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record</artifactId>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
diff --git
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index 7fa806c995..6f37a0210f 100644
--- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -28,19 +28,7 @@
<properties>
<tika.version>3.1.0</tika.version>
</properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Override Xerces 2.12.1 from Tika -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
@@ -64,40 +52,8 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk18on</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
index 233088eb3b..dd28b21682 100644
--- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
@@ -55,10 +55,6 @@
<groupId>com.hierynomus</groupId>
<artifactId>smbj</artifactId>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/pom.xml
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/pom.xml
index fda83e743a..af2ae89086 100644
--- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/pom.xml
+++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/pom.xml
@@ -50,10 +50,6 @@
<groupId>com.hierynomus</groupId>
<artifactId>smbj</artifactId>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
diff --git a/nifi-extension-bundles/nifi-smb-bundle/pom.xml
b/nifi-extension-bundles/nifi-smb-bundle/pom.xml
index 7d43226620..caff468e9e 100644
--- a/nifi-extension-bundles/nifi-smb-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-smb-bundle/pom.xml
@@ -40,12 +40,6 @@
<groupId>com.hierynomus</groupId>
<artifactId>smbj</artifactId>
<version>0.14.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>net.engio</groupId>
