svn commit: r768721 - in /maven/components/branches/MNG-2766: ./ maven-compat/src/main/java/org/apache/maven/artifact/manager/ maven-compat/src/main/java/org/apache/maven/artifact/resolver/ maven-comp

Author: jvanzyl Date: Sun Apr 26 16:34:19 2009 New Revision: 768721 URL: http://svn.apache.org/viewvc?rev=768721view=rev Log: o the component discovery is not exposed outside the plexus core Modified:

svn commit: r768722 - /maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

Author: jvanzyl Date: Sun Apr 26 16:39:27 2009 New Revision: 768722 URL: http://svn.apache.org/viewvc?rev=768722view=rev Log: o get rid of debug output Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

svn commit: r768724 - /maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java

Author: jvanzyl Date: Sun Apr 26 16:41:46 2009 New Revision: 768724 URL: http://svn.apache.org/viewvc?rev=768724view=rev Log: o remove debug output Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java

svn commit: r768733 - in /maven/components/branches/MNG-2766/maven-core/src/test: java/org/apache/maven/plugin/ projects/lifecycle-executor/project-with-additional-lifecycle-elements/ projects/lifecyc

Author: jvanzyl Date: Sun Apr 26 17:57:04 2009 New Revision: 768733 URL: http://svn.apache.org/viewvc?rev=768733view=rev Log: o resetting plexus version, will turn them into integration tests now Modified:

svn commit: r768751 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/pom.xml maven-toolchain/src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 19:28:46 2009 New Revision: 768751 URL: http://svn.apache.org/viewvc?rev=768751view=rev Log: fixed typos Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml

svn commit: r768752 - in /maven/components/trunk: apache-maven/pom.xml maven-core/pom.xml maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java maven-mercury/ maven-repos

Author: jvanzyl Date: Sun Apr 26 19:30:15 2009 New Revision: 768752 URL: http://svn.apache.org/viewvc?rev=768752view=rev Log: o mercury will be pursued entirely on a branch Removed: maven/components/trunk/maven-mercury/ maven/components/trunk/maven-repository-mercury/ Modified:

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

Author: jvanzyl Date: Sun Apr 26 19:31:02 2009 New Revision: 768753 URL: http://svn.apache.org/viewvc?rev=768753view=rev Log: o remove mercury modules from the parent pom Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL:

svn commit: r768754 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/pom.xml maven-toolchain/src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 19:31:06 2009 New Revision: 768754 URL: http://svn.apache.org/viewvc?rev=768754view=rev Log: fixed typos (merged from 2.1.x branch r768751) Modified: maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml

svn commit: r768755 - /maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 19:31:44 2009 New Revision: 768755 URL: http://svn.apache.org/viewvc?rev=768755view=rev Log: fixed typos (merged from 2.1.x branch r768751) Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml Modified:

svn commit: r768756 - /maven/mercury/trunk/mercury-core/

Author: hboutemy Date: Sun Apr 26 19:44:31 2009 New Revision: 768756 URL: http://svn.apache.org/viewvc?rev=768756view=rev Log: updated svn:ignore Modified: maven/mercury/trunk/mercury-core/ (props changed) Propchange: maven/mercury/trunk/mercury-core/

svn commit: r768762 - in /maven/components/branches/maven-2.1.x/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 20:00:39 2009 New Revision: 768762 URL: http://svn.apache.org/viewvc?rev=768762view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo Added: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo (props changed)

svn commit: r768763 - in /maven/components/branches/maven-2.2.x/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 20:01:42 2009 New Revision: 768763 URL: http://svn.apache.org/viewvc?rev=768763view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo (merged from 2.1.x branch r768762) Added:

svn commit: r768764 - in /maven/components/trunk/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml

Author: hboutemy Date: Sun Apr 26 20:03:30 2009 New Revision: 768764 URL: http://svn.apache.org/viewvc?rev=768764view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo (merged from 2.1.x branch r768762) Added: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo

svn commit: r768770 - in /maven/components/trunk/apache-maven/src: .cd/ main/assembly/bin.xml

Author: jvanzyl Date: Sun Apr 26 20:32:43 2009 New Revision: 768770 URL: http://svn.apache.org/viewvc?rev=768770view=rev Log: o git rid of .cd directory, auto provisioning is a feature not discussed Removed: maven/components/trunk/apache-maven/src/.cd/ Modified:

svn commit: r768778 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/src/main/mdo/ maven-repository-metadata/src/site/apt/ maven-toolchain/src/main/mdo/ maven-toolchain/src/site/

Author: hboutemy Date: Sun Apr 26 20:49:59 2009 New Revision: 768778 URL: http://svn.apache.org/viewvc?rev=768778view=rev Log: added links to model documentation Added: maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/

svn commit: r768779 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/src/main/mdo/ maven-repository-metadata/src/site/apt/ maven-toolchain/src/main/mdo/ maven-toolchain/src/site/

Author: hboutemy Date: Sun Apr 26 20:51:58 2009 New Revision: 768779 URL: http://svn.apache.org/viewvc?rev=768779view=rev Log: added links to model documentation (merged from 2.1.x branch r768778) Added: maven/components/branches/maven-2.2.x/maven-repository-metadata/src/site/apt/ -

svn commit: r768784 - in /maven/components/trunk/maven-toolchain/src: main/mdo/toolchains.mdo site/apt/ site/apt/index.apt

Author: hboutemy Date: Sun Apr 26 20:56:38 2009 New Revision: 768784 URL: http://svn.apache.org/viewvc?rev=768784view=rev Log: added links to model documentation (merged from 2.1.x branch r768778) Added: maven/components/trunk/maven-toolchain/src/site/apt/ - copied from r768778,

svn commit: r768796 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/src/main/mdo/metadata.mdo maven-toolchain/src/main/mdo/toolchains.mdo

Author: hboutemy Date: Sun Apr 26 21:17:48 2009 New Revision: 768796 URL: http://svn.apache.org/viewvc?rev=768796view=rev Log: fixed a typo Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo

svn commit: r768797 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/src/main/mdo/metadata.mdo maven-toolchain/src/main/mdo/toolchains.mdo

Author: hboutemy Date: Sun Apr 26 21:19:07 2009 New Revision: 768797 URL: http://svn.apache.org/viewvc?rev=768797view=rev Log: fixed a typo (merged from 2.1.x branch r768796) Modified: maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo

svn commit: r768798 - /maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo

Author: hboutemy Date: Sun Apr 26 21:20:36 2009 New Revision: 768798 URL: http://svn.apache.org/viewvc?rev=768798view=rev Log: fixed a typo (merged from 2.1.x branch r768796) Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo (contents, props changed) Modified:

svn commit: r768800 - /maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo

Author: hboutemy Date: Sun Apr 26 21:22:37 2009 New Revision: 768800 URL: http://svn.apache.org/viewvc?rev=768800view=rev Log: fixed one more typo :( Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo Modified:

svn commit: r768801 - /maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo

Author: hboutemy Date: Sun Apr 26 21:23:43 2009 New Revision: 768801 URL: http://svn.apache.org/viewvc?rev=768801view=rev Log: fixed one more typo :( (merged from 2.1.x branch r768800) Modified: maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo

svn commit: r768812 - in /maven/sandbox/trunk/plugins/maven-jarsigner-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/jav

Author: bentmann Date: Sun Apr 26 22:16:23 2009 New Revision: 768812 URL: http://svn.apache.org/viewvc?rev=768812view=rev Log: [MSANDBOX-46] Import maven-jarsigner-plugin Submitted by: Christian Schulte (via MJAVADOC-228) Added: maven/sandbox/trunk/plugins/maven-jarsigner-plugin/ (with

