accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [1/2] git commit: ACCUMULO-2165 temporary fix
Date Thu, 09 Jan 2014 21:45:08 GMT
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 77b450724 -> b4a832da7


ACCUMULO-2165 temporary fix


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b4a832da7515bde113856313d1d4fcd497f4ee0b
Parents: e256960
Author: John Vines <vines@apache.org>
Authored: Thu Jan 9 16:25:39 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Thu Jan 9 16:39:01 2014 -0500

----------------------------------------------------------------------
 .../accumulo/maven/plugin/AbstractAccumuloMojo.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4a832da/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
index cc34511..2b0db7f 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
@@ -37,11 +37,22 @@ public abstract class AbstractAccumuloMojo extends AbstractMojo {
     if (miniClasspath == null && project != null) {
       classpathItems.add(project.getBuild().getOutputDirectory());
       classpathItems.add(project.getBuild().getTestOutputDirectory());
-      for (Artifact artifact : project.getArtifacts())
+      for (Artifact artifact : project.getArtifacts()) {
         classpathItems.add(artifact.getFile().toURI().toURL().toString());
+      }
     } else if (miniClasspath != null && !miniClasspath.isEmpty()) {
       classpathItems.addAll(Arrays.asList(miniClasspath.split(File.pathSeparator)));
     }
+    
+    // Hack to prevent sisu-guava, a maven 3.0.4 dependency, from effecting normal accumulo
behavior.
+    String sisuGuava = null;
+    for (String items : classpathItems)
+      if (items.contains("sisu-guava"))
+        sisuGuava = items;
+    
+    if (sisuGuava != null)
+      classpathItems.remove(sisuGuava);
+    
     macConfig.setClasspathItems(classpathItems.toArray(new String[classpathItems.size()]));
   }
 }


Mime
View raw message