You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/26 22:09:38 UTC
svn commit: r1354203 -
/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
Author: olamy
Date: Tue Jun 26 20:09:37 2012
New Revision: 1354203
URL: http://svn.apache.org/viewvc?rev=1354203&view=rev
Log:
fix buildnumber plugin with svn 1.7 wc
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1354203&r1=1354202&r2=1354203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Tue Jun 26 20:09:37 2012
@@ -276,8 +276,10 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
+ <!-- Use committed revision so it does not change every time svn update is run -->
+ <useLastCommittedRevision>true</useLastCommittedRevision>
+ <!-- default revision number if unavailable -->
+ <revisionOnScmFailure>??????</revisionOnScmFailure>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
@@ -286,7 +288,12 @@
<dependency>
<groupId>com.google.code.maven-scm-provider-svnjava</groupId>
<artifactId>maven-scm-provider-svnjava</artifactId>
- <version>2.0</version>
+ <version>2.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.tmatesoft.svnkit</groupId>
+ <artifactId>svnkit</artifactId>
+ <version>1.7.5</version>
</dependency>
</dependencies>
</plugin>
@@ -315,8 +322,10 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
+ <!-- Use committed revision so it does not change every time svn update is run -->
+ <useLastCommittedRevision>true</useLastCommittedRevision>
+ <!-- default revision number if unavailable -->
+ <revisionOnScmFailure>??????</revisionOnScmFailure>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
@@ -325,39 +334,6 @@
</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>
- <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>