Skip to content

Commit f484ae4

Browse files
felfertfelfert
committed
After retirement of apache jclouds, switch to own jclouds
1 parent 1a5dd68 commit f484ae4

File tree

2 files changed

+19
-52
lines changed

2 files changed

+19
-52
lines changed

‎pom.xml‎

Lines changed: 19 additions & 50 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.5.0</jclouds.version>
58+
<jclouds.version>2.7.4</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>
@@ -178,9 +178,8 @@ limitations under the License.
178178
<artifactId>cloud-stats</artifactId>
179179
</dependency>
180180
<dependency>
181-
<groupId>com.google.code.gson</groupId>
182-
<artifactId>gson</artifactId>
183-
<version>2.8.9</version>
181+
<groupId>io.jenkins.plugins</groupId>
182+
<artifactId>gson-api</artifactId>
184183
</dependency>
185184
<dependency>
186185
<groupId>io.jenkins.plugins</groupId>
@@ -191,10 +190,14 @@ limitations under the License.
191190
<artifactId>jakarta-mail-api</artifactId>
192191
</dependency>
193192
<dependency>
194-
<groupId>org.apache.jclouds</groupId>
193+
<groupId>com.github.felfert.jclouds</groupId>
195194
<artifactId>jclouds-core</artifactId>
196195
<version>${jclouds.version}</version>
197196
<exclusions>
197+
<exclusion>
198+
<groupId>com.google.code.gson</groupId>
199+
<artifactId>gson</artifactId>
200+
</exclusion>
198201
<exclusion>
199202
<groupId>com.google.guava</groupId>
200203
<artifactId>guava</artifactId>
@@ -210,30 +213,17 @@ limitations under the License.
210213
</exclusions>
211214
</dependency>
212215
<dependency>
213-
<groupId>org.apache.jclouds</groupId>
216+
<groupId>com.github.felfert.jclouds</groupId>
214217
<artifactId>jclouds-allcompute</artifactId>
215218
<version>${jclouds.version}</version>
216-
<exclusions>
217-
<!-- exclude broken digitalocean2 ... -->
218-
<exclusion>
219-
<groupId>org.apache.jclouds.provider</groupId>
220-
<artifactId>digitalocean2</artifactId>
221-
</exclusion>
222-
</exclusions>
223-
</dependency>
224-
<!-- ... and use our backported fix instead -->
225-
<dependency>
226-
<groupId>com.github.felfert</groupId>
227-
<artifactId>digitalocean2-fixed</artifactId>
228-
<version>2.5.1</version>
229219
</dependency>
230220
<dependency>
231-
<groupId>org.apache.jclouds</groupId>
221+
<groupId>com.github.felfert.jclouds</groupId>
232222
<artifactId>jclouds-allblobstore</artifactId>
233223
<version>${jclouds.version}</version>
234224
</dependency>
235225
<dependency>
236-
<groupId>org.apache.jclouds.driver</groupId>
226+
<groupId>com.github.felfert.jclouds.driver</groupId>
237227
<artifactId>jclouds-enterprise</artifactId>
238228
<version>${jclouds.version}</version>
239229
<exclusions>
@@ -244,7 +234,7 @@ limitations under the License.
244234
</exclusions>
245235
</dependency>
246236
<dependency>
247-
<groupId>org.apache.jclouds.driver</groupId>
237+
<groupId>com.github.felfert.jclouds.driver</groupId>
248238
<artifactId>jclouds-sshj</artifactId>
249239
<version>${jclouds.version}</version>
250240
<exclusions>
@@ -255,17 +245,17 @@ limitations under the License.
255245
</exclusions>
256246
</dependency>
257247
<dependency>
258-
<groupId>org.apache.jclouds</groupId>
248+
<groupId>com.github.felfert.jclouds</groupId>
259249
<artifactId>jclouds-scriptbuilder</artifactId>
260250
<version>${jclouds.version}</version>
261251
</dependency>
262252
<dependency>
263-
<groupId>org.apache.jclouds.driver</groupId>
253+
<groupId>com.github.felfert.jclouds.driver</groupId>
264254
<artifactId>jclouds-jsch</artifactId>
265255
<version>${jclouds.version}</version>
266256
</dependency>
267257
<dependency>
268-
<groupId>org.apache.jclouds</groupId>
258+
<groupId>com.github.felfert.jclouds</groupId>
269259
<artifactId>jclouds-core</artifactId>
270260
<version>${jclouds.version}</version>
271261
<classifier>tests</classifier>
@@ -278,14 +268,14 @@ limitations under the License.
278268
</exclusions>
279269
</dependency>
280270
<dependency>
281-
<groupId>org.apache.jclouds</groupId>
271+
<groupId>com.github.felfert.jclouds</groupId>
282272
<artifactId>jclouds-compute</artifactId>
283273
<version>${jclouds.version}</version>
284274
<classifier>tests</classifier>
285275
<scope>test</scope>
286276
</dependency>
287277
<dependency>
288-
<groupId>org.apache.jclouds</groupId>
278+
<groupId>com.github.felfert.jclouds</groupId>
289279
<artifactId>jclouds-blobstore</artifactId>
290280
<version>${jclouds.version}</version>
291281
<classifier>tests</classifier>
@@ -297,32 +287,13 @@ limitations under the License.
297287
<build>
298288
<finalName>${project.artifactId}</finalName>
299289
<plugins>
300-
301-
<plugin>
302-
<artifactId>maven-enforcer-plugin</artifactId>
303-
<executions>
304-
<execution>
305-
<id>display-info</id>
306-
<configuration>
307-
<rules>
308-
<requireUpperBoundDeps>
309-
<excludes combine.children="append">
310-
<exclude>com.google.code.gson:gson</exclude>
311-
</excludes>
312-
</requireUpperBoundDeps>
313-
</rules>
314-
</configuration>
315-
</execution>
316-
</executions>
317-
</plugin>
318-
319290
<plugin>
320291
<artifactId>maven-javadoc-plugin</artifactId>
321292
<configuration>
322293
<links>
323294
<link>https://javadoc.jenkins.io</link>
324-
<link>https://jclouds.apache.org/reference/javadoc/2.0.x</link>
325-
<link>https://google.github.io/guice/api-docs/4.0/javadoc</link>
295+
<link>https://javadoc.io/doc/com.github.felfert.jclouds/jclouds/latest</link>
296+
<link>https://google.github.io/guice/api-docs/6.0.0/javadoc</link>
326297
<link>https://javadoc.jenkins.io/component/stapler</link>
327298
<link>https://javaee.github.io/javaee-spec/javadocs</link>
328299
</links>
@@ -335,8 +306,6 @@ limitations under the License.
335306
<extensions>true</extensions>
336307
<configuration>
337308
<compatibleSinceVersion>2.9</compatibleSinceVersion>
338-
<!-- Workaround for https://issues.jenkins.io/browse/JENKINS-72475 -->
339-
<maskClasses>com.google.gson.</maskClasses>
340309
</configuration>
341310
</plugin>
342311

‎src/main/java/jenkins/plugins/jclouds/modules/JenkinsConfigurationModule.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.jclouds.concurrent.config.ExecutorServiceModule;
55
import org.jclouds.crypto.Crypto;
66
import org.jclouds.date.joda.config.JodaDateServiceModule;
7-
import org.jclouds.netty.config.NettyPayloadModule;
87

98
/**
109
* Similar to <code>{@link org.jclouds.enterprise.config.EnterpriseConfigurationModule}</code>,
@@ -19,6 +18,5 @@ public class JenkinsConfigurationModule extends ExecutorServiceModule {
1918
protected void configure() {
2019
bind(Crypto.class).to(JenkinsBouncyCastleCrypto.class);
2120
install(new JodaDateServiceModule());
22-
install(new NettyPayloadModule());
2321
}
2422
}

0 commit comments

Comments
 (0)