Author: ctubbsii Date: Wed Apr 10 21:13:04 2013 New Revision: 1466685 URL: http://svn.apache.org/r1466685 Log: ACCUMULO-1244 Make more libraries provided, because they must be. So, we'll depend on the version given by Hadoop. Remove all provided jars and source jars from lib directory.
Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/bin/accumulo accumulo/branches/1.5/bin/bootstrap_hdfs.sh accumulo/branches/1.5/core/pom.xml accumulo/branches/1.5/examples/simple/pom.xml accumulo/branches/1.5/fate/pom.xml accumulo/branches/1.5/pom.xml accumulo/branches/1.5/proxy/pom.xml accumulo/branches/1.5/server/pom.xml accumulo/branches/1.5/start/pom.xml accumulo/branches/1.5/test/pom.xml accumulo/branches/1.5/trace/pom.xml Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Wed Apr 10 21:13:04 2013 @@ -34,6 +34,11 @@ modules in our assembly, we only need to ensure this distribution project builds AFTER those... --> <dependencies> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> <scope>provided</scope> Modified: accumulo/branches/1.5/bin/accumulo URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/accumulo?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/bin/accumulo (original) +++ accumulo/branches/1.5/bin/accumulo Wed Apr 10 21:13:04 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 @@ -81,7 +81,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/branches/1.5/bin/bootstrap_hdfs.sh URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/bootstrap_hdfs.sh?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/bin/bootstrap_hdfs.sh (original) +++ accumulo/branches/1.5/bin/bootstrap_hdfs.sh Wed Apr 10 21:13:04 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 Modified: accumulo/branches/1.5/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/core/pom.xml (original) +++ accumulo/branches/1.5/core/pom.xml Wed Apr 10 21:13:04 2013 @@ -30,66 +30,74 @@ <artifactId>jcommander</artifactId> </dependency> <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</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> - </dependency> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-start</artifactId> - </dependency> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-trace</artifactId> - </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/branches/1.5/examples/simple/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/examples/simple/pom.xml (original) +++ accumulo/branches/1.5/examples/simple/pom.xml Wed Apr 10 21:13:04 2013 @@ -30,16 +30,28 @@ <artifactId>jcommander</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> + <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>junit</groupId> @@ -66,12 +78,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <outputDirectory>../../lib</outputDirectory> - </configuration> - </plugin> </plugins> </pluginManagement> </build> Modified: accumulo/branches/1.5/fate/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/fate/pom.xml (original) +++ accumulo/branches/1.5/fate/pom.xml Wed Apr 10 21:13:04 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> Modified: accumulo/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/pom.xml (original) +++ accumulo/branches/1.5/pom.xml Wed Apr 10 21:13:04 2013 @@ -136,22 +136,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 +161,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 +181,7 @@ <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>0.9.94</version> + <version>1.0</version> </dependency> <dependency> <groupId>junit</groupId> @@ -246,7 +246,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 +271,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> @@ -537,8 +537,9 @@ <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/branches/1.5/proxy/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/proxy/pom.xml (original) +++ accumulo/branches/1.5/proxy/pom.xml Wed Apr 10 21:13:04 2013 @@ -34,14 +34,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> </dependency> @@ -54,8 +46,34 @@ <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.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> Modified: accumulo/branches/1.5/server/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/server/pom.xml (original) +++ accumulo/branches/1.5/server/pom.xml Wed Apr 10 21:13:04 2013 @@ -34,34 +34,10 @@ <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> </dependency> @@ -82,11 +58,41 @@ <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>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.zookeeper</groupId> <artifactId>zookeeper</artifactId> <scope>provided</scope> Modified: accumulo/branches/1.5/start/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/start/pom.xml (original) +++ accumulo/branches/1.5/start/pom.xml Wed Apr 10 21:13:04 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/branches/1.5/test/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/test/pom.xml (original) +++ accumulo/branches/1.5/test/pom.xml Wed Apr 10 21:13:04 2013 @@ -30,22 +30,10 @@ <artifactId>jcommander</artifactId> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> </dependency> @@ -66,19 +54,55 @@ <artifactId>accumulo-trace</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</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>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</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> <artifactId>junit</artifactId> <scope>test</scope> Modified: accumulo/branches/1.5/trace/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/trace/pom.xml?rev=1466685&r1=1466684&r2=1466685&view=diff ============================================================================== --- accumulo/branches/1.5/trace/pom.xml (original) +++ accumulo/branches/1.5/trace/pom.xml Wed Apr 10 21:13:04 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>