Updated versions of various Maven plugins in POMs and tidied up differences


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6bea62c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6bea62c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6bea62c0

Branch: refs/heads/master
Commit: 6bea62c0bad47bf1e762b009b0e83232761fb762
Parents: 8814a95
Author: Andrew Kennedy <[email protected]>
Authored: Wed Sep 17 23:42:54 2014 +0100
Committer: Andrew Kennedy <[email protected]>
Committed: Wed Sep 24 13:13:37 2014 +0100

----------------------------------------------------------------------
 pom.xml                                         | 191 ++++----------
 .../quickstart/src/brooklyn-sample/pom.xml      |  46 ++--
 usage/downstream-parent/pom.xml                 | 254 ++++++-------------
 3 files changed, 151 insertions(+), 340 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6bea62c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7623444..643fa1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,15 +100,21 @@
     </repositories>
 
     <properties>
+        <!-- Compilation -->
+        <java.version>1.6</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- 
BROOKLYN_VERSION -->
 
+        <!-- Testing -->
         <cobertura.version>1.9.4.1</cobertura.version>
-        <surefire.version>2.13</surefire.version>
+        <surefire.version>2.17</surefire.version>
         <plantuml.version>6121</plantuml.version>
         <ant.version>1.8.4</ant.version>
+        <includedTestGroups />
+        
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
 
+        <!-- Dependencies -->
+        <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- 
BROOKLYN_VERSION -->
         <jclouds.groupId>org.apache.jclouds</jclouds.groupId>
         <jclouds.version>1.8.0</jclouds.version>
         <guava.version>17.0</guava.version>
@@ -173,7 +179,6 @@
         <jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
         <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
         <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-        <eclipse-m2e.version>1.0.0</eclipse-m2e.version>
         
<jetty-orbit-javax-servlet.version>3.0.0.v201112011016</jetty-orbit-javax-servlet.version>
         <jcommander.version>1.27</jcommander.version>
         <xml-apis.version>1.0.b2</xml-apis.version>
@@ -188,9 +193,7 @@
         <maxmind.version>0.8.1</maxmind.version>
         <jna.version>4.0.0</jna.version>
 
-        <includedTestGroups />
-        
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
-
+        <!-- Release -->
         <!-- no passphrase by default, so we can do automated deploy builds;
              you can still supply your own passphrase with 
-Dgpg.passphrase=XXX -->
         <gpg.passphrase></gpg.passphrase>
@@ -628,45 +631,35 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>1.7</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.4.1</version>
-                    <configuration>
-                        <filesets>
-                            <fileset>
-                                <directory>.</directory>
-                                <includes>
-                                    <include>brooklyn*.log</include>
-                                    <include>brooklyn*.log.*</include>
-                                    <include>stacktrace.log</include>
-                                    <include>test-output</include>
-                                    <include>prodDb.*</include>
-                                </includes>
-                            </fileset>
-                        </filesets>
-                    </configuration>
+                    <version>2.5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>3.1</version>
+                    <configuration>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.8.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0</version>
+                    <version>1.5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.9</version>
+                    <version>2.17</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -676,7 +669,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>2.1.2</version>
+                    <version>2.3</version>
                     <inherited>true</inherited>
                     <executions>
                         <execution>
@@ -690,7 +683,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.8</version>
+                    <version>2.9.1</version>
                     <inherited>true</inherited>
                     <configuration>
                         <!-- disabling use because of NPE deploying to 
sonatype:
@@ -724,9 +717,8 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.5</version>
                     <executions>
                         <execution>
                             <id>sign-artifacts</id>
@@ -741,22 +733,22 @@
                     <!-- 'release' is not used; easier just to checkout, tag, 
`mvn deploy` manually
                          with -Dbrooklyn.deployTo=TARGET ... and note we need 
to update docs and examples,
                          which is a non-maven task!) -->
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.5</version>
                     <configuration>
                         <mavenExecutorId>forked-path</mavenExecutorId>
                         <useReleaseProfile>false</useReleaseProfile>
                         <arguments>-Dbrooklyn.deployTo=sonatype</arguments>
+                        <goals>deploy</goals>
                     </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.4.1</version>
+                    <version>2.6</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.5</version>
+                    <version>2.3</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -793,11 +785,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.0</version>
+                    <version>3.4</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.8</version>
+                    <version>2.9</version>
                     <configuration>
                         <additionalProjectnatures>
                             
<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
@@ -805,6 +797,10 @@
                     </configuration>
                 </plugin>
                 <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>2.3.4</version>
