fix buildnumber plugin with svn 1.7 wc

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1354203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-06-26 20:09:37 +00:00
parent f68a05a499
commit 4890829538
1 changed files with 14 additions and 38 deletions

View File

@ -276,8 +276,10 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<doCheck>false</doCheck> <!-- Use committed revision so it does not change every time svn update is run -->
<doUpdate>false</doUpdate> <useLastCommittedRevision>true</useLastCommittedRevision>
<!-- default revision number if unavailable -->
<revisionOnScmFailure>??????</revisionOnScmFailure>
<providerImplementations> <providerImplementations>
<svn>javasvn</svn> <svn>javasvn</svn>
</providerImplementations> </providerImplementations>
@ -286,7 +288,12 @@
<dependency> <dependency>
<groupId>com.google.code.maven-scm-provider-svnjava</groupId> <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
<artifactId>maven-scm-provider-svnjava</artifactId> <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> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -315,8 +322,10 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<doCheck>false</doCheck> <!-- Use committed revision so it does not change every time svn update is run -->
<doUpdate>false</doUpdate> <useLastCommittedRevision>true</useLastCommittedRevision>
<!-- default revision number if unavailable -->
<revisionOnScmFailure>??????</revisionOnScmFailure>
<providerImplementations> <providerImplementations>
<svn>javasvn</svn> <svn>javasvn</svn>
</providerImplementations> </providerImplementations>
@ -325,39 +334,6 @@
</plugins> </plugins>
</build> </build>
</profile> </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> </profiles>