From: Olivier Lamy <olamy@apache.org>
Date: Tue, 26 Jun 2012 20:09:37 +0000 (+0000)
Subject: fix buildnumber plugin with svn 1.7 wc
X-Git-Tag: archiva-1.4-M3~593
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=489082953800cdc6294ad07187e3c3ff2f12367d;p=archiva.git

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
---

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index dcc8fac24..faf2d0d59 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -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>