@@ -825,11 +821,6 @@
                     <version>${cobertura.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                <plugin>
                     <groupId>com.google.code.maven-replacer-plugin</groupId>
                     <artifactId>maven-replacer-plugin</artifactId>
                     <version>1.4.0</version>
@@ -842,103 +833,28 @@
                         <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <!-- This configuration is used for Eclipse settings only. 
-->
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-dependency-plugin</artifactId>
-                                        <versionRange>[2.1,)</versionRange>
-                                        <goals>
-                                            <goal>copy</goal>
-                                            <goal>copy-dependencies</goal>
-                                            <goal>unpack</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.felix</groupId>
-                                        
<artifactId>maven-bundle-plugin</artifactId>
-                                        <versionRange>[2.3.4,)</versionRange>
-                                        <goals>
-                                            <goal>manifest</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-javadoc-plugin</artifactId>
-                                        <versionRange>[2.7,3)</versionRange>
-                                        <goals>
-                                            <goal>jar</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-enforcer-plugin</artifactId>
-                                        <versionRange>[1.0,)</versionRange>
-                                        <goals>
-                                            <goal>enforce</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                  <pluginExecutionFilter>
-                                    
<groupId>com.github.skwakman.nodejs-maven-plugin</groupId>
-                                    
<artifactId>nodejs-maven-plugin</artifactId>
-                                    <versionRange>[1.0.3,)</versionRange>
-                                    <goals>
-                                      <goal>extract</goal>
-                                    </goals>
-                                  </pluginExecutionFilter>
-                                  <action>
-                                    <ignore></ignore>
-                                  </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                  <pluginExecutionFilter>
-                                    <groupId>com.github.mcheely</groupId>
-                                    
<artifactId>requirejs-maven-plugin</artifactId>
-                                    <versionRange>[2.0.0,)</versionRange>
-                                    <goals>
-                                      <goal>optimize</goal>
-                                    </goals>
-                                  </pluginExecutionFilter>
-                                  <action>
-                                    <ignore></ignore>
-                                  </action>
-                                </pluginExecution>
-                             </pluginExecutions>
-                         </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-
             </plugins>
         </pluginManagement>
+
         <plugins>
             <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>.</directory>
+                            <includes>
+                                <include>brooklyn*.log</include>
+                                <include>brooklyn*.log.*</include>
+                                <include>stacktrace.log</include>
+                                <include>test-output</include>
+                                <include>prodDb.*</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
                 <executions>
@@ -966,7 +882,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>1.6.0</version>
+                                    <version>${java.version}.0</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>[3.0.0,)</version>
@@ -984,12 +900,11 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <inherited>true</inherited>
                 <configuration>
                     <compilerId>groovy-eclipse-compiler</compilerId>
                     <fork>true</fork>
                     <verbose>false</verbose>
-                    <source>1.6</source>
-                    <target>1.6</target>
                 </configuration>
                 <dependencies>
                     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6bea62c0/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml 
b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 4fb0221..ab12a01 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -58,16 +58,20 @@
   -->
 
   <properties>
+    <!-- Compilation -->
+    <java.version>1.6</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION 
-->
-    <logback.version>1.0.7</logback.version>
-    <testng.version>6.3.1</testng.version>
-    <surefire.version>2.13</surefire.version>
-
+    <!-- Testing -->
+    <testng.version>6.8</testng.version>
+    <surefire.version>2.17</surefire.version>
     <includedTestGroups />
     <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
+
+    <!-- Dependencies -->
+    <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION 
-->
+    <logback.version>1.0.7</logback.version>
   </properties>
 
   <dependencies>
@@ -127,23 +131,23 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>3.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0</version>
+          <version>1.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.17</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -152,28 +156,32 @@
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.6</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
+          <version>2.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.9.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2.2</version>
+          <version>2.4.1</version>
         </plugin>        
         <plugin>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.9</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${surefire.version}</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     
@@ -184,8 +192,8 @@
           <compilerId>groovy-eclipse-compiler</compilerId>
           <fork>true</fork>
           <verbose>false</verbose>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
         <dependencies>
           <dependency>
@@ -222,7 +230,6 @@
       </plugin>
 
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <configuration>
               <archive>
@@ -232,7 +239,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
@@ -359,9 +365,7 @@
           </plugin>
 
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6bea62c0/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index db2f129..535809a 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -33,17 +33,21 @@
   </description>
 
   <properties>
+    <!-- Compilatin -->
+    <java.version>1.6</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <java.version>1.6</java.version>
+    <!-- Testing -->
+    <testng.version>6.8</testng.version>
+    <surefire.version>2.17</surefire.version>
+    <includedTestGroups />
+    
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
     
+    <!-- Dependencies -->
     <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version>  <!-- BROOKLYN_VERSION 
-->
-
-    <!-- dependency versions should match those used by Brooklyn, to avoid 
conflicts -->
+    <!-- versions should match those used by Brooklyn, to avoid conflicts -->
     <logback.version>1.0.7</logback.version>
-    <testng.version>6.8</testng.version>
-    <surefire.version>2.13</surefire.version>
     <guava.version>17.0</guava.version>
     <xstream.version>1.4.7</xstream.version>
     <jackson.version>1.9.13</jackson.version>
@@ -51,10 +55,6 @@
     <jersey.version>1.12</jersey.version>
     <httpclient.version>4.2.5</httpclient.version>
     <commons-lang3.version>3.1</commons-lang3.version>
-
-    <includedTestGroups />
-    
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
-    
   </properties>
 
   <dependencyManagement>
@@ -124,7 +124,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.0</version>
+          <version>3.1</version>
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
@@ -132,19 +132,19 @@
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0</version>
+          <version>1.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.17</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -153,37 +153,23 @@
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.6</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
+          <version>2.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
-          <configuration>
-            <filesets>
-              <fileset>
-                <directory>.</directory>
-                <includes>
-                  <include>brooklyn*.log</include>
-                  <include>brooklyn*.log.*</include>
-                  <include>stacktrace.log</include>
-                  <include>test-output</include>
-                  <include>prodDb.*</include>
-                </includes>
-              </fileset>
-            </filesets>
-          </configuration>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.9</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -191,150 +177,39 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.8</version>
-          <inherited>true</inherited>
-          <configuration>
-            <!-- disabling use because of NPE deploying to sonatype:
-                 
http://stackoverflow.com/questions/888199/why-does-maven-install-fail-during-javadoc-generation
-                 
http://bugs.sun.com/bugdatabase/view_bug.do;jsessionid=ac084ab7f47c4e7f1df2117cecd?bug_id=5101868
-            -->
-            <use>false</use>
-            <links>
-              <link>http://download.oracle.com/javaee/6/api</link>
-            </links>
-            <keywords>true</keywords>
-            <author>false</author>
-            <quiet>true</quiet>
-            <aggregate>false</aggregate>
-            <detectLinks />
-            <tags>
-              <tag>
-                <name>todo</name>
-                <placement>a</placement>
-                <head>To-do:</head>
-              </tag>
-            </tags>
-          </configuration>
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
+          <version>2.9.1</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.1</version>
-          <executions>
-            <execution>
-              <id>sign-artifacts</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>sign</goal>
-              </goals>
-            </execution>
-          </executions>
+          <version>1.5</version>
         </plugin>
         <plugin>
-          <!-- This configuration is used for Eclipse settings only. -->
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.1,)</versionRange>
-                    <goals>
-                      <goal>copy</goal>
-                      <goal>copy-dependencies</goal>
-                      <goal>unpack</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <versionRange>[2.3.4,)</versionRange>
-                    <goals>
-                      <goal>manifest</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <versionRange>[2.7,3)</versionRange>
-                    <goals>
-                      <goal>jar</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <versionRange>[1.0,)</versionRange>
-                    <goals>
-                      <goal>enforce</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                 </pluginExecution>
-                 <pluginExecution>
-                   <pluginExecutionFilter>
-                     <groupId>com.github.skwakman.nodejs-maven-plugin</groupId>
-                     <artifactId>nodejs-maven-plugin</artifactId>
-                     <versionRange>[1.0.3,)</versionRange>
-                     <goals>
-                       <goal>extract</goal>
-                     </goals>
-                   </pluginExecutionFilter>
-                   <action>
-                     <ignore></ignore>
-                   </action>
-                 </pluginExecution>
-                 <pluginExecution>
-                   <pluginExecutionFilter>
-                     <groupId>com.github.mcheely</groupId>
-                     <artifactId>requirejs-maven-plugin</artifactId>
-                     <versionRange>[2.0.0,)</versionRange>
-                     <goals>
-                       <goal>optimize</goal>
-                     </goals>
-                   </pluginExecutionFilter>
-                   <action>
-                     <ignore></ignore>
-                   </action>
-                 </pluginExecution>
-               </pluginExecutions>
-             </lifecycleMappingMetadata>
-           </configuration>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5</version>
         </plugin>
       </plugins>
     </pluginManagement>
