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. ch.qos.logback logback-classic + org.apache.nifi nifi-api @@ -55,10 +56,6 @@ limitations under the License. c2-client-api compile - - org.apache.nifi - nifi-expression-language - org.apache.nifi.minifi minifi-utils @@ -80,10 +77,6 @@ limitations under the License. nifi-properties provided - - org.yaml - snakeyaml - org.apache.nifi.minifi minifi-commons-schema @@ -97,13 +90,6 @@ limitations under the License. org.eclipse.jetty jetty-server - ${jetty.version} - compile - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} compile @@ -115,6 +101,11 @@ limitations under the License. commons-io provided + + org.apache.commons + commons-lang3 + compile + com.fasterxml.jackson.core @@ -135,7 +126,6 @@ limitations under the License. - 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. 1.1.1 provided - - org.eclipse.jetty - jetty-util - provided - 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. minifi-c2-api ${project.version} - - com.github.stefanbirkner - system-rules - ${system.rules.version} - test - 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 @@ + +# 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. minifi-c2-api ${project.version} - - org.glassfish.jersey.ext - jersey-spring5 - - - org.glassfish.jersey.containers - jersey-container-servlet - org.eclipse.jetty jetty-server @@ -47,14 +39,6 @@ limitations under the License. org.eclipse.jetty jetty-webapp - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-servlets - org.apache.nifi nifi-jetty-configuration 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. com.fasterxml.jackson.core jackson-core - - org.eclipse.jetty - jetty-util - org.apache.nifi.minifi minifi-toolkit-configuration 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. minifi-c2-api ${project.version} - - org.eclipse.jetty - jetty-util - org.apache.nifi nifi-security-ssl 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. c2-protocol-api 2.0.0-SNAPSHOT - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - provided - com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider 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 @@ + +# 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 @@ + + 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. true - - org.apache.nifi - nifi-jetty-bundle - 2.0.0-SNAPSHOT - nar - org.apache.nifi.minifi minifi-framework-core @@ -48,67 +42,9 @@ limitations under the License. minifi-runtime compile - - - - org.apache.nifi - nifi-api - provided - - - org.apache.nifi - nifi-framework-api - provided - - - org.apache.nifi - nifi-runtime - provided - - - org.apache.nifi - nifi-nar-utils - provided - - - org.apache.nifi - nifi-properties - provided - - - org.apache.commons - commons-lang3 - - - commons-io - commons-io - - - - org.apache.nifi - nifi-security-utils-api - compile - - - org.apache.nifi - nifi-security-utils - compile - org.apache.nifi nifi-framework-nar-loading-utils - 2.0.0-SNAPSHOT - compile - - - org.apache.nifi - nifi-framework-nar-utils - compile - - - cglib - cglib-nodep - compile - \ No newline at end of file + 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. org.apache.nifi.minifi minifi-framework-api - 2.0.0-SNAPSHOT org.apache.nifi c2-client-service 2.0.0-SNAPSHOT - - org.eclipse.jetty - jetty-server - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-annotations - ${jetty.version} - provided - - - org.eclipse.jetty - apache-jsp - ${jetty.version} - provided - - - org.eclipse.jetty - apache-jstl - ${jetty.version} - provided - - - org.apache.nifi - nifi-nar-utils - - - org.apache.nifi - nifi-runtime - provided - - - org.apache.nifi - nifi-administration - org.apache.nifi.minifi minifi-utils - - org.apache.nifi - nifi-security-utils-api - org.apache.nifi nifi-framework-core-api @@ -114,10 +54,5 @@ limitations under the License. nifi-framework-core compile - - org.bouncycastle - bcprov-jdk18on - compile - 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. minifi-c2 minifi-integration-tests - - 1.19.0 - 2.2.0 - @@ -131,73 +127,6 @@ limitations under the License. 2.0.0-SNAPSHOT - - org.eclipse.jetty - jetty-util - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-server - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-jsp - ${jetty.version} - provided - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - provided - - - javax.el - javax.el-api - 3.0.0 - provided - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - provided - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - org.eclipse.jetty.toolchain - jetty-jsp-jdt - 2.3.3 - provided - - org.apache.nifi @@ -507,325 +436,11 @@ limitations under the License. 2.0.0-SNAPSHOT - - org.apache.commons - commons-compress - 1.23.0 - - - org.antlr - antlr-runtime - 3.5.3 - - - org.mongodb - mongo-java-driver - 3.2.2 - - - commons-codec - commons-codec - - - com.jcraft - jsch - 0.1.55 - - - javax.mail - mail - 1.4.7 - - - com.github.jponge - lzma-java - 1.3 - - - com.github.luben - zstd-jni - 1.5.5-1 - - - org.tukaani - xz - 1.9 - - - net.sf.saxon - Saxon-HE - 12.1 - - - stax - stax-api - 1.0.1 - - - org.quartz-scheduler - quartz - 2.3.2 - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework - spring-web - - - org.springframework - spring-core - - - org.springframework - spring-expression - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-expression - - - org.springframework - spring-web - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.springframework.security - spring-security-acl - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - - - org.springframework.security - spring-security-config - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.springframework.security - spring-security-ldap - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-tx - - - - - org.springframework.security.kerberos - spring-security-kerberos-core - 1.0.1.RELEASE - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - cglib - cglib-nodep - 3.2.2 - - - org.apache.commons - commons-collections4 - 4.2 - - - org.apache.commons - commons-pool2 - 2.4.3 - - - com.jcraft - jzlib - 1.1.3 - - - com.yammer.metrics - metrics-ganglia - ${yammer.metrics.version} - - - com.yammer.metrics - metrics-core - ${yammer.metrics.version} - - - javax.jms - javax.jms-api - 2.0.1 - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - - - - org.apache.hadoop - hadoop-yarn-api - ${hadoop.version} - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-annotations - ${hadoop.version} - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.avro - avro - - - org.eclipse.jetty - jetty-annotations - ${jetty.version} - provided - - - org.eclipse.jetty - apache-jstl - ${jetty.version} - provided - com.google.guava guava 31.1-jre - - org.apache.spark - spark-streaming_2.10 - 1.6.0 - - - org.jsoup - jsoup - - - org.spockframework - spock-core - 2.1-M2-groovy-3.0 - test - - - org.hamcrest - hamcrest-all - 1.3 -