changeset 923:b589db471b8b

archetypes: expose javac.target options
author shade
date Tue, 22 Jul 2014 13:41:35 +0400
parents 72ca77dfb5c6
children 0a934df60693
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
diffstat 4 files changed, 26 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 12:58:15 2014 +0400
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 13:41:35 2014 +0400
@@ -33,6 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>${project.version}</jmh.version>
         <jmh.generator>default</jmh.generator>  <!-- or "asm", or "reflection" -->
+        <javac.target>1.6</javac.target>
     </properties>
 
     <build>
@@ -129,9 +130,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>\${javac.target}</compilerVersion>
+                    <source>\${javac.target}</source>
+                    <target>\${javac.target}</target>
                     <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
--- a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 12:58:15 2014 +0400
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 13:41:35 2014 +0400
@@ -55,6 +55,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>${project.version}</jmh.version>
+        <javac.target>1.6</javac.target>
     </properties>
 
     <build>
@@ -64,9 +65,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>\${javac.target}</compilerVersion>
+                    <source>\${javac.target}</source>
+                    <target>\${javac.target}</target>
                 </configuration>
             </plugin>
             <plugin>
--- a/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 12:58:15 2014 +0400
+++ b/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 13:41:35 2014 +0400
@@ -14,16 +14,6 @@
        the plugin version set to most recent Kotlin compiler.
      -->
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>${project.version}</jmh.version>
-        <jmh.generator>default</jmh.generator>  <!-- or "asm", or "reflection" -->
-    </properties>
-
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
     <dependencies>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -36,6 +26,17 @@
          -->
     </dependencies>
 
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jmh.version>${project.version}</jmh.version>
+        <jmh.generator>default</jmh.generator>  <!-- or "asm", or "reflection" -->
+        <javac.target>1.6</javac.target>
+    </properties>
+
     <build>
         <plugins>
             <!--
@@ -142,9 +143,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>\${javac.target}</compilerVersion>
+                    <source>\${javac.target}</source>
+                    <target>\${javac.target}</target>
                     <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 12:58:15 2014 +0400
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Tue Jul 22 13:41:35 2014 +0400
@@ -33,6 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>${project.version}</jmh.version>
         <jmh.generator>default</jmh.generator>  <!-- or "asm", or "reflection" -->
+        <javac.target>1.6</javac.target>
     </properties>
 
     <build>
@@ -128,9 +129,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>\${javac.target}</compilerVersion>
+                    <source>\${javac.target}</source>
+                    <target>\${javac.target}</target>
                     <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>