Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10406: Updated Maven assemblies to ensure that we always use at least two of the GAVC parameters for includes and excludes. Updated Maven assembly plugin to version 3.4.2. Removed some includes and excludes from dependencies that previously were not matching and were generating Maven WARNING messages. 

This closes #6415

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Mark Payne 2022-09-12 14:43:53 -04:00 committed by exceptionfactory
parent 51d01f874e
commit 3f0ef9e977
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
14 changed files with 105 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml
View File

@ -33,22 +33,11 @@
<fileMode>0660</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>minifi-bootstrap</exclude>
<exclude>minifi-resources</exclude>
<exclude>*:nifi-bootstrap-utils</exclude>
<exclude>*:minifi-bootstrap</exclude>
<exclude>*:minifi-resources</exclude>
<!-- Filter items introduced via transitive dependencies that are provided in associated NARs -->
<exclude>spring-aop</exclude>
<exclude>spring-context</exclude>
<exclude>spring-beans</exclude>
<exclude>swagger-annotations</exclude>
<exclude>aspectjweaver</exclude>
<exclude>h2</exclude>
<exclude>mail</exclude>
<exclude>log4j</exclude>
<exclude>lucene-queryparser</exclude>
<exclude>commons-net</exclude>
<exclude>spring-context</exclude>
<exclude>spring-security-core</exclude>
<exclude>*:swagger-annotations</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->
@ -67,13 +56,13 @@
<fileMode>0660</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-bootstrap-utils</include>
<include>minifi-bootstrap</include>
<include>minifi-utils</include>
<include>nifi-utils</include>
<include>commons-io</include>
<include>slf4j-api</include>
<include>logback-classic</include>
<include>*:nifi-bootstrap-utils</include>
<include>*:minifi-bootstrap</include>
<include>*:minifi-utils</include>
<include>*:nifi-utils</include>
<include>*:commons-io</include>
<include>*:slf4j-api</include>
<include>*:logback-classic</include>
</includes>
</dependencySet>
@ -104,7 +93,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-resources</include>
<include>*:minifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -130,7 +119,7 @@
<fileMode>0770</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-resources</include>
<include>*:minifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -148,7 +137,7 @@
<outputDirectory>docs/</outputDirectory>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-docs</include>
<include>*:minifi-docs</include>
</includes>
<unpack>true</unpack>
<unpackOptions>

41
minifi/minifi-assembly/src/main/assembly/dependencies.xml
View File

@ -33,22 +33,11 @@
<fileMode>0660</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>minifi-bootstrap</exclude>
<exclude>minifi-resources</exclude>
<exclude>*:nifi-bootstrap-utils</exclude>
<exclude>*:minifi-bootstrap</exclude>
<exclude>*:minifi-resources</exclude>
<!-- Filter items introduced via transitive dependencies that are provided in associated NARs -->
<exclude>spring-aop</exclude>
<exclude>spring-context</exclude>
<exclude>spring-beans</exclude>
<exclude>swagger-annotations</exclude>
<exclude>aspectjweaver</exclude>
<exclude>h2</exclude>
<exclude>mail</exclude>
<exclude>log4j</exclude>
<exclude>lucene-queryparser</exclude>
<exclude>commons-net</exclude>
<exclude>spring-context</exclude>
<exclude>spring-security-core</exclude>
<exclude>*:swagger-annotations</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->
@ -67,14 +56,14 @@
<fileMode>0660</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-bootstrap-utils</include>
<include>minifi-bootstrap</include>
<include>minifi-utils</include>
<include>nifi-utils</include>
<include>commons-io</include>
<include>commons-lang3</include>
<include>slf4j-api</include>
<include>logback-classic</include>
<include>*:nifi-bootstrap-utils</include>
<include>*:minifi-bootstrap</include>
<include>*:minifi-utils</include>
<include>*:nifi-utils</include>
<include>*:commons-io</include>
<include>*:commons-lang3</include>
<include>*:slf4j-api</include>
<include>*:logback-classic</include>
</includes>
</dependencySet>
@ -105,7 +94,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-resources</include>
<include>*:minifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -131,7 +120,7 @@
<fileMode>0770</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-resources</include>
<include>*:minifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -149,7 +138,7 @@
<outputDirectory>docs/</outputDirectory>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>minifi-docs</include>
<include>*:minifi-docs</include>
</includes>
<unpack>true</unpack>
<unpackOptions>

20
nifi-assembly/src/main/assembly/common.xml
View File

