TAVERNA-893 Use newer httpclient/httpcore. Ignore non-osgi dependencies.

diff --git a/pom.xml b/pom.xml
index 65c9e11..0f88e36 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -115,8 +115,8 @@ upgraded - this leads to recursive spaghetti.
 <activation.version>1.1.1</activation.version>
 <antlr.version>2.7.7</antlr.version>
 <apache.commons.csv.version>1.0.0.BUILD-20080106</apache.commons.csv.version>
-<apache.httpclient.version>4.2.6</apache.httpclient.version>
-<apache.httpcore.version>4.2.5</apache.httpcore.version>
+<apache.httpclient.version>4.5.1</apache.httpclient.version>
+<apache.httpcore.version>4.4.4</apache.httpcore.version>
 <aspectj.version>1.6.9</aspectj.version>
 <axis.jaxrpc.version>1.4</axis.jaxrpc.version>
 <axis.sggj.version>1.4</axis.sggj.version>
@@ -144,7 +144,7 @@ upgraded - this leads to recursive spaghetti.
 <htmlparser.version>1.4</htmlparser.version>
 <icu4j.version>3.4.4</icu4j.version>
 <io.airlift.airline.version>0.7</io.airlift.airline.version>
-<jackson.version>2.3.3</jackson.version>
+<jackson.version>2.3.3</jackson.version> <!-- Should be   -->
 <!-- http://github.com/jai-imageio/ -->
 <jai.imageio.core.version>1.3.1</jai.imageio.core.version>
 <javahelp.version>2.0.02</javahelp.version>
@@ -158,12 +158,11 @@ upgraded - this leads to recursive spaghetti.
 <jaxws.api.version>2.1</jaxws.api.version>
 <jdom.version>1.1.0</jdom.version> <!-- com.springsource.org.jdom -->
 <jedit.syntax.version>2.2.5</jedit.syntax.version>
-<jena.version>3.0.1</jena.version>
+<jena.version>3.0.0</jena.version><!--  NOTE: TAVERNA-892 -->
 <jetty.version>6.1.24</jetty.version>
 <jmimemagic.version>0.1.2</jmimemagic.version>
 <jmoby.version>1.1.5-taverna</jmoby.version>
 <json.lib.version>2.3</json.lib.version>
-<jsonld.version>0.5.1</jsonld.version>
 <junit.version>4.11</junit.version>
 <log4j.version>1.2.17</log4j.version>
 <mail.version>1.4.1</mail.version>
@@ -178,8 +177,6 @@ upgraded - this leads to recursive spaghetti.
 <osgi.core.version>4.3.1</osgi.core.version>
 <osgi.enterprise.version>4.2.0</osgi.enterprise.version>
 <osgi.equinox.version>3.8.0.v20120529-1548</osgi.equinox.version>
-<!-- <osgi.launcher.version>0.1.1-SNAPSHOT</osgi.launcher.version> -->
-<!-- <osgi.services.version>0.1.2-SNAPSHOT</osgi.services.version> -->
 <osgi.compendium.version>4.3.1</osgi.compendium.version>
 <poi.ooxml.version>3.6</poi.ooxml.version>
 <poi.version>3.6</poi.version>
@@ -210,9 +207,63 @@ upgraded - this leads to recursive spaghetti.
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
+<!-- Minimal dependency management -   -->
+<dependencyManagement>
+       <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-osgi</artifactId>
+            <version>${apache.httpclient.version}</version>
+            <exclusions>
+              <!-- These are all embedded within httpclient-osgi 
+              and so should not be depended on again
+              -->
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient-cache</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>fluent-hc</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-osgi</artifactId>
+            <version>${apache.httpcore.version}</version>
+            <exclusions>
+              <!-- These are all embedded within httpcore-osgi 
+                and so should not be depended on again
+              -->
+            
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore-nio</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+       </dependencies>
+</dependencyManagement>
+
 
   <build>
     <plugins>
@@ -353,7 +404,7 @@ upgraded - this leads to recursive spaghetti.
 
 
     </plugins>
-  </pluginManagement>
+  </pluginManagement>  
   </build>
   <profiles>
     <profile>