svn commit: r725604 - in /maven/mercury/trunk/mercury-md/mercury-md-sat/src: main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java test/java/org/apache/maven/mercury/metadata/sat/Defau

2008-12-10 Thread ogusakov
Author: ogusakov Date: Wed Dec 10 23:23:19 2008 New Revision: 725604 URL: http://svn.apache.org/viewvc?rev=725604&view=rev Log: Thanks to Ben - fixed MERCURY-40 Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java

svn commit: r725587 - /maven/trunks/

2008-12-10 Thread brett
Author: brett Date: Wed Dec 10 21:49:39 2008 New Revision: 725587 URL: http://svn.apache.org/viewvc?rev=725587&view=rev Log: add Mercury to externals Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ --

svn commit: r725563 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java

2008-12-10 Thread brett
Author: brett Date: Wed Dec 10 19:34:52 2008 New Revision: 725563 URL: http://svn.apache.org/viewvc?rev=725563&view=rev Log: guard against NPE when the exception was dumped Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Modif

svn commit: r725542 - in /maven/components/branches/maven-2.0.10-RC: maven-core-it-runner/pom.xml pom.xml

2008-12-10 Thread brianf
Author: brianf Date: Wed Dec 10 18:10:52 2008 New Revision: 725542 URL: http://svn.apache.org/viewvc?rev=725542&view=rev Log: bump for next rc Modified: maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.10-RC/pom.xml Modified: mave

svn commit: r725541 - /maven/components/trunk/pom.xml

2008-12-10 Thread brett
Author: brett Date: Wed Dec 10 18:08:45 2008 New Revision: 725541 URL: http://svn.apache.org/viewvc?rev=725541&view=rev Log: according to comment on the change that introduced it, bumping was unintentional, and broke the build Modified: maven/components/trunk/pom.xml Modified: maven/compone

svn commit: r725538 - /maven/repository-tools/trunk/src/bin/synchronize.properties

2008-12-10 Thread carlos
Author: carlos Date: Wed Dec 10 17:57:37 2008 New Revision: 725538 URL: http://svn.apache.org/viewvc?rev=725538&view=rev Log: Change sync report directory Modified: maven/repository-tools/trunk/src/bin/synchronize.properties Modified: maven/repository-tools/trunk/src/bin/synchronize.properti

svn commit: r725534 - in /maven/repository-tools/trunk/src/bin/m1-m2-conversion: conversion.properties convert-m1-m2.sh

2008-12-10 Thread carlos
Author: carlos Date: Wed Dec 10 17:49:44 2008 New Revision: 725534 URL: http://svn.apache.org/viewvc?rev=725534&view=rev Log: Use temp directories outside the to-ibiblio folder Modified: maven/repository-tools/trunk/src/bin/m1-m2-conversion/conversion.properties maven/repository-tools/tru

svn commit: r725531 - in /maven/repository-tools/trunk/src/bin/m1-m2-conversion: ./ archiva-cli-1.0-SNAPSHOT-cli.jar conversion.properties convert-m1-m2.sh

2008-12-10 Thread carlos
Author: carlos Date: Wed Dec 10 17:44:16 2008 New Revision: 725531 URL: http://svn.apache.org/viewvc?rev=725531&view=rev Log: Partially reverting 709721 to readd M1 to M2 conversion on demand Added: maven/repository-tools/trunk/src/bin/m1-m2-conversion/ - copied from r709720, maven/rep

svn commit: r725529 - 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

2008-12-10 Thread brianf
Author: brianf Date: Wed Dec 10 17:43:00 2008 New Revision: 725529 URL: http://svn.apache.org/viewvc?rev=725529&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml maven/components/branches/ma

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

2008-12-10 Thread brianf
Author: brianf Date: Wed Dec 10 17:42:48 2008 New Revision: 725528 URL: http://svn.apache.org/viewvc?rev=725528&view=rev Log: [maven-release-plugin] copy for tag maven-2.0.10-RC5 Added: maven/components/tags/maven-2.0.10-RC5/ - copied from r725510, maven/components/branches/maven-2.0.1

svn commit: r725527 - 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

