Skip to content

Commit 6a71f21

Browse files
committed
Bump up jclouds to 2.7.5
1 parent d02161e commit 6a71f21

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

pom.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ limitations under the License.
5555
<test.jenkins.blobstore.identity>FIXME_IDENTITY</test.jenkins.blobstore.identity>
5656
<test.jenkins.blobstore.credential>FIXME_CREDENTIALS</test.jenkins.blobstore.credential>
5757

58-
<jclouds.version>2.7.4</jclouds.version>
58+
<jclouds.version>2.7.5</jclouds.version>
5959
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
6060
<jenkins.baseline>2.492</jenkins.baseline>
6161
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
@@ -64,7 +64,7 @@ limitations under the License.
6464
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
6565
<!-- https://www.jenkins.io/doc/developer/plugin-development/dependencies-and-class-loading/#bundling-third-party-libraries -->
6666
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
67-
<hpi.bundledArtifacts>annotations,atmos,aws-ec2,aws-s3,azureblob,azurecompute-arm,b2,bcprov-ext-jdk18on,byon,cidrutils,cloudstack,digitalocean2,docker,ec2,eddsa,elastichosts-lon-b,elastichosts-lon-p,elastichosts-sat-p,elasticstack,error_prone_annotations,glacier,go2cloud-jhb1,gogrid,google-cloud-storage,google-compute-engine,googlecloud,guice-assistedinject,istack-commons-runtime,jakarta.annotation-api,jakarta.inject-api,jakarta.ws.rs-api,jakarta.xml.bind-api,jaxb-core,jaxb-runtime,jclouds-allblobstore,jclouds-allcompute,jclouds-blobstore,jclouds-bouncycastle,jclouds-compute,jclouds-core,jclouds-enterprise,jclouds-joda,jclouds-jsch,jclouds-okhttp,jclouds-scriptbuilder,jclouds-slf4j,jclouds-sshj,jna-platform,joda-time,jsch,jsch.agentproxy.connector-factory,jsch.agentproxy.core,jsch.agentproxy.jsch,jsch.agentproxy.pageant,jsch.agentproxy.sshagent,jsch.agentproxy.sshj,jsch.agentproxy.usocket-jna,jsch.agentproxy.usocket-nc,kotlin-stdlib,kotlin-stdlib-common,kotlin-stdlib-jdk7,kotlin-stdlib-jdk8,oauth,okhttp,okio,okio-jvm,opencsv,openhosting-east1,openstack-keystone,openstack-neutron,openstack-nova,openstack-nova-ec2,openstack-swift,packet,profitbricks,rackspace-cloudfiles,rackspace-cloudfiles-uk,rackspace-cloudfiles-us,rackspace-cloudidentity,rackspace-cloudservers-uk,rackspace-cloudservers-us,s3,serverlove-z1-man,skalicloud-sdg-my,slf4j-api,snakeyaml,softlayer,sshj,sts,txw2</hpi.bundledArtifacts>
67+
<hpi.bundledArtifacts>annotations,atmos,aws-ec2,aws-s3,azureblob,azurecompute-arm,b2,byon,cidrutils,cloudstack,digitalocean2,ec2,eddsa,elastichosts-lon-b,elastichosts-lon-p,elastichosts-sat-p,elasticstack,error_prone_annotations,glacier,go2cloud-jhb1,gogrid,google-cloud-storage,google-compute-engine,googlecloud,guice-assistedinject,istack-commons-runtime,jakarta.annotation-api,jakarta.inject-api,jakarta.ws.rs-api,jakarta.xml.bind-api,jaxb-core,jaxb-runtime,jclouds-allblobstore,jclouds-allcompute,jclouds-blobstore,jclouds-bouncycastle,jclouds-compute,jclouds-core,jclouds-enterprise,jclouds-joda,jclouds-jsch,jclouds-okhttp,jclouds-scriptbuilder,jclouds-slf4j,jclouds-sshj,jna-platform,joda-time,jsch,jsch.agentproxy.connector-factory,jsch.agentproxy.core,jsch.agentproxy.jsch,jsch.agentproxy.pageant,jsch.agentproxy.sshagent,jsch.agentproxy.sshj,jsch.agentproxy.usocket-jna,jsch.agentproxy.usocket-nc,kotlin-stdlib,oauth,okhttp,okio,okio-jvm,opencsv,openhosting-east1,openstack-keystone,openstack-neutron,openstack-nova,openstack-nova-ec2,openstack-swift,packet,profitbricks,rackspace-cloudfiles,rackspace-cloudfiles-uk,rackspace-cloudfiles-us,rackspace-cloudidentity,rackspace-cloudservers-uk,rackspace-cloudservers-us,s3,serverlove-z1-man,skalicloud-sdg-my,slf4j-api,softlayer,sshj,sts,txw2</hpi.bundledArtifacts>
6868
</properties>
6969

7070
<developers>
@@ -193,6 +193,11 @@ limitations under the License.
193193
<groupId>io.jenkins.plugins</groupId>
194194
<artifactId>jakarta-mail-api</artifactId>
195195
</dependency>
196+
<dependency>
197+
<groupId>io.jenkins.plugins</groupId>
198+
<artifactId>snakeyaml-api</artifactId>
199+
<version>2.5-143.v93b_c004f89de</version>
200+
</dependency>
196201
<dependency>
197202
<groupId>com.github.felfert.jclouds</groupId>
198203
<artifactId>jclouds-core</artifactId>
@@ -220,6 +225,16 @@ limitations under the License.
220225
<groupId>com.github.felfert.jclouds</groupId>
221226
<artifactId>jclouds-allcompute</artifactId>
222227
<version>${jclouds.version}</version>
228+
<exclusions>
229+
<exclusion>
230+
<groupId>com.github.felfert.jclouds.api</groupId>
231+
<artifactId>docker</artifactId>
232+
</exclusion>
233+
<exclusion>
234+
<groupId>org.yaml</groupId>
235+
<artifactId>snakeyaml</artifactId>
236+
</exclusion>
237+
</exclusions>
223238
</dependency>
224239
<dependency>
225240
<groupId>com.github.felfert.jclouds</groupId>

src/test/java/jenkins/plugins/jclouds/compute/JCloudsProfileTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class JCloudsProfileTest {
2121
"byon",
2222
"cloudstack",
2323
"digitalocean2",
24-
"docker",
2524
"ec2",
2625
"elastichosts-lon-b",
2726
"elastichosts-lon-p",

0 commit comments

Comments
 (0)