NIFI-9523 Consolidated Maven Enforcer Plugin executions

- Removed duplicative Enforcer Plugin configuration from nifi-registry

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #5623.
This commit is contained in:
exceptionfactory 2021-12-29 11:35:59 -06:00 committed by Pierre Villard
parent 81e57c9651
commit 7c407cf580
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
2 changed files with 2 additions and 48 deletions

View File

@ -376,29 +376,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireSameVersions>
<plugins>
<plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
<plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
<plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
</plugins>
</requireSameVersions>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>

27
pom.xml
View File

@ -755,7 +755,7 @@
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<id>enforce-maven-version</id>
<goals>
<goal>enforce</goal>
</goals>
@ -769,22 +769,10 @@
</plugins>
</requireSameVersions>
<requireMavenVersion>
<!-- We do not test this value so we should probably make it something fairly recent -->
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-no-snapshots</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireReleaseDeps>
<message>Other than org apache nifi components themselves no snapshot dependencies are allowed</message>
<!-- If we want to only enforce this for nifi release itself we should add 'onlyWhenRelease' and remove 'failWhenParentIsSnapshot' element -->
<message>Dependencies outside of Apache NiFi must not use SNAPSHOT versions</message>
<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
<excludes>
<exclude>org.apache.nifi:*</exclude>
@ -792,17 +780,6 @@
<exclude>org.apache.nifi.registry:*</exclude>
</excludes>
</requireReleaseDeps>
</rules>
<fail>true</fail>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<!-- Cat-X Deps -->