svn commit: r718303 - /maven/components/trunk/maven-compat/pom.xml

Author: sisbell Date: Mon Nov 17 10:00:22 2008 New Revision: 718303 URL: http://svn.apache.org/viewvc?rev=718303view=rev Log: Fixed pom to correct snaphost dependency version. Modified: maven/components/trunk/maven-compat/pom.xml Modified: maven/components/trunk/maven-compat/pom.xml URL:

svn commit: r718316 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2006/ resources/mng-2006/child/ resources/mng-2006/parent/

Author: bentmann Date: Mon Nov 17 10:33:20 2008 New Revision: 718316 URL: http://svn.apache.org/viewvc?rev=718316view=rev Log: [MNG-3848] Inheritance of project/site/scm URLs does not take child's relative location to parent into account o Added IT (named after the original issue) Added:

svn commit: r718319 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/IntegrationTestSuite.java java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCa

Author: bentmann Date: Mon Nov 17 10:39:51 2008 New Revision: 718319 URL: http://svn.apache.org/viewvc?rev=718319view=rev Log: o Deleted IT mng-3134 which is now superceded by the more complete test mng-2006 Removed:

svn commit: r718334 - /maven/mercury/trunk/mercury-maven/maven-antrun-plugin-1.2.pom

Author: ogusakov Date: Mon Nov 17 11:27:34 2008 New Revision: 718334 URL: http://svn.apache.org/viewvc?rev=718334view=rev Log: (empty) Removed: maven/mercury/trunk/mercury-maven/maven-antrun-plugin-1.2.pom

svn commit: r718332 - /maven/mercury/trunk/mercury-maven/results-no-mem-cache.html

Author: ogusakov Date: Mon Nov 17 11:27:18 2008 New Revision: 718332 URL: http://svn.apache.org/viewvc?rev=718332view=rev Log: (empty) Removed: maven/mercury/trunk/mercury-maven/results-no-mem-cache.html

svn commit: r718333 - /maven/mercury/trunk/mercury-maven/results.html

Author: ogusakov Date: Mon Nov 17 11:27:25 2008 New Revision: 718333 URL: http://svn.apache.org/viewvc?rev=718333view=rev Log: (empty) Removed: maven/mercury/trunk/mercury-maven/results.html

svn commit: r718338 - in /maven/mercury/trunk: mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/ mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/ merc

Author: ogusakov Date: Mon Nov 17 11:29:38 2008 New Revision: 718338 URL: http://svn.apache.org/viewvc?rev=718338view=rev Log: debugging improvements, small fixes Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java

svn commit: r718375 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java

Author: sisbell Date: Mon Nov 17 12:59:05 2008 New Revision: 718375 URL: http://svn.apache.org/viewvc?rev=718375view=rev Log: Problem in merging artifact containers, where one container specified a default type value (jar) and the other did not. They were treated as different types. Fixed this.

svn commit: r718389 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java

Author: olamy Date: Mon Nov 17 13:26:16 2008 New Revision: 718389 URL: http://svn.apache.org/viewvc?rev=718389view=rev Log: [MCHANGES-117] Send only one e-mail to many recipients (all recipients in one to-header) Modified:

svn commit: r718391 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java

Author: olamy Date: Mon Nov 17 13:32:26 2008 New Revision: 718391 URL: http://svn.apache.org/viewvc?rev=718391view=rev Log: display mail debug only when mojo is executed in debug mode Modified:

svn commit: r718404 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

Author: olamy Date: Mon Nov 17 13:56:41 2008 New Revision: 718404 URL: http://svn.apache.org/viewvc?rev=718404view=rev Log: [MCHANGES-132] Overriding mail introduction with a mojo configuration Modified:

svn commit: r718405 - in /maven/mercury/trunk: mercury-it/ mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repo

Author: ogusakov Date: Mon Nov 17 13:57:51 2008 New Revision: 718405 URL: http://svn.apache.org/viewvc?rev=718405view=rev Log: fixed cache bug introduced by optimization, ITs work now Modified: maven/mercury/trunk/mercury-it/pom.xml

svn commit: r718407 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

Author: olamy Date: Mon Nov 17 14:05:02 2008 New Revision: 718407 URL: http://svn.apache.org/viewvc?rev=718407view=rev Log: [MCHANGES-133] adding maven project to the velocity context when generating announce email Modified:

svn commit: r718415 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

Author: olamy Date: Mon Nov 17 14:25:56 2008 New Revision: 718415 URL: http://svn.apache.org/viewvc?rev=718415view=rev Log: [MCHANGES-134] Passing some extra parameters to the announce velocity context Modified:

svn commit: r718461 - in /maven/components/branches/maven-2.0.10-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ mav

Author: brianf Date: Mon Nov 17 17:30:40 2008 New Revision: 718461 URL: http://svn.apache.org/viewvc?rev=718461view=rev Log: [maven-release-plugin] prepare release maven-2.0.10-RC4 Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml

svn commit: r718462 - in /maven/components/tags/maven-2.0.10-RC4: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-

Author: brianf Date: Mon Nov 17 17:30:54 2008 New Revision: 718462 URL: http://svn.apache.org/viewvc?rev=718462view=rev Log: [maven-release-plugin] copy for tag maven-2.0.10-RC4 Added: maven/components/tags/maven-2.0.10-RC4/ - copied from r718459,

svn commit: r718463 - in /maven/components/branches/maven-2.0.10-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ mav

Author: brianf Date: Mon Nov 17 17:31:06 2008 New Revision: 718463 URL: http://svn.apache.org/viewvc?rev=718463view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml

svn commit: r718472 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java MavenProjectBuilder.java

Author: sisbell Date: Mon Nov 17 19:04:29 2008 New Revision: 718472 URL: http://svn.apache.org/viewvc?rev=718472view=rev Log: Fix: interpolator - mavenVersion and maven.version are implicitly set. Modified:

svn commit: r718479 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Author: sisbell Date: Mon Nov 17 19:45:09 2008 New Revision: 718479 URL: http://svn.apache.org/viewvc?rev=718479view=rev Log: Rule: Don't inherit parent relativePath Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

svn commit: r718516 - in /maven/mercury/trunk: mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/ mercury-md/mercury-md-sat/src/main/java/org/apache/maven/

Author: ogusakov Date: Mon Nov 17 23:32:08 2008 New Revision: 718516 URL: http://svn.apache.org/viewvc?rev=718516view=rev Log: added tree-stype conflict resolution for tool integration and as a first step towards OSGi resolution Added: