You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/10/07 14:08:46 UTC

[nifi] branch main updated: NIFI-10565 Removed duplicated test dependencies

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

exceptionfactory 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 5da9ce525c NIFI-10565 Removed duplicated test dependencies
5da9ce525c is described below

commit 5da9ce525c946e570754e93e06e8166e64878ab8
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Fri Sep 30 17:47:23 2022 +0000

    NIFI-10565 Removed duplicated test dependencies
    
    This closes #6482
    
    Signed-off-by: David Handermann <ex...@apache.org>
---
 .../minifi-c2-provider/minifi-c2-provider-cache/pom.xml        |  5 -----
 .../minifi-c2-provider/minifi-c2-provider-delegating/pom.xml   |  5 -----
 .../minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml    |  6 ------
 .../minifi-c2-provider/minifi-c2-provider-util/pom.xml         |  5 -----
 .../nifi-azure-bundle/nifi-azure-reporting-task/pom.xml        |  5 -----
 nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-processors/pom.xml   |  5 -----
 nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service/pom.xml      |  5 -----
 .../nifi-zendesk-bundle/nifi-zendesk-processors/pom.xml        | 10 ----------
 .../nifi-registry-core/nifi-registry-framework/pom.xml         | 10 ----------
 nifi-registry/nifi-registry-core/nifi-registry-jetty/pom.xml   | 10 ----------
 .../nifi-registry-core/nifi-registry-properties/pom.xml        |  5 -----
 .../nifi-registry-revision-spring-jdbc/pom.xml                 |  5 -----
 .../nifi-registry-core/nifi-registry-security-utils/pom.xml    |  5 -----
 nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml |  5 -----
 .../nifi-registry-aws/nifi-registry-aws-extensions/pom.xml     |  5 -----
 .../nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml   |  7 -------
 .../nifi-registry-toolkit-persistence/pom.xml                  |  5 -----
 nifi-system-tests/nifi-system-test-suite/pom.xml               |  6 ------
 18 files changed, 109 deletions(-)

diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
index cd75b91598..e7f289c457 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
@@ -31,10 +31,5 @@ limitations under the License.
             <artifactId>minifi-c2-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
index 7dd0eb8cc5..3f982843db 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
@@ -44,10 +44,5 @@ limitations under the License.
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
index 4d1c495d8a..b1d096aa41 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
@@ -59,12 +59,6 @@ limitations under the License.
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
index 95e9bfe997..7b4c10c8af 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
@@ -35,10 +35,5 @@ limitations under the License.
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
index ccb017d54d..1637a411f7 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
@@ -57,11 +57,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
diff --git a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-processors/pom.xml b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-processors/pom.xml
index 2583003ac8..8946a1eb14 100644
--- a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-processors/pom.xml
@@ -46,11 +46,6 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
diff --git a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service/pom.xml b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service/pom.xml
index a0a6436d90..63f0c4e7cc 100644
--- a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service/pom.xml
+++ b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service/pom.xml
@@ -46,11 +46,6 @@
             <artifactId>nifi-utils</artifactId>
             <version>1.19.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
diff --git a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/pom.xml b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/pom.xml
index 88204740a3..4c67125c1c 100644
--- a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/pom.xml
@@ -72,16 +72,6 @@
             <artifactId>nifi-proxy-configuration-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index dca5776828..89dcd7052e 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -394,21 +394,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-jetty/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-jetty/pom.xml
index 3ddd19e672..694e6ad348 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-jetty/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-jetty/pom.xml
@@ -62,15 +62,5 @@
             <artifactId>apache-jstl</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
index 68e6689997..3934cef622 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -55,11 +55,6 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <version>${org.bouncycastle.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
index 837e32e3b6..b8676330ae 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
@@ -33,11 +33,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-test</artifactId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
index c6905a3254..5adcd7b130 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -42,10 +42,5 @@
             <artifactId>spock-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
index 4a22c1c710..59ddf0a429 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
@@ -437,11 +437,6 @@
             <version>3.2.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
index abadada9c3..d5e3b1f864 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
@@ -53,10 +53,5 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index 80b1d45534..50920a5548 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -281,13 +281,6 @@
             <artifactId>jettison</artifactId>
             <version>1.3.8</version>
         </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
index 560a02c416..2afdba17e9 100644
--- a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
+++ b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
@@ -46,10 +46,5 @@
             <artifactId>commons-cli</artifactId>
             <version>1.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-system-tests/nifi-system-test-suite/pom.xml b/nifi-system-tests/nifi-system-test-suite/pom.xml
index 7664cc5d85..fea2d2ef16 100644
--- a/nifi-system-tests/nifi-system-test-suite/pom.xml
+++ b/nifi-system-tests/nifi-system-test-suite/pom.xml
@@ -104,12 +104,6 @@
             <artifactId>jersey-hk2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency> <!-- handling this explicitly  Must be in root lib -->
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>