You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/04/11 20:32:33 UTC
svn commit: r1467036 - in /accumulo/trunk: ./ assemble/ bin/ core/
core/src/main/scripts/ examples/ examples/simple/ fate/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
start/ te...
Author: ctubbsii
Date: Thu Apr 11 18:32:33 2013
New Revision: 1467036
URL: http://svn.apache.org/r1467036
Log:
ACCUMULO-1265, ACCUMULO-1250, ACCUMULO-1244, ACCUMULO-1063 merged to trunk from 1.5 branch
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/accumulo
accumulo/trunk/bin/bootstrap_hdfs.sh
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/scripts/generate-thrift.sh
accumulo/trunk/examples/ (props changed)
accumulo/trunk/examples/simple/pom.xml
accumulo/trunk/fate/pom.xml
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/pom.xml
accumulo/trunk/src/ (props changed)
accumulo/trunk/start/pom.xml
accumulo/trunk/test/pom.xml
accumulo/trunk/trace/pom.xml
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1466665-1466969,1466971-1467001,1467003-1467004,1467006-1467009,1467011-1467033
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1466665-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 18:32:33 2013
@@ -30,37 +30,50 @@
<jnilib>**/*.jnilib</jnilib>
<so>**/*.so</so>
</properties>
- <!-- NOTE: These dependency declarations are only required to sort this project to the end of the line in the multimodule build. Since we only include the child
- modules in our assembly, we only need to ensure this distribution project builds AFTER those... -->
<dependencies>
+ <!--
+ NOTE: These dependency declarations are required to sort
+ this project to the end of the line in the multimodule
+ build.
+ Further, the dependencies for Accumulo artifacts must be
+ here so they will be copied into the lib directory for
+ the binary distribution assemblies.
+ -->
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/bin/accumulo (original)
+++ accumulo/trunk/bin/accumulo Thu Apr 11 18:32:33 2013
@@ -28,7 +28,7 @@ script=$( basename "$SOURCE" )
. "$bin"/config.sh
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
#
# Resolve a program to its installation directory
@@ -80,7 +80,8 @@ logger) export ACCUMULO_OPTS="${ACCUMUL
esac
XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}
+LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ]; then
echo "JAVA_HOME is not set or is not a directory. Please make sure it's set globally or in conf/accumulo-env.sh"
Modified: accumulo/trunk/bin/bootstrap_hdfs.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/bootstrap_hdfs.sh?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/bin/bootstrap_hdfs.sh (original)
+++ accumulo/trunk/bin/bootstrap_hdfs.sh Thu Apr 11 18:32:33 2013
@@ -74,8 +74,6 @@ fi
#
# We need two of the jars in lib, copy them back out and remove them from the system context dir
#
-"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar" "$ACCUMULO_HOME/lib/." > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar" > /dev/null
"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar" "$ACCUMULO_HOME/lib/." > /dev/null
"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar" > /dev/null
"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar" "$ACCUMULO_HOME/lib/." > /dev/null
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1466665-1466969,1466971-1467001,1467003-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Thu Apr 11 18:32:33 2013
@@ -30,66 +30,77 @@
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: accumulo/trunk/core/src/main/scripts/generate-thrift.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/scripts/generate-thrift.sh?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/scripts/generate-thrift.sh (original)
+++ accumulo/trunk/core/src/main/scripts/generate-thrift.sh Thu Apr 11 18:32:33 2013
@@ -47,8 +47,7 @@ if [ "$VERSION" -ne 1 ] ; then
echo "*** thrift is not available"
echo "*** expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}"
echo "*** generated code will not be updated"
- echo "****************************************************"
- exit 0
+ fail "****************************************************"
fi
# Include thrift sources from additional modules
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1466665-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/pom.xml (original)
+++ accumulo/trunk/examples/simple/pom.xml Thu Apr 11 18:32:33 2013
@@ -32,14 +32,27 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -52,13 +65,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
<configuration>
@@ -66,12 +72,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
Modified: accumulo/trunk/fate/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/fate/pom.xml (original)
+++ accumulo/trunk/fate/pom.xml Thu Apr 11 18:32:33 2013
@@ -28,10 +28,12 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466665-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466665-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu Apr 11 18:32:33 2013
@@ -104,6 +104,7 @@
</site>
</distributionManagement>
<properties>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
<maven.min-version>3.0.3</maven.min-version>
<powermock.version>1.5</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -136,22 +137,22 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -161,7 +162,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -181,7 +182,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>0.9.94</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -246,7 +247,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <version>2.2</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -271,7 +272,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>[6.1,7.0)</version>
+ <version>6.1.26</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -378,7 +379,6 @@
<Sealed>${sealJars}</Sealed>
</manifestEntries>
</archive>
- <outputDirectory>../lib</outputDirectory>
</configuration>
</plugin>
<plugin>
@@ -533,12 +533,13 @@
<goals>
<goal>copy-dependencies</goal>
</goals>
- <phase>process-resources</phase>
+ <phase>prepare-package</phase>
<configuration>
<outputDirectory>../lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-logging,commons-logging-api,commons-vfs2,gson,jcommander,guava</includeArtifactIds>
+ <includeScope>runtime</includeScope>
<excludeTransitive>true</excludeTransitive>
+ <excludeClassifiers>sources,test-sources</excludeClassifiers>
</configuration>
</execution>
</executions>
@@ -575,23 +576,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <attach>true</attach>
- <outputDirectory>../lib</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- <goal>test-jar-no-fork</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
<extensions>
<extension>
@@ -763,7 +747,7 @@
</activation>
<properties>
<hadoop.version>1.0.4</hadoop.version>
- <slf4j.version>1.5.8</slf4j.version>
+ <slf4j.version>1.4.3</slf4j.version>
</properties>
<dependencyManagement>
<dependencies>
Modified: accumulo/trunk/proxy/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Thu Apr 11 18:32:33 2013
@@ -34,28 +34,68 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1466665-1466969,1466971-1467001,1467003-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/server/pom.xml (original)
+++ accumulo/trunk/server/pom.xml Thu Apr 11 18:32:33 2013
@@ -34,56 +34,66 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1466665-1466969,1466971-1467004,1467006-1467009,1467011-1467033
Modified: accumulo/trunk/start/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/start/pom.xml (original)
+++ accumulo/trunk/start/pom.xml Thu Apr 11 18:32:33 2013
@@ -26,20 +26,28 @@
<name>Start</name>
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Modified: accumulo/trunk/test/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/test/pom.xml (original)
+++ accumulo/trunk/test/pom.xml Thu Apr 11 18:32:33 2013
@@ -30,48 +30,67 @@
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -79,6 +98,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/pom.xml?rev=1467036&r1=1467035&r2=1467036&view=diff
==============================================================================
--- accumulo/trunk/trace/pom.xml (original)
+++ accumulo/trunk/trace/pom.xml Thu Apr 11 18:32:33 2013
@@ -26,16 +26,13 @@
<name>Trace</name>
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -44,8 +41,13 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>