@ -24,12 +24,12 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-bootstrap-utils</include>
<include>nifi-bootstrap</include>
<include>slf4j-api</include>
<include>logback-classic</include>
<include>nifi-api</include>
<include>nifi-property-protection-api</include>
<include>*:nifi-bootstrap-utils</include>
<include>*:nifi-bootstrap</include>
<include>*:slf4j-api</include>
<include>*:logback-classic</include>
<include>*:nifi-api</include>
<include>*:nifi-property-protection-api</include>
</includes>
</dependencySet>
@ -74,7 +74,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-property-protection-factory</include>
<include>*:nifi-property-protection-factory</include>
</includes>
</dependencySet>
@ -87,7 +87,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-resources</include>
<include>*:nifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -107,7 +107,7 @@
<fileMode>0770</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-resources</include>
<include>*:nifi-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -125,7 +125,7 @@
<outputDirectory>docs/</outputDirectory>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-docs</include>
<include>*:nifi-docs</include>
</includes>
<unpack>true</unpack>
<unpackOptions>

12
nifi-assembly/src/main/assembly/dependencies.xml
View File

@ -32,12 +32,12 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>nifi-bootstrap</exclude>
<exclude>nifi-property-protection-api</exclude>
<exclude>nifi-property-protection-factory</exclude>
<exclude>nifi-resources</exclude>
<exclude>nifi-docs</exclude>
<exclude>*:nifi-bootstrap-utils</exclude>
<exclude>*:nifi-bootstrap</exclude>
<exclude>*:nifi-property-protection-api</exclude>
<exclude>*:nifi-property-protection-factory</exclude>
<exclude>*:nifi-resources</exclude>
<exclude>*:nifi-docs</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->

14
nifi-assembly/src/main/assembly/ranger.xml
View File

@ -37,13 +37,13 @@
<fileMode>0660</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>nifi-bootstrap</exclude>
<exclude>nifi-property-protection-api</exclude>
<exclude>nifi-property-protection-factory</exclude>
<exclude>nifi-resources</exclude>
<exclude>nifi-docs</exclude>
<exclude>org.apache.nifi:nifi-ranger-resources:jar</exclude>
<exclude>*:nifi-bootstrap-utils</exclude>
<exclude>*:nifi-bootstrap</exclude>
<exclude>*:nifi-property-protection-api</exclude>
<exclude>*:nifi-property-protection-factory</exclude>
<exclude>*:nifi-resources</exclude>
<exclude>*:nifi-docs</exclude>
<exclude>*:org.apache.nifi:nifi-ranger-resources:jar</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->

11
nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/src/main/assembly/dependencies.xml
View File

@ -28,22 +28,11 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>nifi-bootstrap</exclude>
<exclude>nifi-resources</exclude>
<exclude>nifi-docs</exclude>
<exclude>org.apache.nifi:nifi-system-test-extensions-nar</exclude>
<exclude>org.apache.nifi:nifi-standard-services-api-nar</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir -->
<exclude>org.aspectj:aspectjweaver</exclude>
</excludes>
</dependencySet>

8
nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/src/main/assembly/dependencies.xml
View File

@ -28,19 +28,11 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>nifi-bootstrap</exclude>
<exclude>nifi-resources</exclude>
<exclude>nifi-docs</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir -->
<exclude>org.aspectj:aspectjweaver</exclude>
</excludes>
</dependencySet>

28
nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/assembly/dependencies.xml
View File

@ -28,19 +28,19 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-stateless-bootstrap</include>
<include>nifi-stateless-nar</include>
<include>nifi-standard-nar</include>
<include>nifi-standard-services-api-nar</include>
<include>nifi-jetty-bundle</include>
<include>nifi-update-attribute-nar</include>
<include>nifi-api</include>
<include>nifi-framework-api</include>
<include>nifi-server-api</include>
<include>nifi-runtime</include>
<include>nifi-nar-utils</include>
<include>nifi-stateless-api</include>
<include>slf4j-api</include>
<include>*:nifi-stateless-bootstrap</include>
<include>*:nifi-stateless-nar</include>
<include>*:nifi-standard-nar</include>
<include>*:nifi-standard-services-api-nar</include>
<include>*:nifi-jetty-bundle</include>
<include>*:nifi-update-attribute-nar</include>
<include>*:nifi-api</include>
<include>*:nifi-framework-api</include>
<include>*:nifi-server-api</include>
<include>*:nifi-runtime</include>
<include>*:nifi-nar-utils</include>
<include>*:nifi-stateless-api</include>
<include>*:slf4j-api</include>
</includes>
</dependencySet>
@ -54,9 +54,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.annotation:javax.annotation-api</include>
</includes>
</dependencySet>
</dependencySets>

34
nifi-registry/nifi-registry-assembly/src/main/assembly/dependencies.xml
View File

