changeset 526:16bd8cd8dd20

Migrate java-benchmark-archetype to updated metadata format. This fixes a number of build issues.
author shade
date Fri, 04 Apr 2014 05:25:56 +0400
parents d91e9a272fb8
children 6c5ecbc1c491
files jmh-archetypes/jmh-java-benchmark-archetype/pom.xml jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype.xml
diffstat 3 files changed, 48 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml	Fri Apr 04 02:44:44 2014 +0400
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml	Fri Apr 04 05:25:56 2014 +0400
@@ -33,25 +33,16 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <name>JMH Benchmark Archetype: Java</name>
+    <groupId>org.openjdk.jmh</groupId>
     <artifactId>jmh-java-benchmark-archetype</artifactId>
     <packaging>maven-archetype</packaging>
 
-    <organization>
-        <name>Oracle</name>
-        <url>http://openjdk.java.net/</url>
-    </organization>
-
-    <inceptionYear>2012</inceptionYear>
+    <name>JMH Benchmark Archetype: Java</name>
 
     <description>
         Generates Java benchmarking project, uses JMH annotation processors
     </description>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <build>
         <extensions>
             <extension>
@@ -61,6 +52,15 @@
             </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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml	Fri Apr 04 05:25:56 2014 +0400
@@ -0,0 +1,37 @@
+<!--
+Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 only, as
+published by the Free Software Foundation.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the LICENSE file that accompanied this code.
+
+This code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+version 2 for more details (a copy is included in the LICENSE file that
+accompanied this code).
+
+You should have received a copy of the GNU General Public License version
+2 along with this work; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
+-->
+
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="jmh-java-bench"
+    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <fileSets>
+    <fileSet filtered="true" encoding="UTF-8">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+ </fileSets>
+</archetype-descriptor>
--- a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype.xml	Fri Apr 04 02:44:44 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<!--
-Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-  <id>jmh-simple-benchmark-archetype</id>
-  <sources>
-    <source>src/main/java/MyBenchmark.java</source>
-  </sources>
-</archetype>