From 02874ea411b2a4a1e0548dea3b1bdfdb67750c1c Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Wed, 8 Jul 2015 16:17:27 +0200
Subject: [PATCH] [build] explicitly add http-client dependency

As discussed in the PR https://github.com/elastic/elasticsearch/pull/12036#issuecomment-119584570
---
 plugins/cloud-aws/pom.xml       |  7 +++++++
 plugins/cloud-azure/pom.xml     |  7 +++++++
 plugins/cloud-gce/pom.xml       |  7 +++++++
 plugins/delete-by-query/pom.xml | 10 ----------
 plugins/pom.xml                 |  8 ++++++++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml
index e7c8169f370..9035a9bfb7b 100644
--- a/plugins/cloud-aws/pom.xml
+++ b/plugins/cloud-aws/pom.xml
@@ -33,6 +33,13 @@
             <artifactId>aws-java-sdk-s3</artifactId>
             <version>${amazonaws.version}</version>
         </dependency>
+        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
+        <!-- TODO: remove this dependency when we will have a REST Test module -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml
index 307a726e8d4..86cfd96af45 100644
--- a/plugins/cloud-azure/pom.xml
+++ b/plugins/cloud-azure/pom.xml
@@ -55,6 +55,13 @@ governing permissions and limitations under the License. -->
             <artifactId>azure-management</artifactId>
             <version>0.7.0</version>
         </dependency>
+        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
+        <!-- TODO: remove this dependency when we will have a REST Test module -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml
index fc09a2b22cf..a42ccc3bba5 100644
--- a/plugins/cloud-gce/pom.xml
+++ b/plugins/cloud-gce/pom.xml
@@ -48,6 +48,13 @@ governing permissions and limitations under the License. -->
               </exclusion>
           </exclusions>
         </dependency>
+        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
+        <!-- TODO: remove this dependency when we will have a REST Test module -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml
index 83a11d4447e..c7dfe7227a3 100644
--- a/plugins/delete-by-query/pom.xml
+++ b/plugins/delete-by-query/pom.xml
@@ -31,16 +31,6 @@ governing permissions and limitations under the License. -->
         <tests.rest.load_packaged>false</tests.rest.load_packaged>
     </properties>
 
-    <dependencies>
-        <!-- Required by the REST test framework -->
-        <!-- Note that we should have this as a transient dependency coming from test module if any -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 04ae327794b..d47d1eded60 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -214,6 +214,14 @@
             <artifactId>jna</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <!-- Required by the REST test framework -->
+        <!-- TODO: remove this dependency when we will have a REST Test module -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <!-- typical layout for plugins -->