You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/04/24 21:11:50 UTC
svn commit: r768398 [1/2] - in
/maven/components/branches/maven-3.0.x-mercury: ./ apache-maven/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/project/
maven-compat/src/main/java/org/apache/maven/proje...
Author: ogusakov
Date: Fri Apr 24 19:11:48 2009
New Revision: 768398
URL: http://svn.apache.org/viewvc?rev=768398&view=rev
Log:
merge -r 767742:768388 https://svn.apache.org/repos/asf/maven/components/trunk
Added:
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/
- copied from r768388, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
- copied unchanged from r768388, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/
- copied from r768388, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml
- copied unchanged from r768388, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml
Modified:
maven/components/branches/maven-3.0.x-mercury/ (props changed)
maven/components/branches/maven-3.0.x-mercury/apache-maven/ (props changed)
maven/components/branches/maven-3.0.x-mercury/build-mercury.xml
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/inheritance/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/mdo/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (contents, props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (contents, props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (contents, props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/mdo/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/resources/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java (props changed)
Propchange: maven/components/branches/maven-3.0.x-mercury/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,3 +4,4 @@
/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:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,3 +4,4 @@
/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/apache-maven:767743-768388
Modified: maven/components/branches/maven-3.0.x-mercury/build-mercury.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/build-mercury.xml?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/build-mercury.xml (original)
+++ maven/components/branches/maven-3.0.x-mercury/build-mercury.xml Fri Apr 24 19:11:48 2009
@@ -301,8 +301,9 @@
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
- <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
- <arg value="-Dsurefire.useFile=${surefire.useFile}"/>
+
+ <jvmarg value="-Dmaven.repo.local=${maven.repo.local}"/>
+ <jvmarg value="-Dsurefire.useFile=${surefire.useFile}"/>
<!--
<debug-the-bootstrap>
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 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:767743-768388
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:767743-768388
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:767743-768388
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:767743-768388
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972
+/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:767743-768388
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Fri Apr 24 19:11:48 2009
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
import org.apache.maven.model.DomainModel;
+import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.InterpolatorProperty;
@@ -68,7 +70,7 @@
List<InterpolatorProperty> interpolatorProperties = createInterpolatorProperties(system, user);
- List<DomainModel> domainModels = new ArrayList<DomainModel>();
+ List<PomClassicDomainModel> domainModels = new ArrayList<PomClassicDomainModel>();
try
{
// MavenDomainModel superPom =
@@ -93,7 +95,7 @@
domainModels.add( new MavenDomainModel( transformProfiles( mc.getProperties() ) ) );
}
*/
- List<DomainModel> parentModels = getParentsOfDomainModel( domainModel, mdReader );
+ List<PomClassicDomainModel> parentModels = getParentsOfDomainModel( domainModel, mdReader );
if ( parentModels == null )
{
@@ -107,11 +109,19 @@
throw new MetadataReaderException( "Failed to create domain model. Message = " + e.getMessage(), e );
}
+ List<DomainModel> iModels = new ArrayList<DomainModel>();
+
+
try {
- return new MavenDomainModel(new DefaultInterpolator().interpolateDomainModel(ProcessorContext.build(domainModels, null),
- interpolatorProperties)).getDependencyMetadata();
+ for(PomClassicDomainModel m : domainModels)
+ {
+ iModels.add(new DefaultInterpolator().interpolateDomainModel(m, interpolatorProperties));
+ }
+ iModels.get(0).setMostSpecialized(true);
+
+ return new MavenDomainModel(ProcessorContext.build(iModels, null)).getDependencyMetadata();
} catch (IOException e) {
- throw new DependencyProcessorException();
+ throw new DependencyProcessorException(e);
}
}
@@ -135,10 +145,10 @@
return interpolatorProperties;
}
- protected final List<DomainModel> getParentsOfDomainModel( MavenDomainModel domainModel, MetadataReader mdReader )
+ protected final List<PomClassicDomainModel> getParentsOfDomainModel( MavenDomainModel domainModel, MetadataReader mdReader )
throws IOException, MetadataReaderException, DependencyProcessorException
{
- List<DomainModel> domainModels = new ArrayList<DomainModel>();
+ List<PomClassicDomainModel> domainModels = new ArrayList<PomClassicDomainModel>();
if ( domainModel.hasParent() )
{
byte[] b = mdReader.readMetadata( domainModel.getParentMetadata() );
Modified: maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java Fri Apr 24 19:11:48 2009
@@ -69,7 +69,7 @@
metadata.setArtifactId(d.getArtifactId());
metadata.setClassifier(d.getClassifier());
metadata.setGroupId(d.getGroupId());
- metadata.setScope( (d.getScope() == null) ? "runtime" : d.getScope());
+ metadata.setScope( (d.getScope() == null) ? "compile" : d.getScope());
metadata.setVersion(d.getVersion());
metadata.setOptional(d.isOptional());
Modified: maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java Fri Apr 24 19:11:48 2009
@@ -1,16 +1,18 @@
package org.apache.maven.mercury;
-
+
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
+
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-
+
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.metadata.DependencyBuilder;
import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
import org.apache.maven.mercury.repository.api.MetadataResults;
@@ -23,7 +25,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
+
/**
*
*
@@ -34,25 +36,25 @@
public class MavenDependencyProcessorTest
{
LocalRepositoryM2 _localRepo;
-
+
RemoteRepositoryM2 _remoteRepo;
-
+
File _localRepoFile;
-
+
static final String _remoteRepoDir = "./target/test-classes/repo";
-
+
File _remoteRepoFile;
-
- static final String _remoteRepoUrlPrefix = "http://localhost:";
-
- static final String _remoteRepoUrlSufix = "/maven2";
-
+
+ static String _remoteRepoUrlPrefix = "http://localhost:";
+
+ static String _remoteRepoUrlSufix = "/maven2";
+
// HttpTestServer _jetty;
-
+
int _port;
-
+
DependencyBuilder _depBuilder;
-
+
/**
* @throws java.lang.Exception
*/
@@ -61,30 +63,35 @@
throws Exception
{
MavenDependencyProcessor dp = new MavenDependencyProcessor();
-
+
_localRepoFile = File.createTempFile( "maven-mercury-", "-test-repo" );
FileUtil.delete( _localRepoFile );
_localRepoFile.mkdirs();
_localRepoFile.deleteOnExit();
_localRepo = new LocalRepositoryM2( "localRepo", _localRepoFile, dp );
-
+
_remoteRepoFile = new File( _remoteRepoDir );
// _jetty = new HttpTestServer( _remoteRepoFile, _remoteRepoUrlSufix );
// FIXME 2009-02-12 Oleg: disabling not to mess with jetty server. Will move to Mercury ITs
// _jetty.start();
// _port = _jetty.getPort();
-
+
+// Server server = new Server( "testRemote", new URL(_remoteRepoUrlPrefix + _port + _remoteRepoUrlSufix) );
+
+ _remoteRepoUrlPrefix = "http://repo2.maven.org:";
+ _port = 80;
+ _remoteRepoUrlSufix = "/maven2";
Server server = new Server( "testRemote", new URL(_remoteRepoUrlPrefix + _port + _remoteRepoUrlSufix) );
_remoteRepo = new RemoteRepositoryM2( server, dp );
-
+
ArrayList<Repository> repos = new ArrayList<Repository>(2);
-
+
repos.add( _localRepo );
repos.add( _remoteRepo );
-
+
_depBuilder = DependencyBuilderFactory.create( DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos, null, null, null );
}
-
+
/**
* @throws java.lang.Exception
*/
@@ -101,47 +108,120 @@
// System.out.println( "Jetty on :" + _port + " destroyed\n<========\n\n" );
// }
}
-
+
@Test
public void testDummy()
throws Exception
{
-
+
}
-
+
/**
* Test method for {@link org.apache.maven.mercury.MavenDependencyProcessor#getDependencies(org.apache.maven.mercury.artifact.ArtifactMetadata, org.apache.maven.mercury.builder.api.MetadataReader, java.util.Map, java.util.Map)}.
*/
+ @Test
public void testMavenVersion()
throws Exception
{
RepositoryReader rr = _remoteRepo.getReader();
+
+// String gav = "org.apache.maven.plugins:maven-dependency-plugin:2.0";
+ String gav = "asm:asm-xml:3.0";
+
+ ArtifactMetadata bmd = new ArtifactMetadata( gav );
+ ArrayList<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>(1);
+ query.add( bmd );
+
+ MetadataResults res = rr.readDependencies( query );
+
+ assertNotNull( res );
+
+ assertFalse( res.hasExceptions() );
+
+ assertTrue( res.hasResults() );
+
+ List<ArtifactMetadata> deps = res.getResult( bmd );
+
+ assertNotNull( deps );
+
+ assertFalse( deps.isEmpty() );
+
+ ArtifactMetadata md = deps.get(0);
+
+ System.out.println("found "+gav+" dependencies: "+deps);
- String gav = "org.apache.maven.plugins:maven-dependency-plugin:2.0";
+ assertEquals( "3.0", md.getVersion() );
+ assertEquals( ArtifactScopeEnum.compile, md.getArtifactScope() );
+ }
+ @Test
+ public void testForNPE()
+ throws Exception
+ {
+ RepositoryReader rr = _remoteRepo.getReader();
+
+ String gav = "org.codehaus.plexus:plexus-compiler-api:1.5.3::jar";
+
ArtifactMetadata bmd = new ArtifactMetadata( gav );
ArrayList<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>(1);
query.add( bmd );
-
+
MetadataResults res = rr.readDependencies( query );
-
+
assertNotNull( res );
-
+
assertFalse( res.hasExceptions() );
-
+
assertTrue( res.hasResults() );
-
+
List<ArtifactMetadata> deps = res.getResult( bmd );
-
+
assertNotNull( deps );
+
+ assertFalse( deps.isEmpty() );
+ ArtifactMetadata md = deps.get(0);
+
+ System.out.println("found "+gav+" dependencies: "+deps);
+ }
+
+ @Test
+ public void testForCompileScope()
+ throws Exception
+ {
+ RepositoryReader rr = _remoteRepo.getReader();
+
+ String gav = "org.codehaus.plexus:plexus-container-default:1.0-alpha-9";
+
+ ArtifactMetadata bmd = new ArtifactMetadata( gav );
+ ArrayList<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>(1);
+ query.add( bmd );
+
+ MetadataResults res = rr.readDependencies( query );
+
+ assertNotNull( res );
+
+ assertFalse( res.hasExceptions() );
+
+ assertTrue( res.hasResults() );
+
+ List<ArtifactMetadata> deps = res.getResult( bmd );
+
+ assertNotNull( deps );
+
assertFalse( deps.isEmpty() );
- System.out.println(deps);
+ System.out.println("found "+gav+" dependencies: "+deps);
for( ArtifactMetadata md : deps )
- if( "${maven.version}".equals( md.getVersion() ) )
- fail( "dependency has unresolved variable: "+md.toString() );
+ {
+ System.out.println( " "+md.toScopedString() );
+
+ // junit has explicit "compile" scope, although it's parent defines it as "test" - see below
+ // http://repo2.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+ if( "junit".equals( md.getArtifactId() ) )
+ assertEquals( ArtifactScopeEnum.compile, md.getArtifactScope() );
+ }
}
-
-}
+
+}
\ No newline at end of file
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder:738757-738972
+/maven/components/trunk/maven-model-builder:767743-768388
/maven/components/trunk/maven-project-builder:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java:767743-768388
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java:767743-768388
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java:767743-768388
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java:767743-768388
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors:767743-768388
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java Fri Apr 24 19:11:48 2009
@@ -167,10 +167,7 @@
targetDependency.setGroupId( source.getGroupId() );
}
- if (isMatch(source.getScope(), targetDependency.getScope(), isDependencyManagement) )
- {
- targetDependency.setScope( source.getScope() );
- }
+ targetDependency.setScope( source.getScope() );
if ( isMatch(source.getSystemPath(), targetDependency.getSystemPath(), isDependencyManagement) )
{
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java Fri Apr 24 19:11:48 2009
@@ -50,7 +50,7 @@
copy( p.getDistributionManagement(), t.getDistributionManagement(), false, c.getArtifactId(), p );
}
copy( c.getDistributionManagement(), t.getDistributionManagement(), isChildMostSpecialized,
- c.getArtifactId(), p );
+ c.getArtifactId(), c );
}
else if ( p != null && p.getDistributionManagement() != null )
{
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java Fri Apr 24 19:11:48 2009
@@ -146,8 +146,8 @@
if(deps.size() > 0)
{
- //t.setDependencies(deps);
- t.getDependencies().addAll( deps );
+ t.setDependencies(deps);
+ // t.getDependencies().addAll( deps );
}
//Dependency Management
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:739385,741841,747468
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/matchers:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers:767743-768388
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -3,3 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/mdo:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -3,4 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/resources:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/resources:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972
+/maven/components/trunk/maven-model-builder/src/main/resources:767743-768388
/maven/components/trunk/maven-project/src/main/resources:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri Apr 24 19:11:48 2009
@@ -544,7 +544,7 @@
{
for ( String s : (List<String>) validationResult.getMessages() )
{
- logger.info( s );
+ logger.error( s );
}
throw new InvalidProjectModelException( projectId, "Failed to validate POM", pomFile, validationResult );
}
Modified: maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Fri Apr 24 19:11:48 2009
@@ -209,13 +209,15 @@
}
}
- project = null;
+ throw new ArtifactMetadataRetrievalException(
+ "Cannot validate pom " + e.getMessage(), e );
}
catch ( ProjectBuildingException e )
{
handleInvalidOrMissingMavenPOM( artifact, e );
- project = null;
+ throw new ArtifactMetadataRetrievalException(
+ "Cannot build project: " + e.getMessage(), e );
}