You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/01/05 15:02:12 UTC
[nifi] branch main updated: NIFI-9523 Consolidated Maven Enforcer Plugin executions
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 7c407cf NIFI-9523 Consolidated Maven Enforcer Plugin executions
7c407cf is described below
commit 7c407cf58071bd7d57b7f54edada0aec7de9707b
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed Dec 29 11:35:59 2021 -0600
NIFI-9523 Consolidated Maven Enforcer Plugin executions
- Removed duplicative Enforcer Plugin configuration from nifi-registry
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5623.
---
nifi-registry/pom.xml | 23 -----------------------
pom.xml | 27 ++-------------------------
2 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 47fc310..fc15338 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -378,29 +378,6 @@
</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>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 5d3bc7c..2a589e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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 -->