changeset 1046:324eb2d5c6ac

Fix archetype regressions after 7901113.
author shade
date Thu, 27 Nov 2014 00:33:16 +0300
parents 5fdbb732ea81
children 81cf94290ce0
files jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/src/main/groovy/MyBenchmark.groovy 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/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/src/main/scala/MyBenchmark.scala
diffstat 5 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:06:16 2014 +0300
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:33:16 2014 +0300
@@ -29,7 +29,6 @@
 THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>\${groupId}</groupId>
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/src/main/groovy/MyBenchmark.groovy	Thu Nov 27 00:06:16 2014 +0300
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/src/main/groovy/MyBenchmark.groovy	Thu Nov 27 00:33:16 2014 +0300
@@ -29,14 +29,12 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package $
+package ${groupId}
 
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
 
-{groupId}
-
 @State(Scope.Benchmark)
 class MyBenchmark {
 
--- a/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:06:16 2014 +0300
+++ b/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:33:16 2014 +0300
@@ -29,7 +29,6 @@
 THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>\${groupId}</groupId>
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:06:16 2014 +0300
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Thu Nov 27 00:33:16 2014 +0300
@@ -29,7 +29,6 @@
 THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>\${groupId}</groupId>
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/src/main/scala/MyBenchmark.scala	Thu Nov 27 00:06:16 2014 +0300
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/src/main/scala/MyBenchmark.scala	Thu Nov 27 00:33:16 2014 +0300
@@ -31,6 +31,8 @@
 
 package ${groupId}
 
+import org.openjdk.jmh.annotations.Benchmark
+
 class MyBenchmark {
 
   @Benchmark