[JENKINS-50861] update core and Pipeline scm step dependencies (#214)

* update core and pipelien scm step dependencies
jenkinsci · May 17, 2018 · c56204a · c56204a
1 parent 626b411
commit c56204a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,9 +138,11 @@ THE SOFTWARE.
     <jenkins.version>2.60.3</jenkins.version>
     <java.level>8</java.level>
     <no-test-jar>false</no-test-jar>
-    <workflow.version>1.14.2</workflow.version>
+    <!-- TODO if both workflow-* versions are the same we would remove one of the properties -->
+    <workflow-scm-step.version>2.6</workflow-scm-step.version>
+    <workflow-aggregator.version>2.5</workflow-aggregator.version>
     <findbugs.failOnError>false</findbugs.failOnError> <!-- TODO still have 27 left -->
-    <scm-api-plugin.version>2.0.8</scm-api-plugin.version>
+    <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
   </properties>
 
   <repositories>
@@ -176,12 +178,17 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>2.1.15</version>
+      <version>2.1.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>structs</artifactId>
+      <version>1.9</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>ssh-credentials</artifactId>
-      <version>1.11</version>
+      <version>1.12</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -191,7 +198,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-scm-step</artifactId>
-      <version>${workflow.version}</version>
+      <version>${workflow-scm-step.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
@@ -256,9 +263,18 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-aggregator</artifactId>
-      <version>${workflow.version}</version>
-      <classifier>tests</classifier>
+      <version>${workflow-aggregator.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.plugins.workflow</groupId>
+          <artifactId>workflow-step-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jenkins-ci.plugins.workflow</groupId>
+          <artifactId>workflow-scm-step</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/jenkins/scm/impl/subversion/SubversionSCMSource.java b/src/main/java/jenkins/scm/impl/subversion/SubversionSCMSource.java
@@ -231,8 +231,8 @@ public synchronized String getUuid() {
     protected void retrieve(@CheckForNull SCMSourceCriteria criteria,
                             @NonNull final SCMHeadObserver observer,
                             @CheckForNull SCMHeadEvent<?> event,
-                            @NonNull TaskListener listener)
-            throws IOException {
+                            @NonNull TaskListener listener) 
+                            throws IOException, InterruptedException {
         SVNRepositoryView repository = null;
         try {
             listener.getLogger().println("Opening conection to " + remoteBase);
@@ -348,8 +348,7 @@ void fetch(@NonNull TaskListener listener,
                @NonNull List<String> realPath,
                @NonNull SortedSet<List<String>> excludedPaths,
                @CheckForNull SCMSourceCriteria branchCriteria,
-               @NonNull SCMHeadObserver observer)
-            throws IOException, SVNException {
+               @NonNull SCMHeadObserver observer) throws IOException, SVNException, InterruptedException {
         String svnPath = SVNPathUtil.append(repoPath, StringUtils.join(realPath, '/'));
         assert prefix.size() == realPath.size();
         assert wildcardStartsWith(realPath, prefix);