You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/01/05 16:46:28 UTC

jena git commit: Workaround for JENA-842

Repository: jena
Updated Branches:
  refs/heads/hadoop-rdf 49c4cffe6 -> 7ca24c068


Workaround for JENA-842

Set Elephas to use outdated version of Guava to avoid a conflict with
Hadoop version that the jena-parent otherwise introduces.  This is a
temporary workaround that can be removed as and when HADOOP-11032 is
resolved and a release of Hadoop with an up to date version of Guava is
available


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

Branch: refs/heads/hadoop-rdf
Commit: 7ca24c0682e80799e9c88612759ff3bf3640d890
Parents: 49c4cff
Author: Rob Vesse <rv...@apache.org>
Authored: Mon Jan 5 15:39:36 2015 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Mon Jan 5 15:46:16 2015 +0000

----------------------------------------------------------------------
 jena-elephas/pom.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7ca24c06/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index 0246c2e..5245065 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -34,7 +34,7 @@
 
   <!-- Properties common across all profiles -->
   <properties>
-    <plugin.compiler.version>2.5.1</plugin.compiler.version>
+    <plugin.compiler.version>2.6.0</plugin.compiler.version>
     <arq.version>2.12.2-SNAPSHOT</arq.version>
     <junit.version>4.11</junit.version>
     <mrunit.version>1.0.0</mrunit.version>
@@ -67,7 +67,12 @@
         <artifactId>hadoop-mapreduce-client-common</artifactId>
         <version>${hadoop.version}</version>
       </dependency>
-      
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>11.0.2</version>
+      </dependency>
+
       <!-- Jena Dependencies -->
       <dependency>
         <groupId>org.apache.jena</groupId>