-    
+
     <plugins>
       <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>.</directory>
+              <includes>
+                <include>brooklyn*.log</include>
+                <include>brooklyn*.log.*</include>
+                <include>stacktrace.log</include>
+                <include>test-output</include>
+                <include>prodDb.*</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+
+      <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>
       
@@ -369,7 +244,16 @@
           <printSummary>true</printSummary>
         </configuration>
       </plugin>
-        
+
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+          <useReleaseProfile>true</useReleaseProfile>
+          <releaseProfiles>Release</releaseProfiles>
+          <goals>deploy</goals>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -416,15 +300,17 @@
       </build>
     </profile>
 
-
-    <!-- make sonatype-friendly deployment build with -PSonatype
-         (they require signed artifacts, javadoc and source jars; 
-         this snippet doesn't do everything, as you need to set up a key etc,
-         but it should get you a long way there (and prevent maven faffing).
-         if you don't deploy to sonatype you can delete this, or leave it
-         (it has no effect unless you enter -PSonatype ) -->
+    <!-- make release build (e.g. for Sonatype) with -PRelease -->
     <profile>
-      <id>Sonatype</id>
+      <id>Release</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+        </property>
+      </activation>
+      <properties>
+        <gpg.passphrase></gpg.passphrase>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -440,7 +326,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
             <inherited>true</inherited>
@@ -474,12 +359,19 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-          </plugin>
-        </plugins>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+            </plugin>
+          </plugins>
       </build>
     </profile>
 

Reply via email to