You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/12/02 12:29:35 UTC

[2/8] jena git commit: Move dependency management for Thrift and commons-csv into jena-parent

Move dependency management for Thrift and commons-csv into jena-parent


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/274cab4f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/274cab4f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/274cab4f

Branch: refs/heads/master
Commit: 274cab4fcc55431ee2c2a1a7756caeac3594f7af
Parents: 1097c6f
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 2 09:43:50 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 2 09:43:50 2014 +0000

----------------------------------------------------------------------
 jena-arq/pom.xml    |  9 ---------
 jena-parent/pom.xml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/274cab4f/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 2464586..4697ee5 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -84,14 +84,6 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
-      <version>0.9.1</version>
-      <exclusions>
-	<!-- Use whatever version Jena is using -->
-	<exclusion>
-	  <groupId>org.apache.httpcomponents</groupId>
-	  <artifactId>httpcore</artifactId>
-	</exclusion>
-      </exclusions>
     </dependency>
 
     <!-- 
@@ -106,7 +98,6 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-csv</artifactId>
-      <version>1.0</version>
     </dependency>
 
   </dependencies>

http://git-wip-us.apache.org/repos/asf/jena/blob/274cab4f/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 2a3d2a3..a8b9c13 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -131,6 +131,25 @@
       </dependency>
 
       <dependency>
+	<groupId>org.apache.thrift</groupId>
+	<artifactId>libthrift</artifactId>
+	<version>0.9.2</version>
+	<exclusions>
+	  <!-- Use whatever version Jena is using -->
+	  <exclusion>
+	    <groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpcore</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
+
+      <dependency>
+	<groupId>org.apache.commons</groupId>
+	<artifactId>commons-csv</artifactId>
+	<version>1.0</version>
+      </dependency>
+
+      <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
         <version>${ver.commons-fileupload}</version>