Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit 1394978

Browse files
author
Rustam Aliyev
committed
Update dependencies. Include AWS S3 in integration tests.
1 parent 48bbefa commit 1394978

File tree

4 files changed

+53
-10
lines changed

4 files changed

+53
-10
lines changed

‎itests/pom.xml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,15 @@
200200
<type>bundle</type>
201201
<scope>provided</scope>
202202
</dependency>
203-
<dependency>
203+
<!-- <dependency>
204204
<groupId>com.fasterxml.jackson.jaxrs</groupId>
205205
<artifactId>jackson-jaxrs-xml-provider</artifactId>
206206
<version>${bundle.jackson.version}</version>
207207
<type>bundle</type>
208208
<scope>provided</scope>
209209
</dependency>
210-
<dependency>
210+
-->
211+
<dependency>
211212
<groupId>javax.mail</groupId>
212213
<artifactId>mail</artifactId>
213214
<version>${bundle.javamail.version}</version>
@@ -257,6 +258,27 @@
257258
<type>bundle</type>
258259
<scope>provided</scope>
259260
</dependency>
261+
<dependency>
262+
<groupId>org.jclouds.common</groupId>
263+
<artifactId>aws-common</artifactId>
264+
<version>${bundle.jclouds.version}</version>
265+
<type>bundle</type>
266+
<scope>provided</scope>
267+
</dependency>
268+
<dependency>
269+
<groupId>org.jclouds.provider</groupId>
270+
<artifactId>aws-s3</artifactId>
271+
<version>${bundle.jclouds.version}</version>
272+
<type>bundle</type>
273+
<scope>provided</scope>
274+
</dependency>
275+
<dependency>
276+
<groupId>org.jclouds.api</groupId>
277+
<artifactId>s3</artifactId>
278+
<version>${bundle.jclouds.version}</version>
279+
<type>bundle</type>
280+
<scope>provided</scope>
281+
</dependency>
260282
<dependency>
261283
<groupId>org.apache.servicemix.bundles</groupId>
262284
<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
@@ -310,6 +332,17 @@
310332
<artifactId>gson</artifactId>
311333
<version>${bundle.gson.version}</version>
312334
</dependency>
335+
<dependency>
336+
<groupId>org.99soft.guice</groupId>
337+
<artifactId>rocoto</artifactId>
338+
<version>6.1</version>
339+
<scope>provided</scope>
340+
</dependency>
341+
<dependency>
342+
<groupId>org.bouncycastle</groupId>
343+
<artifactId>bcprov-jdk16</artifactId>
344+
<version>1.46</version>
345+
</dependency>
313346

314347
<!-- Pax Exam Dependencies -->
315348
<dependency>

‎itests/src/test/java/com/elasticinbox/itests/AbstractIntegrationTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public Option[] config()
6060
// Logging
6161
mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").versionAsInProject(),
6262
mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").versionAsInProject(),
63+
mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject(),
6364

6465
// REST-Assured Bundles
6566
wrappedBundle(mavenBundle().groupId("com.jayway.restassured").artifactId("rest-assured").versionAsInProject()).
@@ -82,13 +83,17 @@ public Option[] config()
8283
mavenBundle().groupId("com.google.inject").artifactId("guice").versionAsInProject(),
8384
mavenBundle().groupId("org.jclouds").artifactId("jclouds-core").versionAsInProject(),
8485
mavenBundle().groupId("org.jclouds").artifactId("jclouds-blobstore").versionAsInProject(),
86+
mavenBundle().groupId("org.jclouds.common").artifactId("aws-common").versionAsInProject(),
87+
mavenBundle().groupId("org.jclouds.provider").artifactId("aws-s3").versionAsInProject(),
88+
mavenBundle().groupId("org.jclouds.api").artifactId("s3").versionAsInProject(),
8589
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.aopalliance").versionAsInProject(),
8690
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.javax-inject").versionAsInProject(),
8791
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.oauth-commons").versionAsInProject(),
8892
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.java-xmlbuilder").versionAsInProject(),
8993
mavenBundle().groupId("com.google.inject.extensions").artifactId("guice-assistedinject").versionAsInProject(),
9094
mavenBundle().groupId("com.google.code.gson").artifactId("gson").versionAsInProject(),
91-
mavenBundle("org.99soft.guice", "rocoto", "6.1"),
95+
mavenBundle().groupId("org.bouncycastle").artifactId("bcprov-jdk16").versionAsInProject(),
96+
mavenBundle().groupId("org.99soft.guice").artifactId("rocoto").versionAsInProject(),
9297

