Make http client dependency optional

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1043781 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 34 insertions, 20 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index a9cd8cee9d..055bd32ed5 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -215,7 +215,7 @@ conditions of the following licenses.
 

 The following components come under Apache Software License 2.0

 

- abdera-client-1.1.1jar

+ abdera-client-1.1.1.jar

  abdera-core-1.1.1.jar

  abdera-extensions-html-1.1.1.jar

  abdera-extensions-json-1.1.1.jar

@@ -250,7 +250,6 @@ The following components come under Apache Software License 2.0
  commons-discovery-0.4.jar

  commons-fileupload-1.2.jar

  commons-httpclient-3.1.jar

- commons-io-1.4.jar

  commons-lang-2.3.jar

  commons-logging-1.1.1.jar

  commons-pool-1.3.jar

diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
index 373d55c3ce..cc59f117ff 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
@@ -83,8 +83,20 @@
             <artifactId>tuscany-host-http</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.0.3</version>
+        </dependency>    
         
         <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.0.1</version>
+        </dependency>    
+
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version> 
@@ -151,13 +163,7 @@
         <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
-           <version>1.3</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-codec</groupId>
-                   <artifactId>commons-codec</artifactId>
-               </exclusion>
-           </exclusions>
+           <version>1.4</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
index 3a5c43cccb..b585c3b0b8 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
@@ -71,6 +71,12 @@
             <artifactId>httpclient</artifactId>
             <version>4.0.3</version>
         </dependency>    
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.0.1</version>
+        </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/modules/host-http/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/host-http/META-INF/MANIFEST.MF
index 3ab8b6de73..2077368e95 100644
--- a/sca-java-2.x/trunk/modules/host-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/host-http/META-INF/MANIFEST.MF
@@ -15,19 +15,19 @@ Bundle-Description: Apache Tuscany SCA HTTP Servlet Host Extension Poi
  nt

 Import-Package: javax.servlet,

  javax.servlet.http,

+ org.apache.http;resolution:=optional,

+ org.apache.http.client;resolution:=optional,

+ org.apache.http.conn;resolution:=optional,

+ org.apache.http.conn.params;resolution:=optional,

+ org.apache.http.conn.scheme;resolution:=optional,

+ org.apache.http.conn.ssl;resolution:=optional,

+ org.apache.http.impl.client;resolution:=optional,

+ org.apache.http.impl.conn.tsccm;resolution:=optional,

+ org.apache.http.params;resolution:=optional,

+ org.apache.http.protocol;resolution:=optional,

  org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.extensibility;version="2.0.0",

- org.apache.tuscany.sca.host.http;version="2.0.0",

- org.apache.http,

- org.apache.http.client,

- org.apache.http.conn,

- org.apache.http.conn.params,

- org.apache.http.conn.scheme,

- org.apache.http.conn.ssl,

- org.apache.http.impl.client,

- org.apache.http.impl.conn.tsccm,

- org.apache.http.params,

- org.apache.http.protocol

+ org.apache.tuscany.sca.host.http;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.host.http

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/host-http/pom.xml b/sca-java-2.x/trunk/modules/host-http/pom.xml
index 0204cad136..6fb8bc4c9a 100644
--- a/sca-java-2.x/trunk/modules/host-http/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-http/pom.xml
@@ -42,16 +42,19 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Making the dependency optional so that base-runtime won't pull them in -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.0.3</version>
+            <optional>true</optional>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>4.0.1</version>
+            <optional>true</optional>
         </dependency>    
         
     </dependencies>