Skip to content

Commit

Permalink
NIFI-11139 Updated multiple Maven Plugins
Browse files Browse the repository at this point in the history 
This closes apache#6925

Signed-off-by: David Handermann <[email protected]>
  • Loading branch information
@joewitt @exceptionfactory
joewitt authored and exceptionfactory committed Feb 3, 2023
1 parent cd76dc0 commit 4f91420
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion nifi-commons/nifi-xml-processing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.6.0.0</version>
<version>4.7.3.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 1 addition & 1 deletion nifi-h2/nifi-h2-database/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.4.1</version>
<executions>
<execution>
<phase>compile</phase>
Expand Down
2 changes: 1 addition & 1 deletion nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.8</version>
<version>2.0.0</version>
<configuration>
<!--
mvn clean license:add-third-party license:download-licenses
Expand Down
11 changes: 11 additions & 0 deletions nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,19 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- not allowed findbugs version pulled in by guava version - this should be fixed by flume... -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- pulled in to replace the not allowed version of findbugs -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
<version>1.3.9-1</version>
</dependency>

<!-- Flume Sources -->

Expand Down
2 changes: 1 addition & 1 deletion nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
Expand Down
4 changes: 4 additions & 0 deletions nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
1 change: 0 additions & 1 deletion nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration>
<argLine>-Xmx3072M</argLine>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>unpack-rest-api-doc</id>
Expand Down
2 changes: 1 addition & 1 deletion nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<plugin>
<groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<version>3.1.6</version>
<version>3.1.7</version>
<executions>
<execution>
<phase>compile</phase>
Expand Down
2 changes: 1 addition & 1 deletion .../nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-jersey-bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
8 changes: 2 additions & 6 deletions nifi-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -295,7 +294,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Expand All @@ -318,12 +316,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<failOnError>false</failOnError>
<quiet>true</quiet>
Expand Down Expand Up @@ -496,7 +493,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<doclint>none</doclint>
</configuration>
Expand Down
22 changes: 9 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<json.smart.version>2.4.8</json.smart.version>
<nifi.groovy.version>3.0.14</nifi.groovy.version>
<groovy.eclipse.batch.version>3.0.8-01</groovy.eclipse.batch.version>
<surefire.version>3.0.0-M7</surefire.version>
<surefire.version>3.0.0-M8</surefire.version>
<!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need
a specific version should override this property, or use a more specific property like abc.hadoop.version -->
<hadoop.version>3.3.4</hadoop.version>
Expand Down Expand Up @@ -801,7 +801,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -820,7 +820,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.0.0-M7</version>
<configuration>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>apache-release</releaseProfiles>
Expand Down Expand Up @@ -869,12 +869,12 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand All @@ -886,12 +886,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.14</version>
<version>0.15</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -952,7 +952,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>enforce-maven-version</id>
Expand Down Expand Up @@ -989,7 +989,7 @@
<exclude>org.json:json:*:*:compile</exclude>
<exclude>c3p0:c3p0:*:*:compile</exclude>
<!-- Versions of JSR305 before 3.0.1 are not allowed https://github.com/findbugsproject/findbugs/issues/128 -->
<exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
<exclude>com.google.code.findbugs:jsr305:[,3.0.0]:compile</exclude>
<!-- SLF4J routing to Log4j 1.2 is a runtime implementation that conflicts with Logback -->
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-reload4j</exclude>
Expand All @@ -1010,10 +1010,6 @@
<!-- Exclude SSHD 2.9.1 and earlier due to CVE-2022-45047 -->
<exclude>org.apache.sshd:*:[,2.9.1]</exclude>
</excludes>
<includes>
<!-- Versions of JSR305 after 3.0.1 are allowed https://github.com/findbugsproject/findbugs/issues/128 -->
<include>com.google.code.findbugs:jsr305:[3.0.0,)</include>
</includes>
</bannedDependencies>
</rules>
<fail>true</fail>
Expand Down

0 comments on commit 4f91420

Please sign in to comment.