svn commit: r694172 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java

Author: sisbell Date: Thu Sep 11 01:27:13 2008 New Revision: 694172 URL: http://svn.apache.org/viewvc?rev=694172view=rev Log: Dumped most of project restorer code. Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java Modified:

svn commit: r694209 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

Author: sisbell Date: Thu Sep 11 03:33:16 2008 New Revision: 694209 URL: http://svn.apache.org/viewvc?rev=694209view=rev Log: Tests related to dynamic/concrete states of pom values disabled for 3.0. Modified:

svn commit: r694255 - /maven/components/branches/maven-2.1.0-M1-RC/pom.xml

Author: brett Date: Thu Sep 11 07:00:19 2008 New Revision: 694255 URL: http://svn.apache.org/viewvc?rev=694255view=rev Log: fix SCM URL Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml URL:

svn commit: r694296 - /maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml

Author: jdcasey Date: Thu Sep 11 08:25:13 2008 New Revision: 694296 URL: http://svn.apache.org/viewvc?rev=694296view=rev Log: bumping to M2 version Modified: maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml Modified:

svn commit: r694297 - in /maven/components/branches/maven-2.1.x/maven-script: maven-script-ant/pom.xml maven-script-beanshell/pom.xml

Author: jdcasey Date: Thu Sep 11 08:26:41 2008 New Revision: 694297 URL: http://svn.apache.org/viewvc?rev=694297view=rev Log: bumping to M2 version. Modified: maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml

svn commit: r694311 - in /maven/shared/trunk/file-management/src: main/java/org/apache/maven/shared/model/fileset/util/ test/java/org/apache/maven/shared/model/fileset/util/ test/resources/testDeleteD

Author: bentmann Date: Thu Sep 11 08:40:04 2008 New Revision: 694311 URL: http://svn.apache.org/viewvc?rev=694311view=rev Log: [MSHARED-64] FileSetManager.delete() does not delete empty directories if they contained symlink that was deleted Added:

svn commit: r694312 - /maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java

Author: bentmann Date: Thu Sep 11 08:46:15 2008 New Revision: 694312 URL: http://svn.apache.org/viewvc?rev=694312view=rev Log: o Polished code Modified: maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java Modified:

svn commit: r694316 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/cli/ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/resources/ME

Author: jdcasey Date: Thu Sep 11 08:51:17 2008 New Revision: 694316 URL: http://svn.apache.org/viewvc?rev=694316view=rev Log: Merging up to RC17 code from the 2.1.0-M1-RC branch. Modified: maven/components/branches/maven-2.1.x/ (props changed)

svn commit: r694321 - /maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java

Author: bentmann Date: Thu Sep 11 08:56:47 2008 New Revision: 694321 URL: http://svn.apache.org/viewvc?rev=694321view=rev Log: o Tightened test Modified: maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java Modified:

svn commit: r694326 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

Author: jdcasey Date: Thu Sep 11 09:02:59 2008 New Revision: 694326 URL: http://svn.apache.org/viewvc?rev=694326view=rev Log: bumping upper range limit to 2.99.99 to allow 2.2 code to run these tests unless we consciously restrict them. Modified:

svn commit: r694345 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-project/src/test/java/org/apache/maven/project/ maven-project/src/test/ja

Author: jdcasey Date: Thu Sep 11 09:42:51 2008 New Revision: 694345 URL: http://svn.apache.org/viewvc?rev=694345view=rev Log: Fixing executionProject sync, merged from 688259 of 2.1.0-M1-RC branch. Modified:

svn commit: r694349 - /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java

Author: jdcasey Date: Thu Sep 11 10:03:12 2008 New Revision: 694349 URL: http://svn.apache.org/viewvc?rev=694349view=rev Log: correcting unit test for script roots, which have to stay relative for now due to a problem in the maven-plugin-tools-api that has been corrected but isn't widely used

svn commit: r694350 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java

Author: jdcasey Date: Thu Sep 11 10:04:17 2008 New Revision: 694350 URL: http://svn.apache.org/viewvc?rev=694350view=rev Log: cosmetic parameter name change Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java

