You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/01/29 04:44:30 UTC
svn commit: r904368 - in /maven/components/branches/maven-2.0.11-RC: ./
apache-maven/ apache-maven/src/test/ maven-core/pom.xml
maven-integration-tests/ maven-model/src/test/
Author: brett
Date: Fri Jan 29 03:44:29 2010
New Revision: 904368
URL: http://svn.apache.org/viewvc?rev=904368&view=rev
Log:
support non-canonical build numbers
Merged from r768948,768998 on maven-2.2.x branch
Modified:
maven/components/branches/maven-2.0.11-RC/ (props changed)
maven/components/branches/maven-2.0.11-RC/apache-maven/ (props changed)
maven/components/branches/maven-2.0.11-RC/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.0.11-RC/maven-model/src/test/ (props changed)
Propchange: maven/components/branches/maven-2.0.11-RC/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 03:44:29 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
/maven/components/branches/maven-2.1.0-RC:753089
/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796,766523,768995,769010-769011
+/maven/components/branches/maven-2.2.x:768948,768997
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.11-RC/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 03:44:29 2010
@@ -2,5 +2,6 @@
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
/maven/components/branches/maven-2.1.0-RC/apache-maven:753089
/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
+/maven/components/branches/maven-2.2.x/apache-maven:768948,768997
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.11-RC/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 03:44:29 2010
@@ -1,3 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:753089
/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
+/maven/components/branches/maven-2.2.x/apache-maven/src/test:768948,768997
Modified: maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml?rev=904368&r1=904367&r2=904368&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml Fri Jan 29 03:44:29 2010
@@ -234,7 +234,7 @@
</build>
</profile>
<profile>
- <id>buildnumber</id>
+ <id>canonical-buildnumber</id>
<activation>
<file>
<exists>.svn</exists>
@@ -262,5 +262,39 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>non-canonical-buildnumber</id>
+ <activation>
+ <file>
+ <missing>.svn</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>
+ <items>
+ <item>timestamp</item>
+ <item>${user.name}</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Propchange: maven/components/branches/maven-2.0.11-RC/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 03:44:29 2010
@@ -1,3 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:753089
/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
+/maven/components/branches/maven-2.2.x/maven-integration-tests:768948,768997
Propchange: maven/components/branches/maven-2.0.11-RC/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 03:44:29 2010
@@ -1,3 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:753089
/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
+/maven/components/branches/maven-2.2.x/maven-model/src/test:768948,768997