You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tg...@apache.org on 2013/04/19 23:59:31 UTC
svn commit: r1470059 - in /hadoop/common/branches/branch-2:
hadoop-assemblies/src/main/resources/assemblies/ hadoop-project/
Author: tgraves
Date: Fri Apr 19 21:59:31 2013
New Revision: 1470059
URL: http://svn.apache.org/r1470059
Log:
HADOOP-9469. mapreduce/yarn source jars not included in dist tarball Robert Parker via tgraves)
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
hadoop/common/branches/branch-2/hadoop-project/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1470059&r1=1470058&r2=1470059&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Fri Apr 19 21:59:31 2013
@@ -91,6 +91,62 @@
<directory>${project.build.directory}/site</directory>
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-app/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-common/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-core/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-hs/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-mapreduce-examples/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
</fileSets>
<moduleSets>
<moduleSet>
Modified: hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml?rev=1470059&r1=1470058&r2=1470059&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml Fri Apr 19 21:59:31 2013
@@ -9,7 +9,7 @@
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,
+ distributed under the Li2cense 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.
@@ -44,6 +44,55 @@
</includes>
<outputDirectory>lib/native</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../hadoop-archives/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-datajoin/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-distcp/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-extras/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-gridmix/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-rumen/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../hadoop-streaming/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1470059&r1=1470058&r2=1470059&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml Fri Apr 19 21:59:31 2013
@@ -6,7 +6,7 @@
(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
+ http://www.apache.org/licenses/LICENSE-2.01
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -63,6 +63,76 @@
</includes>
</fileSet>
<fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-api/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-client/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-common/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/target</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+ <includes>
+ <include>*-sources.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory>
<outputDirectory>etc/hadoop</outputDirectory>
<includes>
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1470059&r1=1470058&r2=1470059&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Fri Apr 19 21:59:31 2013
@@ -968,6 +968,7 @@
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
+ <goal>test-jar-no-fork</goal>
</goals>
</execution>
</executions>