You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/23 01:04:18 UTC
svn commit: r767707 [1/6] - in /maven/components/branches/MNG-2766: ./
apache-maven/ maven-compat/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/manager/
maven-compat/src/main/java/org/apache...
Author: jvanzyl
Date: Wed Apr 22 23:04:06 2009
New Revision: 767707
URL: http://svn.apache.org/viewvc?rev=767707&view=rev
Log:
o pull from trunky dunk dunk
Added:
maven/components/branches/MNG-2766/README.bootstrap.mercury.txt
- copied unchanged from r767358, maven/components/trunk/README.bootstrap.mercury.txt
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/
- copied from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/
- copied from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/
- copied from r767358, maven/components/trunk/maven-core/src/test/resources-settings/
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/repositories/
- copied from r767358, maven/components/trunk/maven-core/src/test/resources-settings/repositories/
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/repositories/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/repositories/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/repositories/settings.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/repositories/settings.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/settings-no-pom/
- copied from r767358, maven/components/trunk/maven-core/src/test/resources-settings/settings-no-pom/
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/settings-no-pom/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/settings-no-pom/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/
- copied from r767358, maven/components/trunk/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml
- copied unchanged from r767358, maven/components/trunk/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/project/
- copied from r767358, maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/project/builder/
- copied from r767358, maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/
maven/components/branches/MNG-2766/maven-model-builder/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/
maven/components/branches/MNG-2766/maven-model-builder/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/pom.xml
maven/components/branches/MNG-2766/maven-model-builder/src/
- copied from r767358, maven/components/trunk/maven-model-builder/src/
maven/components/branches/MNG-2766/maven-model-builder/src/main/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/PomInterpolatorTag.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/PomInterpolatorTag.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/mdo/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/mdo/
maven/components/branches/MNG-2766/maven-model-builder/src/main/mdo/profiles.mdo
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/mdo/profiles.mdo
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/ (props changed)
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/resources/
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/org/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/resources/org/
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/org/apache/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/resources/org/apache/
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/org/apache/maven/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/org/apache/maven/project/
- copied from r767358, maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/project/
maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
maven/components/branches/MNG-2766/maven-model-builder/src/test/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/projects/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/enforcer-api/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/enforcer-api/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/enforcer-api/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/enforcer-api/pom.xml
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/enforcer-rules/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/enforcer-rules/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/enforcer-rules/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/enforcer-rules/pom.xml
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/maven-enforcer-plugin/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/maven-enforcer-plugin/
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/maven-enforcer-plugin/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/maven-enforcer-plugin/pom.xml
maven/components/branches/MNG-2766/maven-model-builder/src/test/projects/enforcer/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/test/projects/enforcer/pom.xml
maven/components/branches/MNG-2766/maven-model-builder/src/test/resources/
- copied from r767358, maven/components/trunk/maven-model-builder/src/test/resources/
maven/components/branches/MNG-2766/maven-model-builder/src/test/resources/test.txt
- copied unchanged from r767358, maven/components/trunk/maven-model-builder/src/test/resources/test.txt
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/profiles/matchers/
- copied from r767358, maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/baseurl-interpolation/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/baseurl-interpolation/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/boolean-interpolation/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/boolean-interpolation/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/build-extension-inheritance/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/build-extension-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/w-parent/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/w-parent/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/wo-parent/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/wo-parent/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-inheritance/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/distribution-management/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/distribution-management/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/distribution-management/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/distribution-management/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/empty-scm/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/empty-scm/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/empty-scm/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/empty-scm/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/jdk-activation/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/jdk-activation/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/jdk-activation/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/jdk-activation/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-management-inheritance/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/pom-inheritance/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/pom-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/pom-inheritance/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/pom-inheritance/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-default-deactivation/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-injection-order/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-injection-order/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugins/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-inheritance/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-inheritance/sub/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-no-duplication/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-no-duplication/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/repo-inheritance/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/repo-inheritance/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/reporting-plugin-config/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/reporting-plugin-config/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/unc-path/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/unc-path/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/unc-path/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/unc-path/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/unc-path/sub/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/unc-path/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-append/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-append/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-append/child/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-append/child/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-append/child/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-append/child/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-append/parent/
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-append/parent/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-append/parent/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-append/parent/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-no-decoding/ (props changed)
- copied from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-no-decoding/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml
- copied unchanged from r767358, maven/components/trunk/maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
- copied unchanged from r767358, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
- copied unchanged from r767358, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
- copied unchanged from r767358, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
- copied unchanged from r767358, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
- copied unchanged from r767358, maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
- copied unchanged from r767358, maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
- copied unchanged from r767358, maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
Removed:
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModelFactory.java
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
maven/components/branches/MNG-2766/maven-project-builder/
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/profiles/
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/processor/
maven/components/branches/MNG-2766/maven-project/src/main/mdo/
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/processor/
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/
Modified:
maven/components/branches/MNG-2766/ (props changed)
maven/components/branches/MNG-2766/README.bootstrap.txt
maven/components/branches/MNG-2766/apache-maven/ (props changed)
maven/components/branches/MNG-2766/apache-maven/pom.xml
maven/components/branches/MNG-2766/build-mercury.xml
maven/components/branches/MNG-2766/build.xml
maven/components/branches/MNG-2766/maven-compat/pom.xml
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ (props changed)
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (props changed)
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/ (props changed)
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
maven/components/branches/MNG-2766/maven-compat/src/main/mdo/ (props changed)
maven/components/branches/MNG-2766/maven-compat/src/test/ (props changed)
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/MNG-2766/maven-core/pom.xml
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/ (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (contents, props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (props changed)
maven/components/branches/MNG-2766/maven-core/src/main/mdo/settings.mdo
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
maven/components/branches/MNG-2766/maven-embedder/pom.xml
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java (props changed)
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/branches/MNG-2766/maven-mercury/pom.xml
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/branches/MNG-2766/maven-model/pom.xml
maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo
maven/components/branches/MNG-2766/maven-plugin-api/pom.xml
maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
maven/components/branches/MNG-2766/maven-project/pom.xml
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/micromailer/pom.xml (contents, props changed)
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml (contents, props changed)
maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/profile-properties-interpolation/pom.xml (contents, props changed)
maven/components/branches/MNG-2766/maven-repository-mercury/pom.xml
maven/components/branches/MNG-2766/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryAdaptor.java
maven/components/branches/MNG-2766/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java (contents, props changed)
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
maven/components/branches/MNG-2766/maven-repository/pom.xml
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java (props changed)
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (props changed)
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (contents, props changed)
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java (props changed)
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (contents, props changed)
maven/components/branches/MNG-2766/maven-toolchain/pom.xml
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
maven/components/branches/MNG-2766/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
maven/components/branches/MNG-2766/pom.xml
Propchange: maven/components/branches/MNG-2766/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 22 23:04:06 2009
@@ -10,3 +10,5 @@
*.ipr
log.txt
dependencies.xml
+.git
+.gitignore
Propchange: maven/components/branches/MNG-2766/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -1,7 +1,7 @@
/maven/components/branches/MNG-3932-1:746145-746157
/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
-/maven/components/branches/maven-2.1.x:739385,741841,747468,748815,749612
+/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523
/maven/components/branches/sisbell-plugin-manager:738973-739966
/maven/components/sisbell-plugin-manager:738757-738972
-/maven/components/trunk:688587-696625,696644-699681
+/maven/components/trunk:751453-767358
Modified: maven/components/branches/MNG-2766/README.bootstrap.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/README.bootstrap.txt?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/README.bootstrap.txt (original)
+++ maven/components/branches/MNG-2766/README.bootstrap.txt Wed Apr 22 23:04:06 2009
@@ -8,7 +8,7 @@
First, give Ant a location into which the completed Maven distro should be installed:
- export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT
+ export M2_HOME=$HOME/apps/maven/apache-maven-3.0-SNAPSHOT
Then, run Ant:
Propchange: maven/components/branches/MNG-2766/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -1,6 +1,7 @@
/maven/components/branches/MNG-3932-1/apache-maven:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-distribution:680477
/maven/components/branches/maven-2.0.x/maven-distribution:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/apache-maven:766523
/maven/components/branches/sisbell-plugin-manager/apache-maven:738973-739966
/maven/components/sisbell-plugin-manager/apache-maven:738757-738972
-/maven/components/trunk/maven-distribution:688587-696625,696644-699681
+/maven/components/trunk/apache-maven:751453-767358
Modified: maven/components/branches/MNG-2766/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/apache-maven/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/apache-maven/pom.xml (original)
+++ maven/components/branches/MNG-2766/apache-maven/pom.xml Wed Apr 22 23:04:06 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,15 +14,20 @@
License for the specific language governing permissions and
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
+
<artifactId>apache-maven</artifactId>
+
<name>Maven Distribution</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -82,6 +88,7 @@
<version>${mercuryVersion}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -97,6 +104,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>standard</id>
Modified: maven/components/branches/MNG-2766/build-mercury.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/build-mercury.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/build-mercury.xml (original)
+++ maven/components/branches/MNG-2766/build-mercury.xml Wed Apr 22 23:04:06 2009
@@ -67,7 +67,13 @@
<property name="maven.repo.central" value="http://repository.sonatype.org/content/groups/public"/>
<!--
<property name="maven.repo.central" value="http://repo1.maven.org/maven2"/>
+ <property name="maven.repo.update.policy" value="daily"/>
+ <property name="maven.repo.update.policy" value="always"/>
-->
+ <property name="maven.repo.update.policy" value="daily"/>
+
+ <property name="maven.repo.system" value="don.t"/>
+
<condition property="do.not.clean.local.repo">
<not>
<isset property="clean.local.repo"/>
@@ -87,15 +93,61 @@
<mkdir dir="${maven.repo.local}"/>
</target>
+ <target name="flip-default-repository" unless="do.not.flip.repository">
+
+ <replace dir="${basedir}/maven-repository/src/main/java">
+ <include name="**/LegacyRepositorySystem.java"/>
+ <replacefilter token='@Component( role = RepositorySystem.class, hint = "default" )'
+ value='@Component( role = RepositorySystem.class, hint = "${legacy-hint}" )'/>
+ <replacefilter token='@Component( role = RepositorySystem.class, hint = "legacy" )'
+ value='@Component( role = RepositorySystem.class, hint = "${legacy-hint}" )'/>
+ </replace>
+
+ <replace dir="${basedir}/maven-repository-mercury/src/main/java">
+ <include name="**/MercuryRepositorySystem.java"/>
+ <replacefilter token='@Component( role = RepositorySystem.class, hint = "mercury" )'
+ value='@Component( role = RepositorySystem.class, hint = "${mercury-hint}" )'/>
+ <replacefilter token='@Component( role = RepositorySystem.class, hint = "default" )'
+ value='@Component( role = RepositorySystem.class, hint = "${mercury-hint}" )'/>
+ </replace>
+
+ <echo>maven.repo.system is ${maven.repo.system}, flip: legacy-hint=${legacy-hint}, mercury-hint=${mercury-hint}</echo>
+
+ </target>
+
+ <target name="flip-default-repository-system" description="flips repository system impl">
+
+ <condition property="legacy-hint" value="default">
+ <equals arg1="${maven.repo.system}" arg2="legacy"/>
+ </condition>
+ <condition property="mercury-hint" value="mercury">
+ <equals arg1="${maven.repo.system}" arg2="legacy"/>
+ </condition>
+
+ <condition property="legacy-hint" value="legacy">
+ <equals arg1="${maven.repo.system}" arg2="mercury"/>
+ </condition>
+ <condition property="mercury-hint" value="default">
+ <equals arg1="${maven.repo.system}" arg2="mercury"/>
+ </condition>
+
+ <condition property="do.not.flip.repository" value="default">
+ <equals arg1="${maven.repo.system}" arg2="don.t"/>
+ </condition>
+
+ <antcall target="flip-default-repository"/>
+
+ </target>
+
<target name="pull" depends="init,clean-local-repo" unless="skip.pull">
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
- <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
- <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-start-comment-->" value="<!--"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-end-comment-->" value="-->"/>
<mercury:local-repository location="${maven.repo.local}"/>
- <mercury:remote-repository id="central" location="${maven.repo.central}"/>
+ <mercury:remote-repository id="central" location="${maven.repo.central}" updatePolicy="${maven.repo.update.policy}"/>
<property name="tsFormat" value="HH:mm:ss"/>
<tstamp><format property="start.time" pattern="${tsFormat}"/></tstamp>
@@ -121,10 +173,10 @@
<property name="mc" refid="mercury.classpath"/>
<echo>mercury.classpath=${mc}</echo>
<echo>========================================================================</echo>
-<!--
--->
+<!--
<delete file="${basedir}/dependencies.xml"/>
+-->
<tstamp><format property="modello.start.time" pattern="${tsFormat}"/></tstamp>
@@ -209,14 +261,15 @@
</macrodef>
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
+ <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
- <modello file="maven-project/src/main/mdo/profiles.mdo"/>
+ <modello file="maven-model-builder/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
<modello file="maven-compat/src/main/mdo/metadata.mdo"/>
</target>
- <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
+ <target name="compile-boot" depends="generate-sources,flip-default-repository-system" description="compiles the bootstrap sources">
<path id="sources">
<dirset dir=".">
@@ -244,12 +297,22 @@
<target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<classpath refid="maven.classpath"/>
- <arg value="-e"/>
+ <arg value="-X"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
<arg value="-Dmaven.repo.local=${maven.repo.local}"/>
<arg value="-Dsurefire.useFile=${surefire.useFile}"/>
+<!--
+<debug-the-bootstrap>
+
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
+
+</debug-the-bootstrap>
+-->
</java>
</target>
Modified: maven/components/branches/MNG-2766/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/build.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/build.xml (original)
+++ maven/components/branches/MNG-2766/build.xml Wed Apr 22 23:04:06 2009
@@ -78,8 +78,8 @@
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
- <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
- <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-start-comment-->" value="<!--"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-end-comment-->" value="-->"/>
<artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
<artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
<localRepository path="${maven.repo.local}"/>
@@ -165,7 +165,7 @@
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
- <modello file="maven-project/src/main/mdo/profiles.mdo"/>
+ <modello file="maven-model-builder/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
<modello file="maven-compat/src/main/mdo/metadata.mdo"/>
Modified: maven/components/branches/MNG-2766/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-compat/pom.xml Wed Apr 22 23:04:06 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@@ -8,15 +9,20 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-compat</artifactId>
+
<name>Maven Compat</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -46,6 +52,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,3 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:751453-767358
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Wed Apr 22 23:04:06 2009
@@ -324,6 +324,11 @@
public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor, boolean force )
throws TransferFailedException, ResourceDoesNotExistException
{
+ if(remoteRepositories == null)
+ {
+ throw new IllegalArgumentException("remoteRepositories: null");
+ }
+
for ( ArtifactRepository repository : remoteRepositories )
{
try
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java Wed Apr 22 23:04:06 2009
@@ -88,4 +88,6 @@
void addAuthenticationInfo( String repositoryId, String username, String password, String privateKey, String passphrase );
+ void addProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts );
+
}
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java Wed Apr 22 23:04:06 2009
@@ -55,4 +55,9 @@
}
return matched;
}
+
+ public List<String> getPatterns()
+ {
+ return patterns;
+ }
}
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java Wed Apr 22 23:04:06 2009
@@ -39,9 +39,13 @@
private final boolean providedScope;
private final boolean systemScope;
+
+ private final String scope;
public ScopeArtifactFilter( String scope )
{
+ this.scope = scope;
+
if ( Artifact.SCOPE_COMPILE.equals( scope ) )
{
systemScope = true;
@@ -111,4 +115,9 @@
return true;
}
}
+
+ public String getScope()
+ {
+ return scope;
+ }
}
Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:751453-767358
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -1,3 +1,4 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/project/inheritance:746145-746157
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:751453-767358
Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:751453-767358
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java Wed Apr 22 23:04:06 2009
@@ -26,6 +26,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.codehaus.plexus.component.annotations.Component;
@@ -77,6 +78,13 @@
build.setTestOutputDirectory( alignToBaseDirectory( build.getTestOutputDirectory(), basedir ) );
}
+
+ Reporting reporting = model.getReporting();
+
+ if ( reporting != null )
+ {
+ reporting.setOutputDirectory( alignToBaseDirectory( reporting.getOutputDirectory(), basedir ) );
+ }
}
public String alignToBaseDirectory( String path, File basedir )
@@ -204,6 +212,13 @@
build.setTestOutputDirectory( unalignFromBaseDirectory( build.getTestOutputDirectory(), basedir ) );
}
+
+ Reporting reporting = model.getReporting();
+
+ if ( reporting != null )
+ {
+ reporting.setOutputDirectory( unalignFromBaseDirectory( reporting.getOutputDirectory(), basedir ) );
+ }
}
public String unalignFromBaseDirectory( String directory, File basedir )
Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,3 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/mdo:738757-738972
+/maven/components/trunk/maven-compat/src/main/mdo:751453-767358
Propchange: maven/components/branches/MNG-2766/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,3 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test:738757-738972
+/maven/components/trunk/maven-compat/src/test:751453-767358
Propchange: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:751453-767358
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681