svn commit: r768813 - in /maven/components/trunk: bs build-mercury.xml maven-core/pom.xml maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java mercury-ant-tasks-1.0-alpha-6-

Author: jvanzyl Date: Sun Apr 26 22:18:28 2009 New Revision: 768813 URL: http://svn.apache.org/viewvc?rev=768813view=rev Log: o remove the plugin manager that required mercury and i'll use the repository system inside maven for new, keep more of the features that creeped in out o try and remove

svn commit: r768817 - /maven/components/branches/maven-2.1.x/build.xml

Author: bentmann Date: Sun Apr 26 22:28:48 2009 New Revision: 768817 URL: http://svn.apache.org/viewvc?rev=768817view=rev Log: o Updated bootstrap due to r768762 Modified: maven/components/branches/maven-2.1.x/build.xml Modified: maven/components/branches/maven-2.1.x/build.xml URL:

svn commit: r768818 - /maven/components/branches/maven-2.2.x/build.xml

Author: bentmann Date: Sun Apr 26 22:33:25 2009 New Revision: 768818 URL: http://svn.apache.org/viewvc?rev=768818view=rev Log: o Updated bootstrap due to r768763 Modified: maven/components/branches/maven-2.2.x/build.xml Modified: maven/components/branches/maven-2.2.x/build.xml URL:

svn commit: r768820 - in /maven/components/trunk: maven-core/ maven-core/src/main/java/org/apache/maven/plugin/ maven-embedder/src/main/java/org/apache/maven/embedder/

Author: jvanzyl Date: Sun Apr 26 22:41:53 2009 New Revision: 768820 URL: http://svn.apache.org/viewvc?rev=768820view=rev Log: o jxpath is not needed except for testing in my branch which i will merge shortly Modified: maven/components/trunk/maven-core/pom.xml

svn commit: r768821 - /maven/components/branches/maven-2.2.x/

Author: bentmann Date: Sun Apr 26 22:45:34 2009 New Revision: 768821 URL: http://svn.apache.org/viewvc?rev=768821view=rev Log: o Added merge info Modified: maven/components/branches/maven-2.2.x/ (props changed) Propchange: maven/components/branches/maven-2.2.x/

svn commit: r768823 - in /maven/components/trunk: ./ build.xml

Author: bentmann Date: Sun Apr 26 22:47:12 2009 New Revision: 768823 URL: http://svn.apache.org/viewvc?rev=768823view=rev Log: o Updated bootstrap due to r768764 Modified: maven/components/trunk/ (props changed) maven/components/trunk/build.xml Propchange: maven/components/trunk/

svn commit: r768832 - in /maven/components/branches/MNG-2766: ./ maven-compat/src/main/java/org/apache/maven/artifact/manager/ maven-core/src/test/java/org/apache/maven/lifecycle/ maven-core/src/test/

Author: jvanzyl Date: Sun Apr 26 23:51:09 2009 New Revision: 768832 URL: http://svn.apache.org/viewvc?rev=768832view=rev Log: o more meshing of trunk and my branch, two tests that are out of sync Removed: maven/components/branches/MNG-2766/bs

svn commit: r768839 - in /maven/components: branches/MNG-2766/ branches/MNG-2766/apache-maven/ branches/MNG-2766/apache-maven/src/.cd/ branches/MNG-2766/apache-maven/src/main/assembly/ branches/MNG-27

Author: jvanzyl Date: Mon Apr 27 00:16:42 2009 New Revision: 768839 URL: http://svn.apache.org/viewvc?rev=768839view=rev Log: (empty) Added: maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/ - copied from

svn commit: r768842 - in /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven: model/ model/interpolator/ model/processors/ profiles/ profiles/matchers/

Author: jvanzyl Date: Mon Apr 27 00:43:53 2009 New Revision: 768842 URL: http://svn.apache.org/viewvc?rev=768842view=rev Log: o trying to merge manually Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (props changed)