@ -33,8 +33,8 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-utils</include>
<include>commons-lang3</include>
<include>*:nifi-registry-utils</include>
<include>*:commons-lang3</include>
</includes>
</dependencySet>
@ -47,9 +47,9 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-bootstrap</include>
<include>slf4j-api</include>
<include>logback-classic</include>
<include>*:nifi-registry-bootstrap</include>
<include>*:slf4j-api</include>
<include>*:logback-classic</include>
</includes>
</dependencySet>
@ -62,7 +62,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-properties-loader</include>
<include>*:nifi-registry-properties-loader</include>
<include>software.amazon.awssdk:*</include>
</includes>
</dependencySet>
@ -79,7 +79,6 @@
<includes>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>com.sun.activation:jakarta.activation</include>
<include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
@ -93,13 +92,12 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-registry-resources</exclude>
<exclude>nifi-registry-bootstrap</exclude>
<exclude>nifi-registry-utils</exclude>
<exclude>nifi-registry-docs</exclude>
<exclude>nifi-registry-ranger-assembly</exclude>
<exclude>nifi-registry-aws-assembly</exclude>
<exclude>nifi-registry-properties-loader</exclude>
<exclude>*:nifi-registry-resources</exclude>
<exclude>*:nifi-registry-bootstrap</exclude>
<exclude>*:nifi-registry-utils</exclude>
<exclude>*:nifi-registry-docs</exclude>
<exclude>*:nifi-registry-aws-assembly</exclude>
<exclude>*:nifi-registry-properties-loader</exclude>
<!-- Exclude any jaxb dependencies because they will be in lib/java11 -->
<!-- TODO: remove these once minimum Java version is 11 and these can be bundle directly into the application -->
@ -107,7 +105,7 @@
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
</excludes>
</dependencySet>
<!-- Write out the conf directory contents -->
<dependencySet>
<scope>runtime</scope>
@ -117,7 +115,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-resources</include>
<include>*:nifi-registry-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -137,7 +135,7 @@
<fileMode>0770</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-resources</include>
<include>*:nifi-registry-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -155,7 +153,7 @@
<outputDirectory>docs/</outputDirectory>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-registry-docs</include>
<include>*:nifi-registry-docs</include>
</includes>
<unpack>true</unpack>
<unpackOptions>

4
nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
View File

@ -57,7 +57,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-stateless-resources</include>
<include>*:nifi-stateless-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
@ -77,7 +77,7 @@
<fileMode>0770</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-stateless-resources</include>
<include>*:nifi-stateless-resources</include>
</includes>
<unpack>true</unpack>
<unpackOptions>

2
nifi-stateless/nifi-stateless-assembly/src/main/assembly/dependencies.xml
View File

@ -32,7 +32,7 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-stateless-resources</exclude>
<exclude>*:nifi-stateless-resources</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->

4
nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml
View File

@ -29,8 +29,8 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>jackson-core</exclude>
<exclude>jackson-databind</exclude>
<exclude>*:jackson-core</exclude>
<exclude>*:jackson-databind</exclude>
<!-- TODO: remove these once minimum Java version is 11 -->
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>

29
nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml
View File

@ -29,12 +29,12 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>nifi-bootstrap-utils</include>
<include>nifi-bootstrap</include>
<include>bcprov-jdk15on</include>
<include>commons-lang3</include>
<include>slf4j-api</include>
<include>nifi-api</include>
<include>*:nifi-bootstrap-utils</include>
<include>*:nifi-bootstrap</include>
<include>*:bcprov-jdk15on</include>
<include>*:commons-lang3</include>
<include>*:slf4j-api</include>
<include>*:nifi-api</include>
</includes>
</dependencySet>
@ -65,11 +65,18 @@
<fileMode>0664</fileMode>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>nifi-bootstrap-utils</exclude>
<exclude>nifi-bootstrap</exclude>
<exclude>nifi-resources</exclude>
<exclude>nifi-docs</exclude>
<exclude>nifi-toolkit-cli</exclude>
<exclude>*:nifi-bootstrap-utils</exclude>
<exclude>*:nifi-bootstrap</exclude>
<exclude>*:nifi-toolkit-cli</exclude>
<exclude>*:bcprov-jdk15on</exclude>
<exclude>*:bcrypt</exclude>
<exclude>*:bcpkix-jdk15on</exclude>
<exclude>*:bcutil-jdk15on</exclude>
<exclude>*:commons-lang3</exclude>
<exclude>*:nifi-deprecation-log</exclude>
<exclude>*:nifi-security-utils</exclude>
<exclude>*:nifi-security-utils-api</exclude>
<exclude>*:nifi-xml-processing</exclude>
<!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
<!-- TODO: remove these once minimum Java version is 11 -->

2
pom.xml
View File

@ -709,7 +709,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>