Repository: incubator-rya Updated Branches: refs/heads/master 5e79264df -> 7e25bdaa0
RYA-205 Bug Fix: Inconsistent Hadoop Version Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/8f779fd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/8f779fd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/8f779fd8 Branch: refs/heads/master Commit: 8f779fd8595009a18555d1a47d62ca6f56275a63 Parents: 5e79264 Author: Aaron Mihalik <[email protected]> Authored: Thu Dec 15 16:41:04 2016 -0500 Committer: Aaron Mihalik <[email protected]> Committed: Fri Dec 16 07:05:33 2016 -0500 ---------------------------------------------------------------------- extras/rya.export/pom.xml | 37 +-------------------- extras/rya.merger/pom.xml | 6 ---- extras/rya.pcj.fluo/pom.xml | 35 -------------------- pom.xml | 70 +++++++++++++++++++++------------------- 4 files changed, 38 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8f779fd8/extras/rya.export/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/pom.xml b/extras/rya.export/pom.xml index 9c95bc7..ce31f53 100644 --- a/extras/rya.export/pom.xml +++ b/extras/rya.export/pom.xml @@ -43,12 +43,6 @@ under the License. <module>export.mongo</module> <module>export.integration</module> </modules> - - <properties> - <jcommander.version>1.48</jcommander.version> - <hadoop.version>2.5.0</hadoop.version> - </properties> - <build> <plugins> <plugin> @@ -65,34 +59,5 @@ under the License. </plugins> </build> - <!-- - note, this parent pom can likely be removed provided the contents of its - dependencyManagement section are transferred to org.apache.rya:rya-project - --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - </dependency> - - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> - <version>${openrdf.sesame.version}</version> - </dependency> - - <dependency> - <groupId>com.beust</groupId> - <artifactId>jcommander</artifactId> - <version>${jcommander.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8f779fd8/extras/rya.merger/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index 0bde040..62b799e 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -89,12 +89,6 @@ under the License. </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo</artifactId> - <type>pom</type> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8f779fd8/extras/rya.pcj.fluo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml index 4eea405..8233b0b 100644 --- a/extras/rya.pcj.fluo/pom.xml +++ b/extras/rya.pcj.fluo/pom.xml @@ -41,11 +41,6 @@ under the License. <module>pcj.fluo.demo</module> </modules> - <properties> - <jcommander.version>1.48</jcommander.version> - <hadoop.version>2.5.0</hadoop.version> - </properties> - <build> <plugins> <plugin> @@ -62,34 +57,4 @@ under the License. </plugins> </build> - <!-- - note, this parent pom can likely be removed provided the contents of its - dependencyManagement section are transferred to org.apache.rya:rya-project - --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - </dependency> - - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> - <version>${openrdf.sesame.version}</version> - </dependency> - - <dependency> - <groupId>com.beust</groupId> - <artifactId>jcommander</artifactId> - <version>${jcommander.version}</version> - </dependency> - </dependencies> - </dependencyManagement> </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8f779fd8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index df38c56..5ab29aa 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ under the License. <!--Cannot upgrade to openrdf.sesame 2.7.6 until RYA-9 is resolved --> <accumulo.version>1.6.4</accumulo.version> <!-- Newest: 1.7.0 --> - <hadoop.version>2.5.2</hadoop.version> <!-- Newest: 2.7.1 --> + <hadoop.version>2.5.0</hadoop.version> <!-- Newest: 2.7.1 --> <!-- Required for GeoMesa 1.2.* --> <zookeeper.version>3.4.6</zookeeper.version> @@ -94,7 +94,7 @@ under the License. <gmaven.version>1.3</gmaven.version> <!-- Newest: 1.5 --> <groovy.version>2.3.11</groovy.version> <!-- Newest: 2.4.5 --> - <guava.version>18.0</guava.version> <!-- Newest: 18.0 --> + <guava.version>14.0.1</guava.version> <!-- Newest: 18.0 --> <karaf.version>2.2.11</karaf.version> <!-- Newest: 4.0.3 --> <mango.version>1.2.0</mango.version> <!-- Newest: 1.4.0 --> @@ -123,11 +123,11 @@ under the License. <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> - + <commons.cli.version>1.2</commons.cli.version> + <commons.http.version>3.0.1</commons.http.version> + <jcommander.version>1.48</jcommander.version> + <twitter4jstream.version>4.0.1</twitter4jstream.version> + <jmh.version>1.13</jmh.version> <jsr305.version>1.3.9-1</jsr305.version> @@ -208,11 +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.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${thrift.version}</version> + </dependency> <dependency> <groupId>org.apache.rya</groupId> <artifactId>rya.pcj.fluo.client</artifactId> @@ -223,12 +223,6 @@ under the License. <artifactId>accumulo-core</artifactId> <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> @@ -276,6 +270,11 @@ under the License. </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-queryrender</artifactId> + <version>${openrdf.sesame.version}</version> + </dependency> + <dependency> + <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime-osgi</artifactId> <version>${openrdf.sesame.version}</version> <exclusions> @@ -365,12 +364,17 @@ under the License. </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>tinkergraph-gremlin</artifactId> @@ -486,16 +490,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> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons.cli.version}</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${commons.http.version}</version> + </dependency> <!-- Free Text Indexing --> <dependency>
