Author: hboutemy Date: Sat Mar 14 13:10:44 2009 New Revision: 753649 URL: http://svn.apache.org/viewvc?rev=753649&view=rev Log: upgraded Modello to 1.0.1 (merged from 2.1.x branch r753648
Modified: maven/components/branches/maven-2.1.0-RC/ (props changed) maven/components/branches/maven-2.1.0-RC/apache-maven/ (props changed) maven/components/branches/maven-2.1.0-RC/apache-maven/src/test/ (props changed) maven/components/branches/maven-2.1.0-RC/maven-integration-tests/ (props changed) maven/components/branches/maven-2.1.0-RC/maven-model/src/test/ (props changed) maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java (props changed) maven/components/branches/maven-2.1.0-RC/pom.xml Propchange: maven/components/branches/maven-2.1.0-RC/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 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 -/maven/components/branches/maven-2.1.x:751686 +/maven/components/branches/maven-2.1.x:751686,753648 /maven/components/trunk:572229,720001,721902,726845,729292 /maven/sandbox/branches/maven/MNG-3379:678167 Propchange: maven/components/branches/maven-2.1.0-RC/apache-maven/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 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 -/maven/components/branches/maven-2.1.x/apache-maven:751686 +/maven/components/branches/maven-2.1.x/apache-maven:751686,753648 /maven/components/trunk/apache-maven:720001,721902,726845,727688 /maven/components/trunk/maven-distribution:727688 /maven/sandbox/branches/maven/MNG-3379/apache-maven:678167 Propchange: maven/components/branches/maven-2.1.0-RC/apache-maven/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 2009 @@ -1,3 +1,3 @@ /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.x/apache-maven/src/test:751686 +/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,753648 Propchange: maven/components/branches/maven-2.1.0-RC/maven-integration-tests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 2009 @@ -1,3 +1,3 @@ /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.x/maven-integration-tests:751686 +/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,753648 Propchange: maven/components/branches/maven-2.1.0-RC/maven-model/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 2009 @@ -1,3 +1,3 @@ /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.x/maven-model/src/test:751686 +/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,753648 Propchange: maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 14 13:10:44 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 -/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686 +/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,753648 Modified: maven/components/branches/maven-2.1.0-RC/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/pom.xml?rev=753649&r1=753648&r2=753649&view=diff ============================================================================== --- maven/components/branches/maven-2.1.0-RC/pom.xml (original) +++ maven/components/branches/maven-2.1.0-RC/pom.xml Sat Mar 14 13:10:44 2009 @@ -182,7 +182,7 @@ <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> - <version>1.0</version> + <version>1.0.1</version> <executions> <execution> <id>site-docs</id> @@ -211,33 +211,33 @@ <comparisonVersion>2.1.0-M1</comparisonVersion> <excludes> <exclude>org/apache/maven/artifact/Artifact*</exclude> - + <exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude> - + <exclude>org/apache/maven/plugin/PluginManagerException*</exclude> <exclude>org/apache/maven/artifact/repository/metadata/Snapshot*</exclude> <exclude>org/apache/maven/artifact/repository/metadata/Versioning*</exclude> <exclude>org/apache/maven/artifact/repository/metadata/Plugin*</exclude> <exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/*</exclude> - + <exclude>org/apache/maven/model/*</exclude> <exclude>org/apache/maven/model/io/xpp3/*</exclude> <exclude>org/apache/maven/settings/*</exclude> <exclude>org/apache/maven/settings/io/xpp3/*</exclude> - + <exclude>org/apache/maven/usability/plugin/*</exclude> <exclude>org/apache/maven/usability/plugin/io/xpp3/*</exclude> - + <exclude>org/apache/maven/profiles/*</exclude> <exclude>org/apache/maven/profiles/io/xpp3/*</exclude> - + <exclude>org/apache/maven/plugin/registry/*</exclude> <exclude>org/apache/maven/plugin/registry/io/xpp3/*</exclude> - + <exclude>org/apache/maven/plugin/lifecycle/*</exclude> <exclude>org/apache/maven/plugin/lifecycle/io/xpp3/*</exclude> - + <exclude>org/apache/maven/toolchain/model/*</exclude> <exclude>org/apache/maven/toolchain/model/io/xpp3/*</exclude> </excludes>