Updated Branches: refs/heads/trunk 8594feba3 -> 1e66428c6
FLUME-2008. Create a fat jar for flume-ng-log4jappender. (Roman Shaposhnik via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/1e66428c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/1e66428c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/1e66428c Branch: refs/heads/trunk Commit: 1e66428c6414af8c83f24c810bd770c292f0fb5a Parents: 8594feb Author: Hari Shreedharan <[email protected]> Authored: Wed May 29 17:05:11 2013 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Wed May 29 17:05:11 2013 -0700 ---------------------------------------------------------------------- flume-ng-clients/flume-ng-log4jappender/pom.xml | 18 +++++++ flume-ng-dist/pom.xml | 5 ++ flume-ng-dist/src/main/assembly/bin.xml | 46 ++++++++---------- pom.xml | 7 +++ 4 files changed, 50 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/1e66428c/flume-ng-clients/flume-ng-log4jappender/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml index b5f7e39..195ba97 100644 --- a/flume-ng-clients/flume-ng-log4jappender/pom.xml +++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml @@ -35,6 +35,24 @@ limitations under the License. <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flume/blob/1e66428c/flume-ng-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml index 1a44626..e266272 100644 --- a/flume-ng-dist/pom.xml +++ b/flume-ng-dist/pom.xml @@ -132,6 +132,11 @@ <groupId>org.apache.flume.flume-ng-clients</groupId> <artifactId>flume-ng-log4jappender</artifactId> </dependency> + <dependency> + <groupId>org.apache.flume.flume-ng-clients</groupId> + <artifactId>flume-ng-log4jappender</artifactId> + <classifier>jar-with-dependencies</classifier> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/1e66428c/flume-ng-dist/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/src/main/assembly/bin.xml b/flume-ng-dist/src/main/assembly/bin.xml index b6a8c8a..74f0608 100644 --- a/flume-ng-dist/src/main/assembly/bin.xml +++ b/flume-ng-dist/src/main/assembly/bin.xml @@ -35,32 +35,6 @@ <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> - <includes> - <include>org.apache.flume:flume-ng-configuration</include> - <include>org.apache.flume:flume-ng-sdk</include> - <include>org.apache.flume:flume-ng-core</include> - <include>org.apache.flume:flume-ng-node</include> - <include>org.apache.flume:flume-ng-dist</include> - <include>org.apache.flume:flume-ng-channels</include> - <include>org.apache.flume:flume-ng-sinks</include> - <include>org.apache.flume:flume-ng-sources</include> - <include>org.apache.flume:flume-ng-legacy-sources</include> - <include>org.apache.flume:flume-ng-clients</include> - <include>org.apache.flume:flume-ng-embedded-agent</include> - </includes> - - <binaries> - <unpack>false</unpack> - <outputDirectory>lib</outputDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>lib</outputDirectory> - </dependencySet> - </dependencySets> - </binaries> - <sources> <includeModuleDirectory>true</includeModuleDirectory> <excludeSubModuleDirectories>false</excludeSubModuleDirectories> @@ -85,6 +59,26 @@ </moduleSets> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <excludes> + <exclude>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</exclude> + </excludes> + </dependencySet> + <dependencySet> + <outputDirectory>tools</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</include> + </includes> + </dependencySet> + </dependencySets> + + <fileSets> <fileSet> <directory>../</directory> http://git-wip-us.apache.org/repos/asf/flume/blob/1e66428c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5b6679c..9982f5d 100644 --- a/pom.xml +++ b/pom.xml @@ -979,6 +979,13 @@ limitations under the License. </dependency> <dependency> + <groupId>org.apache.flume.flume-ng-clients</groupId> + <artifactId>flume-ng-log4jappender</artifactId> + <version>1.4.0-SNAPSHOT</version> + <classifier>jar-with-dependencies</classifier> + </dependency> + + <dependency> <groupId>org.apache.flume</groupId> <artifactId>flume-ng-embedded-agent</artifactId> <version>1.4.0-SNAPSHOT</version>
