[FIXED JENKINS-42000] Fix the tests (and presumably the bug too)

jenkinsci · Feb 14, 2017 · fef4a14 · fef4a14
1 parent 6570519
commit fef4a14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.19</version>
+    <version>2.21</version>
     <relativePath />
   </parent>
 
@@ -66,7 +66,8 @@
 
   <properties>
     <jenkins.version>1.642.3</jenkins.version>
-    <scm-api.version>2.0.3</scm-api.version>
+    <scm-api.version>2.0.4-20170214.145531-1</scm-api.version>
+    <hpi-plugin.version>1.121</hpi-plugin.version> <!-- TODO remove with the timestamp -SNAPSHOT -->
   </properties>
 
   <repositories>

diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -1194,7 +1194,7 @@ private boolean recognizes(Map<String, Object> attributes, MultiBranchProjectFac
                 }
 
                 @Override
-                public void complete() throws IllegalStateException, InterruptedException {
+                public void complete() throws IllegalStateException, IOException, InterruptedException {
                     try {
                         MultiBranchProjectFactory factory = null;
                         Map<String, Object> attributes = Collections.<String, Object>emptyMap();
@@ -1257,7 +1257,7 @@ public void complete() throws IllegalStateException, InterruptedException {
                         }
                         observer.created(project);
                         project.scheduleBuild();
-                    } catch (InterruptedException x) {
+                    } catch (InterruptedException | IOException x) {
                         throw x;
                     } catch (Exception x) {
                         x.printStackTrace(listener.error("Failed to create or update a subproject " + projectName));