You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2023/01/24 15:42:54 UTC

[nifi] branch main updated: NIFI-11090 This closes #6883. Removed unused Jasypt test dependency

This is an automated email from the ASF dual-hosted git repository.

joewitt 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 84f48b5e8c NIFI-11090 This closes #6883. Removed unused Jasypt test dependency
84f48b5e8c is described below

commit 84f48b5e8ceed8b5bc9459906ae24b3fe2dd8d5f
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Jan 24 08:14:24 2023 -0600

    NIFI-11090 This closes #6883. Removed unused Jasypt test dependency
    
    Signed-off-by: Joe Witt <jo...@apache.org>
---
 nifi-assembly/README.md                                             | 3 +--
 .../nifi-framework/nifi-framework-components/pom.xml                | 6 ------
 nifi-nar-bundles/nifi-framework-bundle/pom.xml                      | 5 -----
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/nifi-assembly/README.md b/nifi-assembly/README.md
index 2d99fd2b77..8f4a8699ca 100644
--- a/nifi-assembly/README.md
+++ b/nifi-assembly/README.md
@@ -108,11 +108,10 @@ source code.
 
 The following provides more details on the included cryptographic software:
 
-Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in
+Apache NiFi uses BouncyCastle, JCraft Inc., and the built-in
 java cryptography libraries for SSL, SSH, and the protection
 of sensitive configuration parameters. See
 http://bouncycastle.org/about.html
-http://www.jasypt.org/faq.html
 http://jcraft.com/c-info.html
 http://www.oracle.com/us/products/export/export-regulations-345813.html
 for more details on each of these libraries cryptography features.
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
index fae3c67fc7..8871725c62 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
@@ -112,11 +112,5 @@
             <artifactId>spock-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jasypt</groupId>
-            <artifactId>jasypt</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index bf7c0918f0..39846092ad 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -441,11 +441,6 @@
                 <artifactId>commons-collections4</artifactId>
                 <version>4.4</version>
             </dependency>
-            <dependency>
-                <groupId>org.jasypt</groupId>
-                <artifactId>jasypt</artifactId>
-                <version>1.9.2</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit</artifactId>