geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r687229 - in /geronimo/genesis/trunk: genesis-flava/genesis-default-flava/pom.xml pom.xml
Date Wed, 20 Aug 2008 03:43:00 GMT
Author: jdillon
Date: Tue Aug 19 20:43:00 2008
New Revision: 687229

URL: http://svn.apache.org/viewvc?rev=687229&view=rev
Log:
Add some profiles to support release muck

Modified:
    geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml?rev=687229&r1=687228&r2=687229&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml Tue Aug 19 20:43:00
2008
@@ -35,44 +35,6 @@
     <packaging>pom</packaging>
     
     <build>
-        <defaultGoal>install</defaultGoal>
-        
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            
-            <resource>
-                <directory>${project.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        
-        <testResources>
-            <testResource>
-                <directory>${project.basedir}/src/test/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-            
-            <testResource>
-                <directory>${project.basedir}/src/test/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-        </testResources>
-        
         <extensions>
             <extension>
                 <groupId>org.apache.geronimo.genesis</groupId>
@@ -280,6 +242,7 @@
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <forkMode>once</forkMode>
                         <argLine>-enableassertions</argLine>
+                        <failIfNoTests>false</failIfNoTests>
                         <workingDirectory>${project.build.directory}</workingDirectory>
                         <excludes>
                             <exclude>**/Abstract*.java</exclude>
@@ -465,6 +428,7 @@
                 <configuration>
                     <quiet>true</quiet>
                     <tags>
+                        <!-- Maven/Plexus related tags -->
                         <tag>
                             <name>goal</name>
                             <placement>Xt</placement>
@@ -544,30 +508,5 @@
         </plugins>
     </reporting>
     
-    <profiles>
-        <profile>
-            <id>stage-distribution</id>
-            <activation>
-                <property>
-                    <name>stageDistributionURL</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <repository>
-                    <id>stage-repository</id>
-                    <url>${stageDistributionURL}/repository</url>
-                </repository>
-                <snapshotRepository>
-                    <id>stage-snapshot-repository</id>
-                    <url>${stageDistributionURL}/snapshot-repository</url>
-                </snapshotRepository>
-                <site>
-                    <id>stage-site</id>
-                    <url>${stageDistributionURL}/site</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-    
 </project>
 

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=687229&r1=687228&r2=687229&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Tue Aug 19 20:43:00 2008
@@ -56,6 +56,9 @@
     
     <inceptionYear>2003</inceptionYear>
     
+    <!--
+    FIXME: This won't work... mvn interpolation is not very intelligent.
+    
     <url>http://geronimo.apache.org/maven-generated/${project.artifactId}/${project.version}</url>
 
     <scm>
@@ -69,19 +72,8 @@
             <id>geronimo-website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven-generated/${project.artifactId}/${project.version}</url>
         </site>
-        <!-- override default repos, so we can set the uniqueVersion=false for snapshots
-->
-        <repository>
-            <id>apache.releases</id>
-            <name>Apache Release Distribution Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </repository>
-        <snapshotRepository>
-            <id>apache.snapshots</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-            <uniqueVersion>false</uniqueVersion>
-        </snapshotRepository>
     </distributionManagement>
+    -->
     
     <build>
         <defaultGoal>install</defaultGoal>
@@ -131,6 +123,119 @@
     
     <profiles>
         <profile>
+            <id>release</id>
+
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                            <autoVersionSubmodules>true</autoVersionSubmodules>
+                            <useReleaseProfile>false</useReleaseProfile>
+                            <arguments>-Drelease</arguments>
+                            <preparationGoals>clean verify</preparationGoals>
+                            <goals>deploy</goals>
+                        </configuration>
+                    </plugin>
+                    
+                    <!--
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <passphrase>${gpg.passphrase}</passphrase>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    -->
+                    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <updateReleaseInfo>true</updateReleaseInfo>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>distribution</id>
+            
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>javadoc</goal>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>stage-deploy</id>
+
+            <activation>
+                <property>
+                    <name>stageDeployUrl</name>
+                </property>
+            </activation>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <altDeploymentRepository>stage-deploy::default::${stageDeployUrl}</altDeploymentRepository>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
             <id>stage-distribution</id>
             <activation>
                 <property>



Mime
View raw message