Merge pull request jenkinsci#74 from arun197/master

[JENKINS-25110] Update Jclouds to 1.8.0
arunsure · Oct 11, 2014 · 3452b84 · 3452b84
2 parents 700644c + 3cfdb7b
commit 3452b84
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
@@ -318,7 +318,7 @@ public String getDisplayName() {
 		}
 
 		public FormValidation doTestConnection(@QueryParameter String providerName, @QueryParameter String identity, @QueryParameter String credential,
-				@QueryParameter String privateKey, @QueryParameter String endPointUrl, @QueryParameter String zones) {
+				@QueryParameter String privateKey, @QueryParameter String endPointUrl, @QueryParameter String zones) throws IOException {
 			if (identity == null)
 				return FormValidation.error("Invalid (AccessId).");
 			if (credential == null)
@@ -347,7 +347,7 @@ public FormValidation doTestConnection(@QueryParameter String providerName, @Que
 			} catch (Exception ex) {
 				result = FormValidation.error("Cannot connect to specified cloud, please check the identity and credentials: " + ex.getMessage());
 			} finally {
-				Closeables.closeQuietly(ctx);
+				Closeables.close(ctx,true);
 			}
 			return result;
 		}

diff --git a/...ugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java b/...ugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
@@ -2,6 +2,7 @@
 
 import hudson.util.FormValidation;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
@@ -27,7 +28,7 @@ public void setUp() throws Exception {
 				Collections.<JCloudsSlaveTemplate> emptyList());
 	}
 
-	public void testDoTestConnectionCorrectCredentialsEtc() {
+	public void testDoTestConnectionCorrectCredentialsEtc () throws IOException {
 		FormValidation result = new JCloudsCloud.DescriptorImpl().doTestConnection(fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
 				generatedKeys.get("private"), fixture.getEndpoint(), null);
 		assertEquals("Connection succeeded!", result.getMessage());

diff --git a/jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java b/jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
@@ -2,6 +2,7 @@
 
 import hudson.util.FormValidation;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
@@ -28,7 +29,7 @@ public void setUp() throws Exception {
 				Collections.<JCloudsSlaveTemplate> emptyList());
 	}
 
-	public void testDoTestConnectionCorrectCredentialsEtc() {
+	public void testDoTestConnectionCorrectCredentialsEtc() throws IOException {
 		FormValidation result = new JCloudsCloud.DescriptorImpl().doTestConnection(fixture.getProvider(), fixture.getIdentity(), fixture.getCredential(),
 				generatedKeys.get("private"), fixture.getEndpoint(), null);
 		assertEquals("Connection succeeded!", result.getMessage());

diff --git a/pom.xml b/pom.xml
@@ -29,8 +29,8 @@
         <test.jenkins.blobstore.build-version />
         <test.jenkins.blobstore.identity>FIXME_IDENTITY</test.jenkins.blobstore.identity>
         <test.jenkins.blobstore.credential>FIXME_CREDENTIALS</test.jenkins.blobstore.credential>
-        <jclouds.version>1.7.3</jclouds.version>
-        <guava.version>15.0</guava.version>
+        <jclouds.version>1.8.0</jclouds.version>
+        <guava.version>18.0</guava.version>
         <jsch.version>0.1.48</jsch.version>
         <stapler.version>1.207</stapler.version>
         <hpi.plugin.version>1.97</hpi.plugin.version>