changeset 495:571c253b3e26

Clean up POMs: limit the transitive dependencies, jmh-generator-annprocess should not be included in the final JARs.
author shade
date Fri, 07 Mar 2014 23:33:10 +0400
parents bb8c78ac7e8e
children 3e0a08bcfe2c
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-core-benchmarks/pom.xml jmh-core-it/pom.xml jmh-generator-maven-plugin/pom.xml jmh-samples/pom.xml
diffstat 8 files changed, 7 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -141,14 +141,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
--- a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -44,6 +44,7 @@
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -80,14 +81,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
--- a/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -149,14 +149,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
--- a/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -140,14 +140,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
--- a/jmh-core-benchmarks/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-core-benchmarks/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -53,6 +53,7 @@
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -104,14 +105,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                     <execution>
@@ -128,14 +121,6 @@
                                     <mainClass>org.openjdk.jmh.MainValidation</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
--- a/jmh-core-it/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-core-it/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -110,6 +110,7 @@
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-generator-annprocess</artifactId>
                     <version>${project.version}</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
             <activation>
@@ -138,6 +139,7 @@
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-generator-maven-plugin</artifactId>
                     <version>${project.version}</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
             <build>
--- a/jmh-generator-maven-plugin/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-generator-maven-plugin/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -31,11 +31,13 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>2.0.9</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
             <version>2.0.9</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
--- a/jmh-samples/pom.xml	Fri Mar 07 18:29:12 2014 +0400
+++ b/jmh-samples/pom.xml	Fri Mar 07 23:33:10 2014 +0400
@@ -53,6 +53,7 @@
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -103,14 +104,6 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>