You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2013/07/25 02:27:41 UTC
git commit: TEZ-320. Cleanup tez tarball for transitive dependencies.
(hitesh)
Updated Branches:
refs/heads/master adf5972be -> 7995dad7a
TEZ-320. Cleanup tez tarball for transitive dependencies. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/7995dad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/7995dad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/7995dad7
Branch: refs/heads/master
Commit: 7995dad7a822174ecf57116047e876d2e7094bf7
Parents: adf5972
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Jul 24 17:27:11 2013 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Jul 24 17:27:11 2013 -0700
----------------------------------------------------------------------
pom.xml | 50 +----------------
tez-dist/pom.xml | 24 ++++++--
tez-dist/src/main/assembly/tez-dist-full.xml | 67 +++++++++++++++++++++++
tez-dist/src/main/assembly/tez-dist.xml | 26 +++------
tez-engine/pom.xml | 4 --
tez-mapreduce-examples/pom.xml | 36 ------------
6 files changed, 98 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7995dad7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a3579f..847b1d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -156,22 +157,14 @@
<artifactId>hadoop-yarn-common</artifactId>
<version>${hadoop.version}</version>
<type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-nodemanager</artifactId>
- <version>${hadoop.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
<version>${hadoop.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -220,48 +213,11 @@
<version>1.9.5</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>provided</scope>
- <version>11.0.2</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7995dad7/tez-dist/pom.xml
----------------------------------------------------------------------
diff --git a/tez-dist/pom.xml b/tez-dist/pom.xml
index 4bda9a9..3b64268 100644
--- a/tez-dist/pom.xml
+++ b/tez-dist/pom.xml
@@ -82,18 +82,34 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/tez-dist.xml</descriptor>
- </descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
- <finalName>tez-${project.version}</finalName>
</configuration>
<executions>
<execution>
+ <id>package-tez-full</id>
+ <configuration>
+ <finalName>tez-${project.version}-full</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/tez-dist-full.xml</descriptor>
+ </descriptors>
+ <formats>
+ <format>${package.format}</format>
+ </formats>
+ </configuration>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
<id>package-tez</id>
<configuration>
+ <finalName>tez-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/tez-dist.xml</descriptor>
+ </descriptors>
<formats>
<format>${package.format}</format>
</formats>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7995dad7/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
new file mode 100644
index 0000000..3176dd1
--- /dev/null
+++ b/tez-dist/src/main/assembly/tez-dist-full.xml
@@ -0,0 +1,67 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ 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-dag-api</include>
+ <include>org.apache.tez:tez-engine-api</include>
+ </includes>
+ <binaries>
+ <outputDirectory>/</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </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-dag-api</exclude>
+ <exclude>org.apache.tez:tez-engine-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/7995dad7/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 e3fc54f..01d0d40 100644
--- a/tez-dist/src/main/assembly/tez-dist.xml
+++ b/tez-dist/src/main/assembly/tez-dist.xml
@@ -20,21 +20,12 @@
<id>tez-dist</id>
<!--includeBaseDirectory paramter replacement does not seem to work -->
<!--includeBaseDirectory>${package.includeBaseDirectory}</includeBaseDirectory-->
- <!--fileSets>
- <fileSet>
- <directory>${project.build.directory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>${project.artifactId}-${project.version}.jar</include>
- </includes>
- </fileSet>
- </fileSets-->
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>org.apache.tez:tez-dag</include>
- <include>org.apache.tez:tez-yarn-client</include>
+ <includes>
+ <include>org.apache.tez:tez-dag-api</include>
+ <include>org.apache.tez:tez-engine-api</include>
</includes>
<binaries>
<outputDirectory>/</outputDirectory>
@@ -47,22 +38,21 @@
<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>org.apache.tez:tez-dag-api</exclude>
+ <exclude>org.apache.tez:tez-engine-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-mapreduce-client-common</exclude-->
- <!--exclude>org.apache.hadoop:hadoop-mapreduce-client-core</exclude-->
- <!--exclude>org.apache.hadoop:hadoop-mapreduce-client-shuffle</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>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7995dad7/tez-engine/pom.xml
----------------------------------------------------------------------
diff --git a/tez-engine/pom.xml b/tez-engine/pom.xml
index ab64739..4ff5839 100644
--- a/tez-engine/pom.xml
+++ b/tez-engine/pom.xml
@@ -45,10 +45,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-nodemanager</artifactId>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/7995dad7/tez-mapreduce-examples/pom.xml
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/pom.xml b/tez-mapreduce-examples/pom.xml
index 090debc..2c95425 100644
--- a/tez-mapreduce-examples/pom.xml
+++ b/tez-mapreduce-examples/pom.xml
@@ -34,10 +34,6 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<scope>provided</scope>
@@ -59,17 +55,6 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <!--dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
@@ -81,27 +66,6 @@
<artifactId>tez-dag</artifactId>
<scope>provided</scope>
</dependency>
- <!--dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-app</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency-->
- <!--dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-hs</artifactId>
- <scope>test</scope>
- </dependency-->
- <!--dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>provided</scope>
- </dependency-->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>