2008-12-10 Thread brianf
Author: brianf Date: Wed Dec 10 17:42:33 2008 New Revision: 725527 URL: http://svn.apache.org/viewvc?rev=725527&view=rev Log: [maven-release-plugin] prepare release maven-2.0.10-RC5 Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml maven/components/branches/maven-2.

svn commit: r725525 - /maven/components/trunk/pom.xml

2008-12-10 Thread brett
Author: brett Date: Wed Dec 10 17:40:43 2008 New Revision: 725525 URL: http://svn.apache.org/viewvc?rev=725525&view=rev Log: required for plugin manager snapshot and its released parent Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.

svn commit: r725481 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/ide/ main/resources/org/apache/maven/plugin/ide/ test/java/org/apache/maven/plugin/eclipse/it/

2008-12-10 Thread baerrach
Author: baerrach Date: Wed Dec 10 15:06:32 2008 New Revision: 725481 URL: http://svn.apache.org/viewvc?rev=725481&view=rev Log: [MECLIPSE-504] Add a new mojo eclipse:remove-cache Added forceRecheck to AbstractIdeSupportMojo which will recheck sources/javadocs for existence. Added: maven/pl

svn commit: r725470 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 14:35:11 2008 New Revision: 725470 URL: http://svn.apache.org/viewvc?rev=725470&view=rev Log: o Fixed some version ranges to match actual release history Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT01

svn commit: r725465 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 14:18:57 2008 New Revision: 725465 URL: http://svn.apache.org/viewvc?rev=725465&view=rev Log: o Fixed detection of drive-relative paths on Windows (cause for IT failures of 0092 and 0005 on the grid) Modified: maven/shared/trunk/maven-verifier/src/main/java

svn commit: r725444 - /maven/components/trunk/pom.xml

2008-12-10 Thread jvanzyl
Author: jvanzyl Date: Wed Dec 10 13:32:53 2008 New Revision: 725444 URL: http://svn.apache.org/viewvc?rev=725444&view=rev Log: o adding groupId for the compiler plugin Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/c

svn commit: r725406 - in /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994: ./ repo/org/apache/maven/its/it0123/artifact/ repo/org/apache/maven/its/it0123/artifact/1.0-SN

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 11:50:30 2008 New Revision: 725406 URL: http://svn.apache.org/viewvc?rev=725406&view=rev Log: o Shortened some paths Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/ (props ch

svn commit: r725394 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/bugs/massembly-285/ src/it/projects/bugs/massembly-285/massembly-285-assembly/ src/it/projects/bugs/massembly-28

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 11:29:42 2008 New Revision: 725394 URL: http://svn.apache.org/viewvc?rev=725394&view=rev Log: [MASSEMBLY-75][MASSEMBLY-285][MASSEMBLY-238] fixing and adding integration tests. The only potentially outstanding issue of these might be MASSEMBLY-75, which will have

svn commit: r725392 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0092/ resources/it0092/repo/ resources/it0092/repository/ resources/it0109/

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 11:23:59 2008 New Revision: 725392 URL: http://svn.apache.org/viewvc?rev=725392&view=rev Log: o Shortened some paths Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0092/repo/ (props changed) - copied from r725372, ma

svn commit: r725370 - /maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 10:34:24 2008 New Revision: 725370 URL: http://svn.apache.org/viewvc?rev=725370&view=rev Log: isolate the IT launcher POM to make it easier to use. Modified: maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml Modified: maven/components/bran

svn commit: r725368 - /maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 10:33:10 2008 New Revision: 725368 URL: http://svn.apache.org/viewvc?rev=725368&view=rev Log: isolate the IT launcher POM to make it easier to use. Modified: maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml Modified: maven/components/bran

svn commit: r725366 - /maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 10:30:38 2008 New Revision: 725366 URL: http://svn.apache.org/viewvc?rev=725366&view=rev Log: isolate the IT launcher POM to make it easier to use. Modified: maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml Modified: maven/components

