You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/09/17 07:13:53 UTC

[1/2] incubator-apex-core git commit: Bumped minimum maven version to 3.0.5. Split enforcer executions by enforced rule.

Repository: incubator-apex-core
Updated Branches:
  refs/heads/devel-3 454feccac -> 041beb9fb


Bumped minimum maven version to 3.0.5. Split enforcer executions by enforced rule.


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/b7187837
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b7187837
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b7187837

Branch: refs/heads/devel-3
Commit: b71878376379a9fd4a02a7cca239c5bc5dd578c5
Parents: 7503dde
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Wed Sep 16 16:17:40 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Wed Sep 16 16:17:40 2015 -0700

----------------------------------------------------------------------
 pom.xml | 72 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b7187837/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad3a28d..87c34f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,29 +102,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
-        <executions>
-          <execution>
-            <id>enforce-tools</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>[1.7.0,)</version>
-                </requireJavaVersion>
-                <requireMavenVersion>
-                  <version>[3.0.2,)</version>
-                </requireMavenVersion>
-                <requireReleaseDeps>
-                  <message>Snapshots are not allowed</message>
-                  <onlyWhenRelease>true</onlyWhenRelease>
-                </requireReleaseDeps>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -209,6 +186,55 @@
           <artifactId>exec-maven-plugin</artifactId>
           <version>1.2.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.4.1</version>
+          <executions>
+            <execution>
+              <id>enforce-java</id>
+              <goals>
+                <goal>enforce</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <requireJavaVersion>
+                    <version>[1.7.0,)</version>
+                    <message>Build requires Java 1.7 or above.</message>
+                  </requireJavaVersion>
+                </rules>
+              </configuration>
+            </execution>
+            <execution>
+              <id>enforce-maven</id>
+              <goals>
+                <goal>enforce</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <requireMavenVersion>
+                    <version>[3.0.5,)</version>
+                    <message>Build requires Maven 3.0.5 or above.</message>
+                  </requireMavenVersion>
+                </rules>
+              </configuration>
+            </execution>
+            <execution>
+              <id>enforce-release-dependencies</id>
+              <goals>
+                <goal>enforce</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <requireReleaseDeps>
+                    <message>Snapshots dependencies are not allowed for release build.</message>
+                    <onlyWhenRelease>true</onlyWhenRelease>
+                  </requireReleaseDeps>
+                </rules>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
     <extensions>


[2/2] incubator-apex-core git commit: Merge branch 'maven-enforcer-plugin' of https://github.com/vrozov/incubator-apex-core into devel-3

Posted by th...@apache.org.
Merge branch 'maven-enforcer-plugin' of https://github.com/vrozov/incubator-apex-core into devel-3


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/041beb9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/041beb9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/041beb9f

Branch: refs/heads/devel-3
Commit: 041beb9fb5e38dc628db9b9a7cfaed8027824e0d
Parents: 454fecc b718783
Author: MalharJenkins <je...@datatorrent.com>
Authored: Wed Sep 16 22:11:43 2015 -0700
Committer: MalharJenkins <je...@datatorrent.com>
Committed: Wed Sep 16 22:11:43 2015 -0700

----------------------------------------------------------------------
 pom.xml | 72 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 23 deletions(-)
----------------------------------------------------------------------