svn commit: r694360 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/org/apache/maven/p

Author: sisbell Date: Thu Sep 11 10:11:34 2008 New Revision: 694360 URL: http://svn.apache.org/viewvc?rev=694360view=rev Log: Refactored out restorer class and related MavenProjectBuilder methods. Removed:

svn commit: r694365 - /maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

Author: sisbell Date: Thu Sep 11 10:14:18 2008 New Revision: 694365 URL: http://svn.apache.org/viewvc?rev=694365view=rev Log: Computer a bit laggy, caught svn ci command into component.xml. Removed this. Modified:

svn commit: r694376 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven-project/src/test/java/org/apache/maven/proje

Author: jdcasey Date: Thu Sep 11 10:40:00 2008 New Revision: 694376 URL: http://svn.apache.org/viewvc?rev=694376view=rev Log: Merging in fix for MNG-3729, for real this time. Modified: maven/components/branches/maven-2.1.x/ (props changed)

svn commit: r694394 - in /maven/plugins/trunk/maven-clean-plugin: ./ src/it/file-sets-includes-excludes/ src/it/file-sets-includes-excludes/dirs/ src/it/file-sets-includes-excludes/dirs/dir0/ src/it/f

Author: bentmann Date: Thu Sep 11 11:23:27 2008 New Revision: 694394 URL: http://svn.apache.org/viewvc?rev=694394view=rev Log: [MCLEAN-29] Maven clean plugin doesn't filter resources from exclude list Added: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-includes-excludes/

svn commit: r694437 - in /maven/plugins/trunk/maven-assembly-plugin: integration-test-archetype/src/main/resources/archetype-resources/ src/it/projects/file-sets/filtered-module-sources/ src/it/projec

Author: jdcasey Date: Thu Sep 11 12:40:30 2008 New Revision: 694437 URL: http://svn.apache.org/viewvc?rev=694437view=rev Log: [MASSEMBLY-293][MASSEMBLY-322][MASSEMBLY-340] Fixing file-set filtering. Added:

svn commit: r694443 - /maven/plugins/trunk/maven-install-plugin/pom.xml

Author: bentmann Date: Thu Sep 11 12:55:18 2008 New Revision: 694443 URL: http://svn.apache.org/viewvc?rev=694443view=rev Log: o Fixed dependency Modified: maven/plugins/trunk/maven-install-plugin/pom.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL:

svn commit: r694444 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets: multimodule-unix-lineEndings/ multimodule-unix-lineEndings/child/ multimodule-unix-lineEndings/child/src/

Author: jdcasey Date: Thu Sep 11 12:56:02 2008 New Revision: 69 URL: http://svn.apache.org/viewvc?rev=69view=rev Log: [MASSEMBLY-237] Adding integration tests to verify that the fix for MASSEMBLY-293 also fixed this issue. Added:

svn commit: r694451 - /maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java

Author: ogusakov Date: Thu Sep 11 13:11:59 2008 New Revision: 694451 URL: http://svn.apache.org/viewvc?rev=694451view=rev Log: added failing nio test Added: maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java Added:

svn commit: r694473 - /maven/enforcer/trunk/src/site/site.xml

Author: brianf Date: Thu Sep 11 13:54:46 2008 New Revision: 694473 URL: http://svn.apache.org/viewvc?rev=694473view=rev Log: fix the links because they are in the menu section from the parent now Modified: maven/enforcer/trunk/src/site/site.xml Modified:

svn commit: r694477 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java test/java/org/apache/maven/plugin/dependency/TestCopyD

Author: brianf Date: Thu Sep 11 13:59:11 2008 New Revision: 694477 URL: http://svn.apache.org/viewvc?rev=694477view=rev Log: MDEP-181 use installer to produce the repository layout. Patch from Igor Fedorenko Modified:

svn commit: r694481 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Author: hboutemy Date: Thu Sep 11 14:03:34 2008 New Revision: 694481 URL: http://svn.apache.org/viewvc?rev=694481view=rev Log: fixed typos Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties Modified:

svn commit: r694491 - /maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java

Author: bentmann Date: Thu Sep 11 14:27:57 2008 New Revision: 694491 URL: http://svn.apache.org/viewvc?rev=694491view=rev Log: o Synched style of HTTP user agent with the one used for Wagon Modified:

svn commit: r694493 - in /maven/sandbox/trunk/mercury: mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/rep

Author: ogusakov Date: Thu Sep 11 14:29:24 2008 New Revision: 694493 URL: http://svn.apache.org/viewvc?rev=694493view=rev Log: mutli-threaded local repo write works somehow, breaks if too many threads on too fast a box try to bang it. No solution yet - posted a question on dev@ list Added:

svn commit: r694498 - /maven/plugins/trunk/maven-reactor-plugin/pom.xml

Author: bentmann Date: Thu Sep 11 14:37:09 2008 New Revision: 694498 URL: http://svn.apache.org/viewvc?rev=694498view=rev Log: o Reordered POM Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml URL:

svn commit: r694503 - /maven/plugins/trunk/maven-reactor-plugin/pom.xml

Author: bentmann Date: Thu Sep 11 14:43:53 2008 New Revision: 694503 URL: http://svn.apache.org/viewvc?rev=694503view=rev Log: o Added license header o Removed inherited stuff o Added missing bits Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml Modified:

svn commit: r694499 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/parser/ doxia-core/src/test/java/org/apache/maven/doxia/parser/ doxia-modules/doxia-module-docbook-si

Author: vsiveton Date: Thu Sep 11 14:38:51 2008 New Revision: 694499 URL: http://svn.apache.org/viewvc?rev=694499view=rev Log: o revert DOXIA-251, will implement DOXIA-226 Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java

svn commit: r694504 - /maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml

Author: bentmann Date: Thu Sep 11 14:48:40 2008 New Revision: 694504 URL: http://svn.apache.org/viewvc?rev=694504view=rev Log: o Brought encoding in line with other files Modified: maven/plugins/trunk/maven-reactor-plugin/src/site/site.xml Modified:

svn commit: r694506 - in /maven/plugins/trunk/maven-reactor-plugin/src: main/java/org/apache/maven/plugin/reactor/ test/java/org/apache/maven/plugin/reactor/

Author: bentmann Date: Thu Sep 11 14:49:41 2008 New Revision: 694506 URL: http://svn.apache.org/viewvc?rev=694506view=rev Log: o Updated license headers Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java

svn propchange: r694529 - svn:log

Author: jdcasey Revision: 694529 Modified property: svn:log Modified: svn:log at Thu Sep 11 16:03:42 2008 -- --- svn:log (original) +++ svn:log Thu Sep 11 16:03:42 2008 @@ -1,5 +1,3 @@ -[MASSEMBLY-331] Fixing order of

svn commit: r694543 - /maven/shared/branches/embedder-verifier/pom.xml

Author: jvanzyl Date: Thu Sep 11 16:35:53 2008 New Revision: 694543 URL: http://svn.apache.org/viewvc?rev=694543view=rev Log: o update to 3.0-SNAPSHOT Modified: maven/shared/branches/embedder-verifier/pom.xml Modified: maven/shared/branches/embedder-verifier/pom.xml URL:

svn commit: r694544 [3/3] - /maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/

Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java URL:

svn commit: r694549 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-api/src/site/ enforcer-api/src/site/apt/ enforcer-rules/ enforcer-rules/src/site/ maven-enforcer-plugin/ maven-enforcer-plugin

Author: brianf Date: Thu Sep 11 16:55:34 2008 New Revision: 694549 URL: http://svn.apache.org/viewvc?rev=694549view=rev Log: rollback release, fix the poms and site urls Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt

svn commit: r694550 - /maven/enforcer/tags/enforcer-1.0-alpha-4/

Author: brianf Date: Thu Sep 11 16:59:37 2008 New Revision: 694550 URL: http://svn.apache.org/viewvc?rev=694550view=rev Log: rollback release Removed: maven/enforcer/tags/enforcer-1.0-alpha-4/

