[JENKINS-18935] Upgrade svnkit library to 1.8.7 and add 1.8 in the gl…

…obal workspace options.
jenkinsci · Nov 6, 2014 · fc8093b · fc8093b
1 parent f3ade10
commit fc8093b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.tmatesoft.svnkit</groupId>
       <artifactId>svnkit</artifactId>
-      <version>1.7.10</version>
+      <version>1.8.6</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>

diff --git a/src/main/java/hudson/scm/SvnClientManager.java b/src/main/java/hudson/scm/SvnClientManager.java
@@ -2,6 +2,7 @@
 
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
+import org.tmatesoft.svn.core.internal.wc17.db.ISVNWCDb;
 import org.tmatesoft.svn.core.internal.wc2.SvnWcGeneration;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNBasicClient;
@@ -12,6 +13,7 @@
 import org.tmatesoft.svn.core.wc.SVNStatusClient;
 import org.tmatesoft.svn.core.wc.SVNUpdateClient;
 import org.tmatesoft.svn.core.wc.SVNWCClient;
+import org.tmatesoft.svn.core.wc2.SvnSetWCDbVersion;
 
 /**
  * {@link SVNClientManager} makes it rather error prone to specify the proper expected version
@@ -27,7 +29,7 @@ public class SvnClientManager {
     public SvnClientManager(SVNClientManager core) {
         this.core = core;
         SubversionWorkspaceSelector.syncWorkspaceFormatFromMaster();
-        wcgen = SubversionWorkspaceSelector.workspaceFormat>=SubversionWorkspaceSelector.WC_FORMAT_17 ? SvnWcGeneration.V17 : SvnWcGeneration.V16;
+        wcgen = SubversionWorkspaceSelector.workspaceFormat>= ISVNWCDb.WC_FORMAT_18 ? SvnWcGeneration.V17 : SvnWcGeneration.V16;
     }
 
     public SVNClientManager getCore() {

diff --git a/src/main/resources/hudson/scm/SubversionSCM/global.jelly b/src/main/resources/hudson/scm/SubversionSCM/global.jelly
@@ -31,6 +31,7 @@ THE SOFTWARE.
             <f:option value="9"   selected="${descriptor.workspaceFormat==9}"  >1.5</f:option>
             <f:option value="10"  selected="${descriptor.workspaceFormat==10}" >1.6 (svn:externals to file)</f:option>
             <f:option value="100" selected="${descriptor.workspaceFormat==100}">1.7</f:option>
+            <f:option value="31"  selected="${descriptor.workspaceFormat==31}" >1.8</f:option>
           </select>
         </f:entry>
         <f:entry title="${%Exclusion revprop name}" help="/descriptor/hudson.scm.SubversionSCM/help/excludedRevprop">