changeset 1334:f3769cbfafee

7901744: Archetype verification should be enabled only on Java 8
author shade
date Fri, 22 Jul 2016 18:06:15 +0300
parents c698f6c0e0fc
children 31fa2612f8af
files jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml jmh-archetypes/jmh-java-benchmark-archetype/pom.xml jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml jmh-archetypes/pom.xml
diffstat 5 files changed, 82 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml	Fri Jul 22 15:20:54 2016 +0300
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml	Fri Jul 22 18:06:15 2016 +0300
@@ -8,7 +8,6 @@
         <version>1.13-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openjdk.jmh</groupId>
     <artifactId>jmh-groovy-benchmark-archetype</artifactId>
     <packaging>maven-archetype</packaging>
 
@@ -27,25 +26,17 @@
             </extension>
         </extensions>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-archetype-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <escapeString>\</escapeString>
-                </configuration>
             </plugin>
         </plugins>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
--- a/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml	Fri Jul 22 15:20:54 2016 +0300
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml	Fri Jul 22 18:06:15 2016 +0300
@@ -33,7 +33,6 @@
         <version>1.13-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openjdk.jmh</groupId>
     <artifactId>jmh-java-benchmark-archetype</artifactId>
     <packaging>maven-archetype</packaging>
 
@@ -52,25 +51,17 @@
             </extension>
         </extensions>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-archetype-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <escapeString>\</escapeString>
-                </configuration>
             </plugin>
         </plugins>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
--- a/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml	Fri Jul 22 15:20:54 2016 +0300
+++ b/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml	Fri Jul 22 18:06:15 2016 +0300
@@ -8,7 +8,6 @@
         <version>1.13-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openjdk.jmh</groupId>
     <artifactId>jmh-kotlin-benchmark-archetype</artifactId>
     <packaging>maven-archetype</packaging>
 
@@ -27,25 +26,17 @@
             </extension>
         </extensions>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-archetype-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <escapeString>\</escapeString>
-                </configuration>
             </plugin>
         </plugins>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml	Fri Jul 22 15:20:54 2016 +0300
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml	Fri Jul 22 18:06:15 2016 +0300
@@ -8,7 +8,6 @@
         <version>1.13-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openjdk.jmh</groupId>
     <artifactId>jmh-scala-benchmark-archetype</artifactId>
     <packaging>maven-archetype</packaging>
 
@@ -27,25 +26,17 @@
             </extension>
         </extensions>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-archetype-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <escapeString>\</escapeString>
-                </configuration>
             </plugin>
         </plugins>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
--- a/jmh-archetypes/pom.xml	Fri Jul 22 15:20:54 2016 +0300
+++ b/jmh-archetypes/pom.xml	Fri Jul 22 18:06:15 2016 +0300
@@ -45,6 +45,68 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-archetype-plugin</artifactId>
+                            <version>2.2</version>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                            <configuration>
+                                <skip>false</skip>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>others</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-archetype-plugin</artifactId>
+                            <version>2.2</version>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                            <configuration>
+                                <skip>true</skip>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <modules>
         <module>jmh-java-benchmark-archetype</module>
         <module>jmh-scala-benchmark-archetype</module>