You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/01/14 21:35:01 UTC

[camel] 03/05: CAMEL-13055: Skip running maven enforcer plugin

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d8a90639af3e531797a6697d282c4fe2814e1a96
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 14 22:11:22 2019 +0100

    CAMEL-13055: Skip running maven enforcer plugin
---
 parent/pom.xml | 15 +++++++++++++--
 pom.xml        | 26 --------------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 0cdde9e..afff354 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5125,14 +5125,25 @@
 
     <plugins>
 
-      <!-- skip site-plugin as we dont use maven site (inherited from Apache BOM) -->
+      <!-- skip site-plugin as we dont use Maven site (inherited from Apache BOM) -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <executions>
           <execution>
             <id>attach-descriptor</id>
-            <phase/> 
+            <phase/>
+         </execution>
+        </executions>
+      </plugin>
+      <!-- skip enforcer-plugin to speedup building (inherited from Apache BOM) -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven-version</id>
+            <phase/>
          </execution>
         </executions>
       </plugin>
diff --git a/pom.xml b/pom.xml
index cf1953f..f3e5f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,6 @@
   </prerequisites>
 
   <properties>
-    <!-- enforce to require using at least this maven version -->
-    <maven-enforcer-require-maven-version>3.5.0</maven-enforcer-require-maven-version>
 
     <!-- unify the encoding for all the modules -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -169,30 +167,6 @@
   <build>
     <defaultGoal>install</defaultGoal>
 
-    <!-- enforce maven version -->
-    <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
-          <executions>
-            <execution>
-              <id>enforce-maven</id>
-              <goals>
-                <goal>enforce</goal>
-              </goals>
-              <configuration>
-                <rules>
-                  <requireMavenVersion>
-                    <version>${maven-enforcer-require-maven-version}</version>
-                  </requireMavenVersion>
-                </rules>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-    </plugins>
-
     <pluginManagement>
       <plugins>
         <plugin>