You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/02/07 16:19:16 UTC
[4/4] git commit: better buildnumber
Updated Branches:
refs/heads/maven-3.0.x 78fa8ba97 -> c14bd18cd
better buildnumber
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c14bd18c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c14bd18c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c14bd18c
Branch: refs/heads/maven-3.0.x
Commit: c14bd18cd015db55ee3233e47c772df958f527d8
Parents: 30d72ba
Author: olivier lamy <ol...@apache.org>
Authored: Thu Feb 7 16:19:03 2013 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Thu Feb 7 16:19:03 2013 +0100
----------------------------------------------------------------------
maven-core/pom.xml | 87 +++++++++++++----------------------------------
pom.xml | 2 +-
2 files changed, 25 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c14bd18c/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 429d633..61bd6ef 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -127,73 +127,34 @@
</models>
</configuration>
</plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>svn-buildnumber</id>
- <activation>
- <file>
- <exists>.svn</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-noncanonicalrev</id>
+ <goals>
+ <goal>create-timestamp</goal>
+ </goals>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
+ <timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat>
+ <timestampPropertyName>nonCanonicalRevision</timestampPropertyName>
</configuration>
- </plugin>
- </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>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
+ </execution>
+ <execution>
+ <id>create-buildnumber</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
<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>
+ <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
</configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/c14bd18c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ec5dff..d68209a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,7 +457,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>