You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/06/21 13:15:37 UTC

svn commit: r1495385 - /commons/proper/commons-gpg-plugin/trunk/pom.xml

Author: sebb
Date: Fri Jun 21 11:15:36 2013
New Revision: 1495385

URL: http://svn.apache.org/r1495385
Log:
Tidy up; add sample release profile

Modified:
    commons/proper/commons-gpg-plugin/trunk/pom.xml

Modified: commons/proper/commons-gpg-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-gpg-plugin/trunk/pom.xml?rev=1495385&r1=1495384&r2=1495385&view=diff
==============================================================================
--- commons/proper/commons-gpg-plugin/trunk/pom.xml (original)
+++ commons/proper/commons-gpg-plugin/trunk/pom.xml Fri Jun 21 11:15:36 2013
@@ -44,9 +44,9 @@ This is intended as a temporary measure 
   </issueManagement>
 
   <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-gpg-plugin/trunk/</connection>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-gpg-plugin/trunk/</developerConnection>
-      <url>http://svn.apache.org/viewvc/commons/proper/commons-gpg-plugin/trunk/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-gpg-plugin/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-gpg-plugin/trunk/</developerConnection>
+    <url>http://svn.apache.org/viewvc/commons/proper/commons-gpg-plugin/trunk/</url>
   </scm>
 
   <prerequisites>
@@ -67,11 +67,29 @@ This is intended as a temporary measure 
     <!-- Temporary fix until CP31 is released -->
     <maven.compile.source>${maven.compiler.source}</maven.compile.source>
     <maven.compile.target>${maven.compiler.target}</maven.compile.target>
+    <!-- This should move to parent pom -->
+    <commons.packages.directory>target/packages</commons.packages.directory>
   </properties>
 
   <!-- See http://maven.apache.org/plugin-tools/maven-plugin-plugin/examples/using-annotations.html -->
 
   <dependencies>
+    <!-- We use the Gpg plugin to do the signing -->
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-gpg-plugin</artifactId>
+      <version>1.4</version>
+    </dependency>
+
+    <!-- SignFilesMojo uses DirectoryScanner -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.0.7</version>
+    </dependency>
+
+    <!-- Following dependencies are for building/running Mojos -->
+
     <!-- for our own help Mojo -->
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
@@ -95,16 +113,6 @@ This is intended as a temporary measure 
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
       <version>${mavenPluginPluginVersion}</version>
@@ -112,16 +120,17 @@ This is intended as a temporary measure 
            for execution with using provided scope -->
       <scope>provided</scope>
     </dependency>
+    <!-- needed ? -->
     <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.4</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>${mavenVersion}</version>
     </dependency>
-    <!-- SignFilesMojo uses DirectoryScanner -->
+    <!-- needed ? -->
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.0.7</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
     </dependency>
   </dependencies>
 
@@ -129,22 +138,6 @@ This is intended as a temporary measure 
 
     <pluginManagement>
       <plugins>
-        <!--  Allow plugin to be called with the project for testing without using the full name -->
-        <plugin>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-gpg-plugin</artifactId>
-          <version>${project.version}</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <configuration>
-            <descriptors>
-              <descriptor>src/main/assembly/bin.xml</descriptor>
-              <descriptor>src/main/assembly/src.xml</descriptor>
-            </descriptors>
-            <tarLongFileMode>gnu</tarLongFileMode>
-          </configuration>
-        </plugin>
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
           <version>${mavenPluginPluginVersion}</version>
@@ -152,14 +145,32 @@ This is intended as a temporary measure 
             <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
           </configuration>
         </plugin>
+        <!-- This needs to be part of the parent pom -->
+        <plugin>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-gpg-plugin</artifactId>
+          <!-- but with a specific version -->
+          <version>${project.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
-      <!--  Allow plugin to be called with the project for testing without using the full name -->
+      <!-- self reference to allow use with shortcut name -->
       <plugin>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-gpg-plugin</artifactId>
+        <version>${project.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -191,4 +202,46 @@ This is intended as a temporary measure 
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <!-- This will eventually be merged into the parent pom -->
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <!-- We want to create the assemblies in their own directory -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <!-- Stop assemblies from being deployed to Nexus -->
+              <attach>false</attach>
+              <!-- put them here instead -->
+              <outputDirectory>${commons.packages.directory}</outputDirectory>
+            </configuration>
+          </plugin>
+          <!-- Create the signatures -->
+          <plugin>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>digest</goal>
+                </goals>
+                <!-- must run after assembly and before deploy -->
+                <phase>verify</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <includes>
+                <include>${commons.packages.directory}/*.zip</include>
+                <include>${commons.packages.directory}/*.tar.gz</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+  </profiles>
 </project>