Repository: atlas
Updated Branches:
  refs/heads/master a40f3c2c5 -> 728aac65f


ATLAS-2245 Add maven-enforce plugin to validate maven, java versions

Signed-off-by: David Radley <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/728aac65
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/728aac65
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/728aac65

Branch: refs/heads/master
Commit: 728aac65f9e6427d0dc66ec32e197720e5d1d686
Parents: a40f3c2
Author: Nigel Jones <[email protected]>
Authored: Wed Dec 13 11:11:52 2017 +0000
Committer: David Radley <[email protected]>
Committed: Tue Dec 19 14:10:10 2017 +0000

----------------------------------------------------------------------
 graphdb/janus/pom.xml | 24 ------------------------
 pom.xml               | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/728aac65/graphdb/janus/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 5fe3818..738cac9 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -176,30 +176,6 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-java-8</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.8.0</version>
-                                </requireJavaVersion>
-                                <requireMavenVersion>
-                                    <version>3.1.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
                 <configuration>

http://git-wip-us.apache.org/repos/asf/atlas/blob/728aac65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b9a464..d472ae7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1616,6 +1616,13 @@
 
         <pluginManagement>
             <plugins>
+                <!-- support for enforcement of maven & Java versions -->
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr4-maven-plugin</artifactId>
@@ -1767,6 +1774,37 @@
         </pluginManagement>
 
         <plugins>
+            <!-- enforcement of maven version 3.5.0 or above & Java 8 (151) or 
above -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.5.0,)</version>
+                                    <message>** MAVEN VERSION ERROR ** Maven 
3.5.0 or above is required. See https://maven.apache.org/install.html </message>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <level>ERROR</level>
+                                    <version>[1.8.0-151,)</version>
+                                    <message>** JAVA VERSION ERROR ** Java 8 
(Update 151) or above is required.</message>
+                                </requireJavaVersion>
+                                <requireJavaVersion>
+                                    <level>WARN</level>
+                                    <version>(,1.9]</version>
+                                    <message>** JAVA VERSION WARNING ** Java 9 
and above has not been tested with Atlas.</message>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

Reply via email to