tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject git commit: TEZ-788. Clean up dist tarballs. (Contributed by Jonathan Eagles)
Date Thu, 20 Feb 2014 22:29:01 GMT
Repository: incubator-tez
Updated Branches:
  refs/heads/master b6072a862 -> be0d38988


TEZ-788. Clean up dist tarballs. (Contributed by Jonathan Eagles)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/be0d3898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/be0d3898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/be0d3898

Branch: refs/heads/master
Commit: be0d3898864423b005c978d2ce4d810eb775728d
Parents: b6072a8
Author: Siddharth Seth <sseth@apache.org>
Authored: Thu Feb 20 14:28:26 2014 -0800
Committer: Siddharth Seth <sseth@apache.org>
Committed: Thu Feb 20 14:28:26 2014 -0800

----------------------------------------------------------------------
 tez-dist/src/main/assembly/tez-dist-full.xml | 63 ++++++++++-------------
 tez-dist/src/main/assembly/tez-dist.xml      | 42 ++++++---------
 2 files changed, 44 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/be0d3898/tez-dist/src/main/assembly/tez-dist-full.xml
----------------------------------------------------------------------
diff --git a/tez-dist/src/main/assembly/tez-dist-full.xml b/tez-dist/src/main/assembly/tez-dist-full.xml
index 383eb43..4a5c77d 100644
--- a/tez-dist/src/main/assembly/tez-dist-full.xml
+++ b/tez-dist/src/main/assembly/tez-dist-full.xml
@@ -18,48 +18,41 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>tez-dist</id>
-  <!--includeBaseDirectory paramter replacement does not seem to work -->
-  <!--includeBaseDirectory>${package.includeBaseDirectory}</includeBaseDirectory-->
   <moduleSets>
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.tez:tez-api</include>
-      </includes>
       <binaries>
         <outputDirectory>/</outputDirectory>
-        <includeDependencies>false</includeDependencies>
         <unpack>false</unpack>
+        <dependencySets>
+          <dependencySet>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <outputDirectory>/lib</outputDirectory>
+            <excludes>
+              <exclude>*:*:test-jar</exclude>
+              <exclude>org.apache.hadoop:hadoop-common</exclude>
+              <exclude>org.apache.hadoop:hadoop-auth</exclude>
+              <exclude>org.apache.hadoop:hadoop-annotations</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-api</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-common</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-server-common</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-server-nodemanager</exclude>
+              <exclude>org.apache.tez:*</exclude>
+              <exclude>org.slf4j:*</exclude>
+            </excludes>
+          </dependencySet>
+          <dependencySet>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <outputDirectory>/tests</outputDirectory>
+            <includes>
+            <include>*:*:test-jar</include>
+            </includes>
+          </dependencySet>
+        </dependencySets>
       </binaries>
     </moduleSet>
   </moduleSets>
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>/lib</outputDirectory>
-      <!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
-      <excludes>
-        <exclude>org.apache.tez:tez-api</exclude>
-        <exclude>*:*:test-jar</exclude>
-        <exclude>org.apache.hadoop:hadoop-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-auth</exclude>
-        <exclude>org.apache.hadoop:hadoop-annotations</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-api</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-server-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-server-nodemanager</exclude>
-        <!-- use slf4j from common to avoid multiple binding warnings -->
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>
-      </excludes>
-    </dependencySet>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>/tests</outputDirectory>
-      <includes>
-        <include>*:*:test-jar</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/be0d3898/tez-dist/src/main/assembly/tez-dist.xml
----------------------------------------------------------------------
diff --git a/tez-dist/src/main/assembly/tez-dist.xml b/tez-dist/src/main/assembly/tez-dist.xml
index 9143847..9413f87 100644
--- a/tez-dist/src/main/assembly/tez-dist.xml
+++ b/tez-dist/src/main/assembly/tez-dist.xml
@@ -18,39 +18,29 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>tez-dist</id>
-  <!--includeBaseDirectory paramter replacement does not seem to work -->
-  <!--includeBaseDirectory>${package.includeBaseDirectory}</includeBaseDirectory-->
   <moduleSets>
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
-     <includes>
-       <include>org.apache.tez:tez-api</include>
-      </includes>
       <binaries>
         <outputDirectory>/</outputDirectory>
-        <includeDependencies>false</includeDependencies>
         <unpack>false</unpack>
+        <dependencySets>
+          <dependencySet>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <outputDirectory>/lib</outputDirectory>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <excludes>
+              <exclude>*:*:test-jar</exclude>
+              <exclude>org.apache.hadoop:hadoop-common</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-api</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
+              <exclude>org.apache.hadoop:hadoop-yarn-common</exclude>
+              <exclude>org.apache.tez:*</exclude>
+            </excludes>
+          </dependencySet>
+        </dependencySets>
       </binaries>
     </moduleSet>
   </moduleSets>
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>/lib</outputDirectory>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
-      <excludes>
-        <exclude>*:*:test-jar</exclude>
-        <exclude>org.apache.hadoop:hadoop-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-auth</exclude>
-        <exclude>org.apache.hadoop:hadoop-annotations</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-api</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-server-common</exclude>
-        <exclude>org.apache.hadoop:hadoop-yarn-server-nodemanager</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
 </assembly>


Mime
View raw message