9398
// ElasticInbox Bundles
9499
mavenBundle().groupId("com.google.guava").artifactId("guava").versionAsInProject(),

‎modules/core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,11 @@
296296
<version>6.1</version>
297297
<scope>provided</scope>
298298
</dependency>
299+
<dependency>
300+
<groupId>org.bouncycastle</groupId>
301+
<artifactId>bcprov-jdk16</artifactId>
302+
<version>1.46</version>
303+
</dependency>
299304

300305
<!-- Logging Dependencies -->
301306
<dependency>

‎pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,27 @@
6666
<bundle.paxweb.version>1.1.1</bundle.paxweb.version>
6767
<bundle.paxexam.version>2.3.1</bundle.paxexam.version>
6868
<bundle.paxurl.version>1.3.5</bundle.paxurl.version>
69-
<bundle.logback.version>1.0.7</bundle.logback.version>
70-
<bundle.slf4j.version>1.6.4</bundle.slf4j.version>
69+
<bundle.logback.version>1.0.9</bundle.logback.version>
70+
<bundle.slf4j.version>1.7.2</bundle.slf4j.version>
7171
<bundle.speed4j.version>0.13</bundle.speed4j.version>
72-
<bundle.jclouds.version>1.5.2</bundle.jclouds.version>
72+
<bundle.jclouds.version>1.5.4</bundle.jclouds.version>
7373
<bundle.javax-inject.version>1_1</bundle.javax-inject.version>
7474
<bundle.guice.version>3.0</bundle.guice.version>
75-
<bundle.gson.version>2.2</bundle.gson.version>
75+
<bundle.gson.version>2.2.2</bundle.gson.version>
7676
<bundle.guava.version>13.0.1</bundle.guava.version>
7777
<bundle.aopalliance.version>1.0_5</bundle.aopalliance.version>
7878
<bundle.net.oauth.version>20100527_1</bundle.net.oauth.version>
79-
<bundle.jersey.version>1.14</bundle.jersey.version>
79+
<bundle.jersey.version>1.16</bundle.jersey.version>
8080
<bundle.jackson.version>2.1.2</bundle.jackson.version>
8181
<bundle.compress-lzf.version>0.9.6</bundle.compress-lzf.version>
8282
<bundle.javamail.version>1.4.5</bundle.javamail.version>
8383
<bundle.java-xmlbuilder.version>0.4_1</bundle.java-xmlbuilder.version>
8484
<bundle.commons-io.version>2.4</bundle.commons-io.version>
8585
<bundle.commons-lang.version>2.6</bundle.commons-lang.version>
8686
<bundle.servlet-api.version>2.5.20110712</bundle.servlet-api.version>
87-
<bundle.netty.version>3.5.7.Final</bundle.netty.version>
87+
<bundle.netty.version>3.5.11.Final</bundle.netty.version>
8888
<bundle.james-protocols.version>1.6.2</bundle.james-protocols.version>
89-
<bundle.snakeyaml.version>1.10</bundle.snakeyaml.version>
89+
<bundle.snakeyaml.version>1.11</bundle.snakeyaml.version>
9090

9191
<!-- Profiling Configs -->
9292
<visualvm.root.folder>/System/Library/Java/Support/VisualVM.bundle/Contents/Home/</visualvm.root.folder>

0 commit comments

Comments
 (0)