Author: ctubbsii
Date: Mon Jun 3 22:38:13 2013
New Revision: 1489215
URL: http://svn.apache.org/r1489215
Log:
ACCUMULO-935 fix assembly, so it packages the proper jars
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1489215&r1=1489214&r2=1489215&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Mon Jun 3 22:38:13 2013
@@ -29,14 +29,22 @@
<accumulo-top>..</accumulo-top>
</properties>
<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>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
@@ -74,14 +82,12 @@
<artifactId>accumulo-trace</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
<profiles>
Modified: accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/binary-release.xml?rev=1489215&r1=1489214&r2=1489215&view=diff
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original)
+++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Mon Jun 3
22:38:13 2013
@@ -21,6 +21,25 @@
<formats>
<format>tar.gz</format>
</formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>${groupId}:${artifactId}-*</include>
+ <include>org.apache.commons:commons-vfs2</include>
+ <include>com.beust:jcommander</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.google.guava:guava</include>
+ <include>jline:jline</include>
+ <include>org.apache.thrift:libthrift</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
<directory>../bin</directory>
@@ -28,14 +47,6 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>../lib</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../examples/simple</directory>
<outputDirectory>/examples/simple</outputDirectory>
<directoryMode>0755</directoryMode>
