You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2016/12/15 19:30:38 UTC

incubator-rya git commit: RYA-205 moving dependencies into parent pom; Closes #120.

Repository: incubator-rya
Updated Branches:
  refs/heads/master b61920abf -> cf702ffa8


RYA-205 moving dependencies into parent pom; Closes #120.


Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/cf702ffa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/cf702ffa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/cf702ffa

Branch: refs/heads/master
Commit: cf702ffa8d7676a7e401a75ec318b2b0e5532f14
Parents: b61920a
Author: pujav65 <pu...@gmail.com>
Authored: Wed Nov 2 15:57:08 2016 -0400
Committer: pujav65 <pu...@gmail.com>
Committed: Thu Dec 15 14:29:41 2016 -0500

----------------------------------------------------------------------
 extras/rya.merger/pom.xml | 20 ++++------------
 pom.xml                   | 53 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf702ffa/extras/rya.merger/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml
index fac674d..0bde040 100644
--- a/extras/rya.merger/pom.xml
+++ b/extras/rya.merger/pom.xml
@@ -47,8 +47,7 @@ under the License.
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.0.8</version>
-        </dependency>
+         </dependency>
         <dependency>
             <groupId>com.toedter</groupId>
             <artifactId>jcalendar</artifactId>
@@ -77,25 +76,21 @@ under the License.
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-core</artifactId>
-            <version>1.6.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-start</artifactId>
-            <version>1.6.4</version>
-        </dependency>
+         </dependency>
 
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>0.9.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo</artifactId>
-            <version>1.6.4</version>
             <type>pom</type>
         </dependency>
 
@@ -112,19 +107,16 @@ under the License.
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
-            <version>2.6.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>2.6.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.3.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jmx</groupId>
@@ -144,25 +136,21 @@ under the License.
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
-        </dependency>
+         </dependency>
 
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
-            <version>1.35</version>
-        </dependency>
+         </dependency>
 
         <dependency>
             <groupId>org.twitter4j</groupId>
             <artifactId>twitter4j-stream</artifactId>
-            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf702ffa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c47038..df38c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,13 @@ under the License.
         <maven.min-version>3.0.4</maven.min-version>
         
         <fluo.version>1.0.0-incubating</fluo.version>
+
+        <plexus.version>3.0.8</plexus.version>
+        <thrift.version>0.9.1</thrift.version>
+        <commonscli.version>1.2</commonscli.version>
+		<commonshttp.version>3.0.1</commonshttp.version>
+		<jcommander.version>1.35</jcommander.version>
+ 		<twitter4jstream.version>4.0.1</twitter4jstream.version>
         
         <jmh.version>1.13</jmh.version>
 
@@ -201,6 +208,11 @@ under the License.
                 <artifactId>rya.pcj.fluo.app</artifactId>
                 <version>${project.version}</version>
             </dependency>
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>${thrift.version}</version>
+        </dependency>
             <dependency>
                 <groupId>org.apache.rya</groupId>
                 <artifactId>rya.pcj.fluo.client</artifactId>
@@ -212,6 +224,17 @@ under the License.
                 <version>${accumulo.version}</version>
             </dependency>
             <dependency>
+				<groupId>org.apache.accumulo</groupId>
+				<artifactId>accumulo</artifactId>
+				<type>pom</type>
+                <version>${accumulo.version}</version>
+            </dependency>
+             <dependency>
+                <groupId>org.apache.accumulo</groupId>
+                <artifactId>accumulo-start</artifactId>
+                <version>${accumulo.version}</version>
+            </dependency>
+           <dependency>
                 <groupId>org.apache.rya</groupId>
                 <artifactId>sesame-runtime-osgi</artifactId>
                 <version>${openrdf.sesame.version}</version>
@@ -343,6 +366,11 @@ under the License.
                 </exclusions>
             </dependency>
 
+			<dependency>
+				<groupId>org.apache.hadoop</groupId>
+				<artifactId>hadoop-client</artifactId>
+                <version>${hadoop.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.apache.tinkerpop</groupId>
                 <artifactId>tinkergraph-gremlin</artifactId>
@@ -426,6 +454,21 @@ under the License.
                 <version>${karaf.version}</version>
                 <scope>provided</scope>
             </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>${plexus.version}</version>
+        </dependency>
+       <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>${jcommander.version}</version>
+        </dependency>
+         <dependency>
+            <groupId>org.twitter4j</groupId>
+            <artifactId>twitter4j-stream</artifactId>
+            <version>${twitter4jstream.version}</version>
+        </dependency>
 
             <!-- Commons -->
             <dependency>
@@ -443,6 +486,16 @@ under the License.
                 <artifactId>commons-pool</artifactId>
                 <version>${commons.pool.version}</version>
             </dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>${commonscli.version}</version>
+			</dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>${commonshttp.version}</version>
+        </dependency>
 
             <!-- Free Text Indexing -->
             <dependency>