changeset 1419:5c8f74626ab2

7901948: Maven build should not use <prerequisites>
author shade
date Mon, 17 Apr 2017 13:02:02 +0200
parents 4dce5a497417
children 3674a478c090
files jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml jmh-archetypes/pom.xml jmh-core-benchmarks/pom.xml jmh-core-ct/pom.xml jmh-core-it/pom.xml jmh-core/pom.xml jmh-generator-annprocess/pom.xml jmh-generator-asm/pom.xml jmh-generator-bytecode/pom.xml jmh-generator-reflection/pom.xml jmh-samples/pom.xml pom.xml
diffstat 15 files changed, 21 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -56,10 +56,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
--- a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -45,10 +45,6 @@
        Edit as needed.
     -->
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <dependencies>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
--- a/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -57,10 +57,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -56,10 +56,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
--- a/jmh-archetypes/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-archetypes/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -37,10 +37,6 @@
     <artifactId>jmh-archetypes</artifactId>
     <packaging>pom</packaging>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-core-benchmarks/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-core-benchmarks/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -57,10 +57,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-core-ct/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-core-ct/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -72,10 +72,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-core-it/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-core-it/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -57,10 +57,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-core/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-core/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -69,10 +69,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <buildDate>${maven.build.timestamp}</buildDate>
--- a/jmh-generator-annprocess/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-generator-annprocess/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -50,10 +50,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-generator-asm/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-generator-asm/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -59,10 +59,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-generator-bytecode/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-generator-bytecode/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -59,10 +59,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-generator-reflection/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-generator-reflection/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -49,10 +49,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
--- a/jmh-samples/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/jmh-samples/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -63,10 +63,6 @@
         </dependency>
     </dependencies>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <uberjar.name>benchmarks</uberjar.name>
--- a/pom.xml	Mon Apr 17 12:45:00 2017 +0200
+++ b/pom.xml	Mon Apr 17 13:02:02 2017 +0200
@@ -146,13 +146,30 @@
                     <downloadJavadocs>true</downloadJavadocs>
                 </configuration>
             </plugin>
+
+            <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>3.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <modules>
         <module>jmh-core</module>
         <module>jmh-core-it</module>