accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [2/8] git commit: ACCUMULO-2804 Remove plexus-utils dependency.
Date Wed, 14 May 2014 02:39:53 GMT
ACCUMULO-2804 Remove plexus-utils dependency.


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

Branch: refs/heads/master
Commit: 335a750a0d98c56ea1df4ae105c55e827e6d5029
Parents: e8fab2f
Author: Sean Busbey <busbey@cloudera.com>
Authored: Tue May 13 15:17:03 2014 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Tue May 13 15:46:16 2014 -0500

----------------------------------------------------------------------
 maven-plugin/pom.xml                                         | 8 ++++----
 .../java/org/apache/accumulo/maven/plugin/StartMojo.java     | 2 +-
 pom.xml                                                      | 5 -----
 test/pom.xml                                                 | 4 ----
 .../org/apache/accumulo/test/functional/MapReduceIT.java     | 2 +-
 5 files changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/335a750a/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index da3b913..64e3503 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -28,6 +28,10 @@
   <description>An Apache Maven plugin for testing software against a test Apache Accumulo
instance.</description>
   <dependencies>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-minicluster</artifactId>
     </dependency>
@@ -55,10 +59,6 @@
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/335a750a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
index 414c081..42d4145 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
@@ -24,13 +24,13 @@ import java.util.Set;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.commons.io.FileUtils;
 import org.apache.http.annotation.ThreadSafe;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Goal which starts an instance of {@link MiniAccumuloCluster}.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/335a750a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5e32a55..80d586f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,11 +397,6 @@
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <version>3.0.10</version>
-      </dependency>
-      <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>3.1</version>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/335a750a/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 49dcd90..45cacb8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -127,10 +127,6 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/335a750a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
index 1946205..3b34206 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java
@@ -37,10 +37,10 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.Base64;
 import org.apache.accumulo.examples.simple.mapreduce.RowHash;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 import org.apache.hadoop.io.Text;
-import org.codehaus.plexus.util.Base64;
 import org.junit.Test;
 
 public class MapReduceIT extends ConfigurableMacIT {


Mime
View raw message