You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/04/27 16:56:52 UTC
svn commit: r769012 - in /maven/components/branches/maven-2.2.x: ./
apache-maven/ apache-maven/src/assemble/ apache-maven/src/test/
maven-core/src/main/java/org/apache/maven/plugin/ maven-integration-tests/
maven-model/src/test/ maven-project/src/test/...
Author: brett
Date: Mon Apr 27 14:56:52 2009
New Revision: 769012
URL: http://svn.apache.org/viewvc?rev=769012&view=rev
Log:
use the correct included license files in the source distribution
Merged from: r769010
Modified:
maven/components/branches/maven-2.2.x/ (props changed)
maven/components/branches/maven-2.2.x/apache-maven/ (props changed)
maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml
maven/components/branches/maven-2.2.x/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java (props changed)
maven/components/branches/maven-2.2.x/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.2.x/maven-model/src/test/ (props changed)
maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java (props changed)
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo (props changed)
Propchange: maven/components/branches/maven-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -2,6 +2,6 @@
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x:751686,767628,767631,768817,768995
+/maven/components/branches/maven-2.1.x:751686,767628,767631,768817,768995,769010
/maven/components/trunk:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379:678167
Propchange: maven/components/branches/maven-2.2.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -2,7 +2,7 @@
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/apache-maven:751686,767628,767631,768995
+/maven/components/branches/maven-2.1.x/apache-maven:751686,767628,767631,768995,769010
/maven/components/trunk/apache-maven:720001,721902,726845,727688
/maven/components/trunk/maven-distribution:727688
/maven/sandbox/branches/maven/MNG-3379/apache-maven:678167
Modified: maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml?rev=769012&r1=769011&r2=769012&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml (original)
+++ maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml Mon Apr 27 14:56:52 2009
@@ -34,8 +34,19 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../target/maven-shared-archive-resources/META-INF</directory>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
Propchange: maven/components/branches/maven-2.2.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:728834
/maven/components/branches/maven-2.0.x/apache-maven/src/test:736543
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,767628,767631,768995
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,767628,767631,768995,769010
Propchange: maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -4,6 +4,6 @@
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:688883,689695,689976,689990
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:752168,752622,752653,753320,755199,755215
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:751686,753648,754505,754542
-/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:767628,767631,768995
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:767628,767631,768995,769010
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:678167
Propchange: maven/components/branches/maven-2.2.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:728834
/maven/components/branches/maven-2.0.x/maven-integration-tests:736543
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,767628,767631,768995
+/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,767628,767631,768995,769010
Propchange: maven/components/branches/maven-2.2.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:728834
/maven/components/branches/maven-2.0.x/maven-model/src/test:736543
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,767628,767631,768995
+/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,767628,767631,768995,769010
Propchange: maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259,725329-725330,725342,725349,725359
/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,767628,767631,768995
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,767628,767631,768995,769010
Propchange: maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:56:52 2009
@@ -1 +1 @@
-/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796,768995
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796,768995,769010