flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject git commit: FLUME-2008. Create a fat jar for flume-ng-log4jappender.
Date Thu, 30 May 2013 00:07:17 GMT
Updated Branches:
  refs/heads/flume-1.4 f9986bf37 -> 7f66495d9


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/7f66495d
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/7f66495d
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/7f66495d

Branch: refs/heads/flume-1.4
Commit: 7f66495d91e4d676b4b4dedc5443a52fe3128427
Parents: f9986bf
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Wed May 29 17:05:11 2013 -0700
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Wed May 29 17:06:50 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/7f66495d/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/7f66495d/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/7f66495d/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/7f66495d/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>


Mime
View raw message