accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject accumulo git commit: ACCUMULO-4618 Updates from additional code review
Date Fri, 07 Apr 2017 15:38:32 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 82860ca44 -> 2ab04606d


ACCUMULO-4618 Updates from additional code review

* Now using only one httpclient jar
* Excluded xerces from hadoop-client & hadoop-minicluster to
  stop xml-apis jar from being brought in.
* Added slf4j-log4j12 to several modules with test scope


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

Branch: refs/heads/master
Commit: 2ab04606d70d697cd7a223651639da200e9526cb
Parents: 82860ca
Author: Mike Walch <mwalch@apache.org>
Authored: Wed Apr 5 11:11:24 2017 -0400
Committer: Mike Walch <mwalch@apache.org>
Committed: Fri Apr 7 11:21:00 2017 -0400

----------------------------------------------------------------------
 fate/pom.xml                            |  5 +++++
 iterator-test-harness/pom.xml           |  5 +++++
 maven-plugin/pom.xml                    |  4 ----
 maven-plugin/src/it/plugin-test/pom.xml |  8 ++++----
 pom.xml                                 | 23 ++++++++++++-----------
 server/base/pom.xml                     |  4 ----
 start/pom.xml                           |  9 +++++----
 7 files changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 94b81e1..2c8bb6f 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -52,5 +52,10 @@
       <artifactId>easymock</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/iterator-test-harness/pom.xml
----------------------------------------------------------------------
diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml
index 0ba6d4c..dd867d9 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -47,5 +47,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index fa38dfc..9c9f1f9 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -65,10 +65,6 @@
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/maven-plugin/src/it/plugin-test/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml
index 07a38e4..b5c51d8 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -44,10 +44,6 @@
       <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
@@ -72,6 +68,10 @@
       <artifactId>hadoop-client</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 801a6e6..78a5712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,6 @@
     <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
     <!-- bouncycastle version for test dependencies -->
     <bouncycastle.version>1.54</bouncycastle.version>
-    <commons.httpclient.version>3.1</commons.httpclient.version>
     <!-- Curator version -->
     <curator.version>2.11.0</curator.version>
     <!-- relative path for Eclipse format; should override in child modules if necessary
-->
@@ -212,11 +211,6 @@
         <version>1.6</version>
       </dependency>
       <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <version>${commons.httpclient.version}</version>
-      </dependency>
-      <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>2.4</version>
@@ -389,6 +383,12 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-client</artifactId>
         <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -399,6 +399,12 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-minicluster</artifactId>
         <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -555,11 +561,6 @@
         <artifactId>slf4j-nop</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.3.04</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 3554c14..65575db 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -105,10 +105,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab04606/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index b9bdec8..08f8ad1 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -51,10 +51,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -74,6 +70,11 @@
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>


Mime
View raw message