This is an automated email from the ASF dual-hosted git repository.
briansolo1985 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 b23baac00e NIFI-11527: clean-up dependencies
b23baac00e is described below
commit b23baac00e9190fa442bd3dbced5c0f051cc7c23
Author: Pierre Villard <[email protected]>
AuthorDate: Mon May 1 16:05:04 2023 +0300
NIFI-11527: clean-up dependencies
This closes #7230
Co-authored-by: Kalman Jantner <[email protected]>
Signed-off-by: Ferenc Kis <[email protected]>
---
minifi/minifi-bootstrap/pom.xml | 22 +-
minifi/minifi-c2/minifi-c2-api/pom.xml | 5 -
.../minifi-c2-cache-filesystem/pom.xml | 6 -
.../minifi-c2-integration-tests/README.md | 27 ++
...docker-compose-DelegatingProviderSecureTest.yml | 4 +-
...cker-compose-DelegatingProviderUnsecureTest.yml | 4 +-
...r-compose-FileSystemCacheProviderSecureTest.yml | 2 +-
...cker-compose-FileSystemProviderUnsecureTest.yml | 2 +-
...ose-NiFiRestConfigurationProviderSecureTest.yml | 2 +-
...e-NiFiRestConfigurationProviderUnsecureTest.yml | 2 +-
minifi/minifi-c2/minifi-c2-jetty/pom.xml | 16 -
.../minifi-c2-provider-nifi-rest/pom.xml | 4 -
.../minifi-c2-provider-util/pom.xml | 4 -
minifi/minifi-c2/minifi-c2-service/pom.xml | 5 -
minifi/minifi-integration-tests/README.md | 26 ++
.../src/test/resources/Dockerfile.minifi.test | 2 +-
.../src/test/resources/Dockerfile.minific2.test | 2 +-
.../src/test/resources/logback.xml | 2 +
.../minifi-framework-nar/pom.xml | 66 +---
.../minifi-framework/minifi-framework-core/pom.xml | 65 ----
minifi/pom.xml | 385 ---------------------
21 files changed, 72 insertions(+), 581 deletions(-)
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index d8f2684015..16b18282dd 100644
--- a/minifi/minifi-bootstrap/pom.xml
+++ b/minifi/minifi-bootstrap/pom.xml
@@ -35,6 +35,7 @@ limitations under the License.
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
@@ -55,10 +56,6 @@ limitations under the License.
<artifactId>c2-client-api</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-expression-language</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-utils</artifactId>
@@ -80,10 +77,6 @@ limitations under the License.
<artifactId>nifi-properties</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-commons-schema</artifactId>
@@ -97,13 +90,6 @@ limitations under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -115,6 +101,11 @@ limitations under the License.
<artifactId>commons-io</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -135,7 +126,6 @@ limitations under the License.
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/minifi/minifi-c2/minifi-c2-api/pom.xml
b/minifi/minifi-c2/minifi-c2-api/pom.xml
index ba8e9d4474..92e850cd37 100644
--- a/minifi/minifi-c2/minifi-c2-api/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-api/pom.xml
@@ -37,10 +37,5 @@ limitations under the License.
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
index 810ff87f73..584a7ee22e 100644
--- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
@@ -31,11 +31,5 @@ limitations under the License.
<artifactId>minifi-c2-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.github.stefanbirkner</groupId>
- <artifactId>system-rules</artifactId>
- <version>${system.rules.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/minifi/minifi-c2/minifi-c2-integration-tests/README.md
b/minifi/minifi-c2/minifi-c2-integration-tests/README.md
new file mode 100644
index 0000000000..3fad96200a
--- /dev/null
+++ b/minifi/minifi-c2/minifi-c2-integration-tests/README.md
@@ -0,0 +1,27 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+# Apache NiFi MiNiFi Command and Control (C2) Server
+
+## How to execute minifi-c2-integration-tests
+
+### Build required modules
+mvn -pl minifi/minifi-assembly -am install -T1C -DskipTests
+mvn -pl minifi/minifi-docker -am install -T1C -DskipTests -P docker
+mvn -pl minifi/minifi-c2/minifi-c2-assembly -am install -T1C -DskipTests
+mvn -pl minifi/minifi-c2/minifi-c2-docker -am install -T1C -DskipTests -P
docker
+mvn -pl nifi-toolkit/nifi-toolkit-assembly -am install -T1C -DskipTests
+
+### Execute integration tests
+mvn verify -Pdocker -f minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
\ No newline at end of file
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderSecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderSecureTest.yml
index 2c193085fd..cd4a9ff126 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderSecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderSecureTest.yml
@@ -17,7 +17,7 @@ version: "2"
services:
c2-upstream:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10443"
hostname: c2-upstream
@@ -32,7 +32,7 @@ services:
-
./certificates-DelegatingConfigurationProviderSecureTest/c2-upstream/truststore.jks:/opt/minifi-c2/minifi-c2-${minifi.c2.version}/conf/truststore.jks
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10443"
hostname: c2
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderUnsecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderUnsecureTest.yml
index 833aa13231..ebbc1eb172 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderUnsecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-DelegatingProviderUnsecureTest.yml
@@ -17,14 +17,14 @@ version: "2"
services:
c2-upstream:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10090"
hostname: c2-upstream
volumes:
- ./c2/files:/opt/minifi-c2/minifi-c2-${minifi.c2.version}/files
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10090"
hostname: c2
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemCacheProviderSecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemCacheProviderSecureTest.yml
index 27768d44b0..179065ca86 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemCacheProviderSecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemCacheProviderSecureTest.yml
@@ -17,7 +17,7 @@ version: "2"
services:
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10443"
hostname: c2
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemProviderUnsecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemProviderUnsecureTest.yml
index d86e85f7e3..392850745b 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemProviderUnsecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-FileSystemProviderUnsecureTest.yml
@@ -17,7 +17,7 @@ version: "2"
services:
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10090"
hostname: c2
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderSecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderSecureTest.yml
index 8665b7f05d..66bfecf96b 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderSecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderSecureTest.yml
@@ -17,7 +17,7 @@ version: "2"
services:
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10443"
hostname: c2
diff --git
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderUnsecureTest.yml
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderUnsecureTest.yml
index 85add86f6e..811791f77b 100644
---
a/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderUnsecureTest.yml
+++
b/minifi/minifi-c2/minifi-c2-integration-tests/src/test/resources/docker-compose-NiFiRestConfigurationProviderUnsecureTest.yml
@@ -17,7 +17,7 @@ version: "2"
services:
c2:
- image: apacheminific2:${minifi.c2.version}
+ image: apache/nifi-minifi-c2:${minifi.c2.version}-maven
ports:
- "10090"
hostname: c2
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index df8220a054..fd038effa5 100644
--- a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
@@ -31,14 +31,6 @@ limitations under the License.
<artifactId>minifi-c2-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring5</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -47,14 +39,6 @@ limitations under the License.
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-configuration</artifactId>
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 1f19d3cf14..dc6f7b03e1 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
@@ -40,10 +40,6 @@ limitations under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-toolkit-configuration</artifactId>
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 bc1f642257..667c79ed98 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
@@ -31,10 +31,6 @@ limitations under the License.
<artifactId>minifi-c2-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-ssl</artifactId>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml
b/minifi/minifi-c2/minifi-c2-service/pom.xml
index c2b9e105df..f2c8123453 100644
--- a/minifi/minifi-c2/minifi-c2-service/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-service/pom.xml
@@ -37,11 +37,6 @@ limitations under the License.
<artifactId>c2-protocol-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/minifi/minifi-integration-tests/README.md
b/minifi/minifi-integration-tests/README.md
new file mode 100644
index 0000000000..6ba4866ab0
--- /dev/null
+++ b/minifi/minifi-integration-tests/README.md
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+# Apache NiFi MiNiFi Command and Control (C2) Server
+
+## How to execute minifi-integration-tests
+
+### Build required modules
+mvn -pl minifi/minifi-assembly -am install -T1C -DskipTests
+mvn -pl minifi/minifi-docker -am install -T1C -DskipTests -P docker
+mvn -pl nifi-toolkit/nifi-toolkit-assembly -am install -T1C -DskipTests
+mvn -pl minifi/minifi-integration-tests -am install -T1C -DskipTests
+
+### Execute integration tests
+mvn verify -Pdocker -f minifi/minifi-integration-tests/pom.xml
\ No newline at end of file
diff --git
a/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minifi.test
b/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minifi.test
index ba69a33e60..9ba255a9ec 100644
--- a/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minifi.test
+++ b/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minifi.test
@@ -16,7 +16,7 @@
# under the License.
#
-FROM apacheminifi:${minifi.version}
+FROM apache/nifi-minifi:${minifi.version}-maven
USER root
diff --git
a/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minific2.test
b/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minific2.test
index 2ba5199034..d0f37853d2 100644
---
a/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minific2.test
+++
b/minifi/minifi-integration-tests/src/test/resources/Dockerfile.minific2.test
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM apacheminific2:${minifi.version}
+FROM apache/nifi-minifi-c2:${minifi.version}-maven
USER root
diff --git a/minifi/minifi-integration-tests/src/test/resources/logback.xml
b/minifi/minifi-integration-tests/src/test/resources/logback.xml
index d82fbdb9c9..fed54befd7 100644
--- a/minifi/minifi-integration-tests/src/test/resources/logback.xml
+++ b/minifi/minifi-integration-tests/src/test/resources/logback.xml
@@ -56,7 +56,9 @@
<!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->
<logger name="org.apache.nifi" level="INFO"/>
+ <logger name="org.apache.nifi.c2.client.http.OkHttpClientProvider"
level="DEBUG"/>
<logger name="org.apache.nifi.c2.client.http.C2HttpClient" level="DEBUG"/>
+ <logger name="org.apache.nifi.minifi.c2.C2NifiClientService"
level="DEBUG"/>
<logger name="org.apache.nifi.processors" level="WARN"/>
<logger name="org.apache.nifi.processors.standard.LogAttribute"
level="INFO"/>
<logger
name="org.apache.nifi.controller.repository.StandardProcessSession"
level="DEBUG" />
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 3af08896a3..53e9972071 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -32,12 +32,6 @@ limitations under the License.
<source.skip>true</source.skip>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-jetty-bundle</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-core</artifactId>
@@ -48,67 +42,9 @@ limitations under the License.
<artifactId>minifi-runtime</artifactId>
<scope>compile</scope>
</dependency>
-
- <!-- NiFi Framework level dependencies -->
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-nar-utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-properties</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <!-- Override scope to compile since framework NAR won't get this from
a parent NAR -->
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-nar-utils</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>compile</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
index 737856421f..07bf29c5f0 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
@@ -34,76 +34,16 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-service</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jsp</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jstl</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-nar-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-administration</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
@@ -114,10 +54,5 @@ limitations under the License.
<artifactId>nifi-framework-core</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 163917a008..f17e5a2881 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -39,10 +39,6 @@ limitations under the License.
<module>minifi-c2</module>
<module>minifi-integration-tests</module>
</modules>
- <properties>
- <system.rules.version>1.19.0</system.rules.version>
- <yammer.metrics.version>2.2.0</yammer.metrics.version>
- </properties>
<dependencyManagement>
<dependencies>
@@ -131,73 +127,6 @@ limitations under the License.
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>javax.servlet.jsp.jstl-api</artifactId>
- <version>1.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-jsp-jdt</artifactId>
- <version>2.3.3</version>
- <scope>provided</scope>
- </dependency>
-
<!-- NiFi Modules -->
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -507,325 +436,11 @@ limitations under the License.
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.55</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
- </dependency>
- <dependency>
- <groupId>com.github.jponge</groupId>
- <artifactId>lzma-java</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>com.github.luben</groupId>
- <artifactId>zstd-jni</artifactId>
- <version>1.5.5-1</version>
- </dependency>
- <dependency>
- <groupId>org.tukaani</groupId>
- <artifactId>xz</artifactId>
- <version>1.9</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>Saxon-HE</artifactId>
- <version>12.1</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-acl</artifactId>
- <version>${spring.security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-ldap</artifactId>
- <version>${spring.security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security.kerberos</groupId>
- <artifactId>spring-security-kerberos-core</artifactId>
- <version>1.0.1.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.4.3</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jzlib</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-ganglia</artifactId>
- <version>${yammer.metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${yammer.metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>javax.jms-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-api</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jstl</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-streaming_2.10</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- </dependency>
- <dependency>
- <groupId>org.spockframework</groupId>
- <artifactId>spock-core</artifactId>
- <version>2.1-M2-groovy-3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