svn commit: r694551 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml

Author: brianf Date: Thu Sep 11 17:01:20 2008 New Revision: 694551 URL: http://svn.apache.org/viewvc?rev=694551view=rev Log: [maven-release-plugin] prepare release enforcer-1.0-alpha-4 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml

svn commit: r694552 - in /maven/enforcer/tags/enforcer-1.0-alpha-4: ./ enforcer-api/ enforcer-api/src/site/ enforcer-api/src/site/apt/ enforcer-rules/ enforcer-rules/src/site/ maven-enforcer-plugin/ m

Author: brianf Date: Thu Sep 11 17:01:30 2008 New Revision: 694552 URL: http://svn.apache.org/viewvc?rev=694552view=rev Log: [maven-release-plugin] copy for tag enforcer-1.0-alpha-4 Added: maven/enforcer/tags/enforcer-1.0-alpha-4/ - copied from r693195, maven/enforcer/trunk/

svn commit: r694553 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml

Author: brianf Date: Thu Sep 11 17:01:37 2008 New Revision: 694553 URL: http://svn.apache.org/viewvc?rev=694553view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml

svn commit: r694563 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath

Author: baerrach Date: Thu Sep 11 17:29:59 2008 New Revision: 694563 URL: http://svn.apache.org/viewvc?rev=694563view=rev Log: [MECLIPSE-486] fixing incorrect hard coded path Modified:

svn commit: r694573 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven: profiles/ profiles/injection/ project/ project/inheritance/

Author: sisbell Date: Thu Sep 11 18:14:52 2008 New Revision: 694573 URL: http://svn.apache.org/viewvc?rev=694573view=rev Log: Removed a number of uneeded clone methods. Moved others out of ModelUtils and made them private. Modified:

svn commit: r694576 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/src/main/resources/ project-myeclipse-07-MECLIPSE-445/multymodule-2/sr

Author: baerrach Date: Thu Sep 11 18:35:29 2008 New Revision: 694576 URL: http://svn.apache.org/viewvc?rev=694576view=rev Log: [MECLIPSE-486] fixing incorrectly named files Added:

svn commit: r694577 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java

Author: baerrach Date: Thu Sep 11 18:36:16 2008 New Revision: 694577 URL: http://svn.apache.org/viewvc?rev=694577view=rev Log: [MECLIPSE-486] Adding more hacks into assertFile to handle generated values. Modified:

svn commit: r694586 - /maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml

Author: brett Date: Thu Sep 11 19:28:59 2008 New Revision: 694586 URL: http://svn.apache.org/viewvc?rev=694586view=rev Log: fix parent version Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core-it-runner/pom.xml Modified:

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

Author: sisbell Date: Thu Sep 11 20:12:06 2008 New Revision: 694596 URL: http://svn.apache.org/viewvc?rev=694596view=rev Log: Removed more clone methods. Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

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

Author: sisbell Date: Thu Sep 11 20:45:45 2008 New Revision: 694598 URL: http://svn.apache.org/viewvc?rev=694598view=rev Log: Cleanup of code. Removed last of dynamic/concrete code. Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

svn commit: r694602 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/writers/ test/resources/projects/project-34

Author: baerrach Date: Thu Sep 11 21:39:45 2008 New Revision: 694602 URL: http://svn.apache.org/viewvc?rev=694602view=rev Log: Changed EclipseSourceDir so that path is always stored with / and not \s. Modified unit test to use input path containing \\ and check that the results does not contain

svn commit: r694608 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr

Author: baerrach Date: Thu Sep 11 22:47:42 2008 New Revision: 694608 URL: http://svn.apache.org/viewvc?rev=694608view=rev Log: Fixing incorrect filename .springbeans should have capital B as in .springBeans Added:

svn commit: r694610 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr

Author: baerrach Date: Thu Sep 11 22:49:28 2008 New Revision: 694610 URL: http://svn.apache.org/viewvc?rev=694610view=rev Log: Fixing incorrect filename .springbeans should have capital B as in .springBeans Added: