You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/06 18:38:18 UTC

svn commit: r634359 - /geronimo/genesis/trunk/pom.xml

Author: djencks
Date: Thu Mar  6 09:38:09 2008
New Revision: 634359

URL: http://svn.apache.org/viewvc?rev=634359&view=rev
Log:
remerge jdillon's changes, remove tagBase

Modified:
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=634359&r1=634358&r2=634359&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Thu Mar  6 09:38:09 2008
@@ -21,39 +21,39 @@
 <!-- $Rev$ $Date$ -->
 
 <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/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>3</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.genesis</groupId>
     <artifactId>genesis</artifactId>
     <name>Genesis</name>
     <packaging>pom</packaging>
     <inceptionYear>2003</inceptionYear>
-    
+
     <version>1.4-SNAPSHOT</version>
-    
+
     <description>
         Genesis provides support for Maven2 builds; adding shared configurations
         and common plugins.
     </description>
-    
+
     <url>http://geronimo.apache.org</url>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/genesis/trunk</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/genesis/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/genesis/trunk</url>
     </scm>
-    
+
     <build>
         <defaultGoal>install</defaultGoal>
-        
+
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -61,7 +61,7 @@
                 <version>1.0-beta-2</version>
             </extension>
         </extensions>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -69,7 +69,7 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.0-beta-7</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -93,25 +93,25 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
                     <version>1.0-beta-1</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
                     <version>2.2</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.0.2</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
@@ -119,7 +119,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -129,7 +129,7 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-             
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-idea-plugin</artifactId>
@@ -139,10 +139,10 @@
                     <linkModules>true</linkModules>
                 </configuration>
             </plugin>
-            
+
         </plugins>
     </build>
-    
+
     <distributionManagement>
         <site>
             <id>geronimo-website</id>
@@ -153,18 +153,18 @@
     <profiles>
         <profile>
             <id>default</id>
-            
+
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            
+
             <modules>
                 <module>legal-bundle</module>
                 <module>config</module>
                 <module>plugins</module>
             </modules>
         </profile>
-        
+
         <!--
         NOTE: The staged build is used to get around a problem with Maven
               and extention plugins.
@@ -173,14 +173,14 @@
         -->
         <profile>
             <id>stage-bootstrap</id>
-            
+
             <activation>
                 <property>
                     <name>stage</name>
                     <value>bootstrap</value>
                 </property>
             </activation>
-            
+
             <modules>
                 <module>config/checkstyle-config</module>
             </modules>
@@ -195,12 +195,12 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
                         <configuration>
-                            <tagBase>https://svn.apache.org/repos/asf/geronimo/genesis/tags</tagBase>
                             <useReleaseProfile>false</useReleaseProfile>
                             <goals>deploy</goals>
                             <arguments>-Prelease</arguments>
                         </configuration>
                     </plugin>
+
                     <!-- We want a source jar -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -213,10 +213,12 @@
                             </execution>
                         </executions>
                     </plugin>
+
                     <!-- We want to sign the artifact, the POM, and all attached artifacts -->
                     <plugin>
-                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                        <inherited>true</inherited>
                         <configuration>
                             <passphrase>${gpg.passphrase}</passphrase>
                         </configuration>
@@ -228,19 +230,23 @@
                             </execution>
                         </executions>
                     </plugin>
+
                     <!-- We want to deploy the artifact to a staging location for perusal -->
                     <plugin>
-                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-deploy-plugin</artifactId>
+                        <inherited>true</inherited>
                         <configuration>
                             <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
                             <updateReleaseInfo>true</updateReleaseInfo>
                         </configuration>
                     </plugin>
+
                     <!-- We want the JavaDoc JAR published with the release -->
                     <plugin>
-                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <inherited>true</inherited>
                         <configuration>
                             <source>1.5</source>
                         </configuration>