svn commit: r773106 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src: main/java/org/apache/maven/artifact/ant/ site/apt/ site/apt/examples/

Author: pgier Date: Fri May 8 21:26:28 2009 New Revision: 773106 URL: http://svn.apache.org/viewvc?rev=773106&view=rev Log: [MANTTASKS-149] Allow type filter to accept multiple types. Added: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/TypesArti

svn commit: r773084 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt: examples/dependencies.apt reference.apt

Author: pgier Date: Fri May 8 20:25:00 2009 New Revision: 773084 URL: http://svn.apache.org/viewvc?rev=773084&view=rev Log: Improve documentation about type filtering the dependencies task. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt m

svn commit: r773083 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml src/site/apt/limitations.apt src/site/apt/usage.apt src/site/pdf.xml

Author: ltheussl Date: Fri May 8 20:24:38 2009 New Revision: 773083 URL: http://svn.apache.org/viewvc?rev=773083&view=rev Log: Update docs with info about cover page configuration. Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml maven/plugins/trunk/maven-pdf-plugin/src/site/apt/li

svn commit: r773075 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant: AbstractArtifactTask.java Pom.java

Author: pgier Date: Fri May 8 20:16:17 2009 New Revision: 773075 URL: http://svn.apache.org/viewvc?rev=773075&view=rev Log: Make sure that profileManager is always initialized before it is used. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact

svn commit: r773071 - /maven/shared/trunk/maven-archiver/pom.xml

Author: olamy Date: Fri May 8 19:54:02 2009 New Revision: 773071 URL: http://svn.apache.org/viewvc?rev=773071&view=rev Log: use spaces for indentation Modified: maven/shared/trunk/maven-archiver/pom.xml Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/m

svn commit: r773047 - in /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model: ProcessorContext.java inheritance/DefaultInheritanceAssembler.java inheritance/In

Author: bentmann Date: Fri May 8 17:00:45 2009 New Revision: 773047 URL: http://svn.apache.org/viewvc?rev=773047&view=rev Log: o Decoupled calculation of child path adjustment from filesystem which would make the effective model depend on the user's environment and breaks with our goal of repro

svn commit: r773031 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Author: bentmann Date: Fri May 8 15:19:51 2009 New Revision: 773031 URL: http://svn.apache.org/viewvc?rev=773031&view=rev Log: o Continued work on model merging Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

svn commit: r773030 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Author: bentmann Date: Fri May 8 15:14:02 2009 New Revision: 773030 URL: http://svn.apache.org/viewvc?rev=773030&view=rev Log: o Fixed profile handling Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified:

svn commit: r773023 - /maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

Author: bentmann Date: Fri May 8 15:02:05 2009 New Revision: 773023 URL: http://svn.apache.org/viewvc?rev=773023&view=rev Log: o Fixed toString() to not return null Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Modified: maven/components/branches/MNG-2766/m

svn commit: r773019 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Author: bentmann Date: Fri May 8 14:58:26 2009 New Revision: 773019 URL: http://svn.apache.org/viewvc?rev=773019&view=rev Log: o Continued work on model merging Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

svn commit: r773018 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Author: brianf Date: Fri May 8 14:55:13 2009 New Revision: 773018 URL: http://svn.apache.org/viewvc?rev=773018&view=rev Log: this is coming from oss.sonatype.org now. Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/s

svn commit: r773012 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Author: bentmann Date: Fri May 8 14:40:47 2009 New Revision: 773012 URL: http://svn.apache.org/viewvc?rev=773012&view=rev Log: o Continued work on model merging Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

svn commit: r773011 - /maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

Author: bentmann Date: Fri May 8 14:35:17 2009 New Revision: 773011 URL: http://svn.apache.org/viewvc?rev=773011&view=rev Log: o Added some more toString()'s to ease debugging Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Modified: maven/components/branches

svn commit: r772980 - in /maven/components/branches/MNG-2766: maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java maven-model/src/main/java/org/apache/maven/model/merg

Author: bentmann Date: Fri May 8 13:31:32 2009 New Revision: 772980 URL: http://svn.apache.org/viewvc?rev=772980&view=rev Log: o Continued work on model merging Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

svn commit: r772964 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/project/ maven-core/src/test/java/org/apache/maven/project/ maven-model-builder/src/main/java/or

Author: bentmann Date: Fri May 8 13:10:51 2009 New Revision: 772964 URL: http://svn.apache.org/viewvc?rev=772964&view=rev Log: o Continued work on model merging Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

svn commit: r772946 - in /maven/components/branches/MNG-2766/maven-core/src/test: java/org/apache/maven/project/PomConstructionTest.java resources-project-builder/dependencies-with-different-versions/

Author: bentmann Date: Fri May 8 11:34:47 2009 New Revision: 772946 URL: http://svn.apache.org/viewvc?rev=772946&view=rev Log: o Removed duplicate test Removed: maven/components/branches/MNG-2766/maven-core/src/test/resources-project-builder/dependencies-with-different-versions/ Modified: