You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/07/03 20:39:29 UTC
git commit: Consistently use Square's mockwebserver
Repository: jclouds
Updated Branches:
refs/heads/master 71043ac9a -> 05c37c2c7
Consistently use Square's mockwebserver
Google mockwebserver merged into OkHttp as per:
https://code.google.com/p/mockwebserver/
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/05c37c2c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/05c37c2c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/05c37c2c
Branch: refs/heads/master
Commit: 05c37c2c77d1a1fe4c21813d1f1a71588513d0b2
Parents: 71043ac
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Jun 18 18:32:48 2014 -0700
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu Jul 3 14:39:07 2014 -0400
----------------------------------------------------------------------
apis/s3/pom.xml | 2 +-
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java | 6 +++---
apis/swift/pom.xml | 2 +-
.../internal/SequentialMultipartUploadStrategyMockTest.java | 8 ++++----
project/pom.xml | 5 -----
providers/aws-s3/pom.xml | 8 +++++++-
.../internal/SequentialMultipartUploadStrategyMockTest.java | 6 +++---
providers/dynect/pom.xml | 2 +-
.../test/java/org/jclouds/dynect/v3/DynectApiMockTest.java | 5 +++--
providers/hpcloud-objectstorage/pom.xml | 2 +-
.../objectstorage/HPCloudObjectStorageApiMockTest.java | 6 +++---
.../internal/BaseHPCloudObjectStorageMockTest.java | 8 ++++----
12 files changed, 31 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/apis/s3/pom.xml
----------------------------------------------------------------------
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 34ec6b1..c339522 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -86,7 +86,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.mockwebserver</groupId>
+ <groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
index 5048fbf..cf9c54d 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
@@ -37,9 +37,9 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.RecordedRequest;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(singleThreaded = true)
public class S3ClientMockTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/apis/swift/pom.xml
----------------------------------------------------------------------
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index e217f97..18cff0c 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -109,7 +109,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.mockwebserver</groupId>
+ <groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
index e78eb15..99e09cf 100644
--- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
+++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
@@ -39,10 +39,10 @@ import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.Atomics;
import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.QueueDispatcher;
-import com.google.mockwebserver.RecordedRequest;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.QueueDispatcher;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(singleThreaded = true)
public class SequentialMultipartUploadStrategyMockTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 1eba5e4..abb19e2 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -278,11 +278,6 @@
<artifactId>logback-core</artifactId>
<version>1.0.9</version>
</dependency>
- <dependency>
- <groupId>com.google.mockwebserver</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>20121111</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/aws-s3/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index beae5b3..e5bfe55 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -112,9 +112,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.mockwebserver</groupId>
+ <groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
index 8e980d4..f8fb581 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
@@ -37,9 +37,9 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.net.HttpHeaders;
import com.google.common.net.MediaType;
import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.RecordedRequest;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(singleThreaded = true)
public class SequentialMultipartUploadStrategyMockTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/dynect/pom.xml
----------------------------------------------------------------------
diff --git a/providers/dynect/pom.xml b/providers/dynect/pom.xml
index 7375b9e..40de76d 100644
--- a/providers/dynect/pom.xml
+++ b/providers/dynect/pom.xml
@@ -60,7 +60,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.mockwebserver</groupId>
+ <groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
index ef4cca8..a8b874d 100644
--- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
+++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
@@ -32,8 +32,9 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+
@Test(singleThreaded = true)
public class DynectApiMockTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/hpcloud-objectstorage/pom.xml
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml
index 841e5aa..934ec65 100644
--- a/providers/hpcloud-objectstorage/pom.xml
+++ b/providers/hpcloud-objectstorage/pom.xml
@@ -91,7 +91,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.mockwebserver</groupId>
+ <groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMockTest.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMockTest.java
index 8b0be06..b06a1d5 100644
--- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMockTest.java
+++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMockTest.java
@@ -22,9 +22,9 @@ import org.jclouds.hpcloud.objectstorage.internal.BaseHPCloudObjectStorageMockTe
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.RecordedRequest;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test
public class HPCloudObjectStorageApiMockTest extends BaseHPCloudObjectStorageMockTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/05c37c2c/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
index 67772a0..46e76b9 100644
--- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
+++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
@@ -31,10 +31,10 @@ import org.jclouds.hpcloud.objectstorage.HPCloudObjectStorageApi;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
-import com.google.mockwebserver.MockResponse;
-import com.google.mockwebserver.MockWebServer;
-import com.google.mockwebserver.QueueDispatcher;
-import com.google.mockwebserver.RecordedRequest;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.QueueDispatcher;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseHPCloudObjectStorageMockTest {