Use the OkHttp driver in Marconi to support PATCH methods
diff --git a/openstack-marconi/pom.xml b/openstack-marconi/pom.xml
index c09cadb..be1d297 100644
--- a/openstack-marconi/pom.xml
+++ b/openstack-marconi/pom.xml
@@ -65,6 +65,11 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-okhttp</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${project.parent.version}</version>
@@ -92,7 +97,6 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
index 24584cb..7997557 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
@@ -18,6 +18,8 @@
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+
+import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
@@ -76,6 +78,7 @@
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(AuthenticationApiModule.class)
.add(KeystoneAuthenticationModule.class)
+ .add(OkHttpCommandExecutorServiceModule.class)
.add(ZoneModule.class)
.add(MarconiTypeAdapters.class)
.add(MarconiHttpApiModule.class).build());
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
index 10d26d4..92dc349 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
@@ -105,7 +105,7 @@
*
* See https://issues.apache.org/jira/browse/JCLOUDS-405
*/
- @Test(enabled = false)
+ @Test
public void updateClaim() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
diff --git a/openstack-swift/pom.xml b/openstack-swift/pom.xml
index 2c8f934..2b0a8b7 100644
--- a/openstack-swift/pom.xml
+++ b/openstack-swift/pom.xml
@@ -110,11 +110,9 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <!-- TODO: change jclouds parent base pom to okhttp MWS, as google one is dead -->
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/rackspace-autoscale/pom.xml b/rackspace-autoscale/pom.xml
index 00c861a..c5eac4d 100644
--- a/rackspace-autoscale/pom.xml
+++ b/rackspace-autoscale/pom.xml
@@ -109,7 +109,6 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