svn commit: r725365 - in /maven/components/branches/maven-2.1.x: ./ build.xml maven-integration-tests/pom.xml maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolat

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 10:27:35 2008 New Revision: 725365 URL: http://svn.apache.org/viewvc?rev=725365&view=rev Log: merge -c 725359 -c 725349 -c 725342 -c 725330 -c 725329 from 2.0.10-RC branch to fix IT builds on CI systems. Modified: maven/components/branches/maven-2.1.x/ (pro

svn commit: r725363 - in /maven/components/branches/maven-2.0.x: ./ build.xml maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 10:20:40 2008 New Revision: 725363 URL: http://svn.apache.org/viewvc?rev=725363&view=rev Log: merge -c 725359 -c 725349 -c 725342 -c 725330 -c 725329 from 2.0.10-RC branch to fix IT builds on CI systems. Modified: maven/components/branches/maven-2.0.x/ (pro

svn commit: r725359 - /maven/components/branches/maven-2.0.10-RC/build.xml

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 09:48:14 2008 New Revision: 725359 URL: http://svn.apache.org/viewvc?rev=725359&view=rev Log: o Made sure the bootstrap picks up the right Maven distro (it apparently doesn't matter which mvn script you call, if M2_HOME it set, that's the one it goes for) Modif

svn commit: r725349 - /maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 09:25:39 2008 New Revision: 725349 URL: http://svn.apache.org/viewvc?rev=725349&view=rev Log: o Fixed POM version (we need to reference an existing parent or Maven bails out) Modified: maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml

svn commit: r725342 - /maven/components/branches/maven-2.0.10-RC/build.xml

2008-12-10 Thread bentmann
Author: bentmann Date: Wed Dec 10 09:07:57 2008 New Revision: 725342 URL: http://svn.apache.org/viewvc?rev=725342&view=rev Log: o Made sure we fail early when the preps didn't work Modified: maven/components/branches/maven-2.0.10-RC/build.xml Modified: maven/components/branches/maven-2.0.10-

svn commit: r725338 - /maven/components/branches/maven-2.0.10-RC/build.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 08:56:29 2008 New Revision: 725338 URL: http://svn.apache.org/viewvc?rev=725338&view=rev Log: adding diagnostic maven execution to the unix IT target for debugging on the grid. Modified: maven/components/branches/maven-2.0.10-RC/build.xml Modified: maven/com

svn commit: r725333 - /maven/components/branches/maven-2.0.10-RC/build.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 08:49:41 2008 New Revision: 725333 URL: http://svn.apache.org/viewvc?rev=725333&view=rev Log: adding diagnostic maven execution to the unix IT target for debugging on the grid. Modified: maven/components/branches/maven-2.0.10-RC/build.xml Modified: maven/com

svn commit: r725330 - /maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 08:42:22 2008 New Revision: 725330 URL: http://svn.apache.org/viewvc?rev=725330&view=rev Log: rename the integration-tests POM after the branch, since this isn't a module and really doesn't need to be separate for each release from a branch. It's mainly useful fo

svn commit: r725329 - /maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xml

2008-12-10 Thread jdcasey
Author: jdcasey Date: Wed Dec 10 08:36:46 2008 New Revision: 725329 URL: http://svn.apache.org/viewvc?rev=725329&view=rev Log: Adding working directory since scm:update doesn't appear to use checkoutDirectory. Modified: maven/components/branches/maven-2.0.10-RC/maven-integration-tests/pom.xm

svn commit: r725037 - in /maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury: MavenDependencyProcessor.java MavenDomainModel.java MavenDomainModelFactory.java

2008-12-10 Thread hboutemy
Author: hboutemy Date: Wed Dec 10 01:08:18 2008 New Revision: 725037 URL: http://svn.apache.org/viewvc?rev=725037&view=rev Log: added license headers Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java maven/components/trun

svn commit: r725035 - in /maven/components/trunk/maven-mercury: ./ src/main/java/org/apache/maven/mercury/

2008-12-10 Thread hboutemy
Author: hboutemy Date: Wed Dec 10 01:06:40 2008 New Revision: 725035 URL: http://svn.apache.org/viewvc?rev=725035&view=rev Log: applied our coding conventions (no code change) Modified: maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-mercury/src/main/java/org/ap