accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1339372 - in /accumulo/trunk: ./ core/ examples/simple/ examples/wikisearch/ examples/wikisearch/ingest/ examples/wikisearch/query-war/ examples/wikisearch/query/ server/ start/ trace/
Date Wed, 16 May 2012 21:20:37 GMT
Author: vines
Date: Wed May 16 21:20:36 2012
New Revision: 1339372

URL: http://svn.apache.org/viewvc?rev=1339372&view=rev
Log:
ACCUMULO-478 - Cleaned up pretty well. All other things they report are either internal dependencies
(Accumulo pieces needing other Accumulo pieces) or
inconsitent dependency recognition (commons-logging vs. commons-logging-api and servlet-api
vs. servlet-api-2.5)


Modified:
    accumulo/trunk/core/pom.xml
    accumulo/trunk/examples/simple/pom.xml
    accumulo/trunk/examples/wikisearch/ingest/pom.xml
    accumulo/trunk/examples/wikisearch/pom.xml
    accumulo/trunk/examples/wikisearch/query-war/pom.xml
    accumulo/trunk/examples/wikisearch/query/pom.xml
    accumulo/trunk/pom.xml
    accumulo/trunk/server/pom.xml
    accumulo/trunk/start/pom.xml
    accumulo/trunk/trace/pom.xml

Modified: accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Wed May 16 21:20:36 2012
@@ -77,10 +77,22 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>
@@ -93,8 +105,12 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -105,14 +121,6 @@
       <artifactId>libthrift</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-start</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
-    </dependency>
-    <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>

Modified: accumulo/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/pom.xml (original)
+++ accumulo/trunk/examples/simple/pom.xml Wed May 16 21:20:36 2012
@@ -30,12 +30,24 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
     </dependency>
   </dependencies>
 

Modified: accumulo/trunk/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/ingest/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/ingest/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/ingest/pom.xml Wed May 16 21:20:36 2012
@@ -28,20 +28,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>zookeeper</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-start</artifactId>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -61,10 +53,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-wikipedia</artifactId>
     </dependency>
     <dependency>
@@ -72,20 +60,6 @@
       <artifactId>protobuf-java</artifactId>
     </dependency>
     <dependency>
-    	<groupId>com.sun.jersey</groupId>
-    	<artifactId>jersey-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>

Modified: accumulo/trunk/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/pom.xml Wed May 16 21:20:36 2012
@@ -182,26 +182,6 @@
         <version>${version.commons-lang}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-core</artifactId>
-        <version>${version.accumulo}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>${version.zookeeper}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.thrift</groupId>
-        <artifactId>libthrift</artifactId>
-        <version>${version.libthrift}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.accumulo</groupId>
-        <artifactId>cloudtrace</artifactId>
-        <version>${version.accumulo}</version>
-      </dependency>
-      <dependency>
         <groupId>com.google.collections</groupId>
         <artifactId>google-collections</artifactId>
         <version>${version.googlecollections}</version>
@@ -218,13 +198,13 @@
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-analyzers</artifactId>
-        <version>${version.lucene-analyzers}</version>
+        <artifactId>lucene-wikipedia</artifactId>
+        <version>${version.lucene-wikipedia}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-wikipedia</artifactId>
-        <version>${version.lucene-wikipedia}</version>
+        <artifactId>lucene-analyzers</artifactId>
+        <version>${version.lucene-analyzers}</version>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
@@ -242,9 +222,14 @@
         <version>${version.minlog}</version>
       </dependency>
       <dependency>
-      	<groupId>com.sun.jersey</groupId>
-      	<artifactId>jersey-server</artifactId>
-      	<version>1.11</version>
+    	  <groupId>com.sun.jersey</groupId>
+    	  <artifactId>jersey-server</artifactId>
+        <version>1.11</version>
+      </dependency>
+      <dependency>
+    	  <groupId>com.sun.jersey</groupId>
+    	  <artifactId>jersey-core</artifactId>
+        <version>1.11</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: accumulo/trunk/examples/wikisearch/query-war/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/query-war/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/query-war/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/query-war/pom.xml Wed May 16 21:20:36 2012
@@ -27,21 +27,6 @@
   <packaging>war</packaging>
   <name>wikisearch-query-war</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

Modified: accumulo/trunk/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/wikisearch/query/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/examples/wikisearch/query/pom.xml (original)
+++ accumulo/trunk/examples/wikisearch/query/pom.xml Wed May 16 21:20:36 2012
@@ -27,35 +27,20 @@
   <name>wikisearch-query</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javaee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>zookeeper</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -73,21 +58,29 @@
       <artifactId>kryo</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>wikisearch-ingest</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.googlecode</groupId>
-      <artifactId>minlog</artifactId>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Wed May 16 21:20:36 2012
@@ -530,11 +530,28 @@
         <version>2.4</version>
       </dependency>
       <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>servlet-api-2.5</artifactId>
+        <version>6.1.14</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
         <groupId>commons-configuration</groupId>
         <artifactId>commons-configuration</artifactId>
         <version>1.5</version>
       </dependency>
       <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>1.2</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>1.4</version>

Modified: accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/server/pom.xml (original)
+++ accumulo/trunk/server/pom.xml Wed May 16 21:20:36 2012
@@ -52,6 +52,22 @@
   </build>
   <dependencies>
     <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
     </dependency>
@@ -60,30 +76,26 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-start</artifactId>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-    </dependency>
-    <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>

Modified: accumulo/trunk/start/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/start/pom.xml (original)
+++ accumulo/trunk/start/pom.xml Wed May 16 21:20:36 2012
@@ -58,18 +58,10 @@
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-jci-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
       <artifactId>commons-jci-fam</artifactId>
     </dependency>
     <dependency>

Modified: accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1339372&r1=1339371&r2=1339372&view=diff
==============================================================================
--- accumulo/trunk/trace/pom.xml (original)
+++ accumulo/trunk/trace/pom.xml Wed May 16 21:20:36 2012
@@ -53,7 +53,7 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
 
     <dependency>



Mime
View raw message