Author: jvanzyl Date: Mon Apr 27 00:16:42 2009 New Revision: 768839 URL: http://svn.apache.org/viewvc?rev=768839&view=rev Log: (empty)
Added: maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml maven/components/branches/MNG-2766/maven-toolchain/src/main/mdo/toolchains.mdo - copied unchanged from r768832, maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo maven/components/branches/MNG-2766/maven-toolchain/src/site/apt/ - copied from r768832, maven/components/trunk/maven-toolchain/src/site/apt/ maven/components/branches/MNG-2766/maven-toolchain/src/site/apt/index.apt - copied unchanged from r768832, maven/components/trunk/maven-toolchain/src/site/apt/index.apt Removed: maven/components/branches/MNG-2766/apache-maven/src/.cd/ maven/components/branches/MNG-2766/maven-mercury/ maven/components/branches/MNG-2766/maven-repository-mercury/ maven/components/branches/MNG-2766/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/MNG-2766/ (props changed) maven/components/branches/MNG-2766/apache-maven/ (props changed) maven/components/branches/MNG-2766/apache-maven/pom.xml maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml maven/components/branches/MNG-2766/build.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/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/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/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/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/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.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-model-builder/ (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/mdo/ (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/ (props changed) 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/artifact/MavenMetadataSource.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/resources-project-builder/dependency-scope/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/sub/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 (props changed) 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 (props changed) maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java (props changed) maven/components/branches/MNG-2766/maven-toolchain/pom.xml maven/components/branches/MNG-2766/pom.xml maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml (props changed) Propchange: maven/components/branches/MNG-2766/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 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,747683,748815,749612,766523 +/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager:738973-739966 /maven/components/sisbell-plugin-manager:738757-738972 -/maven/components/trunk:751453-767358 +/maven/components/trunk:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/apache-maven/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +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:751453-767358 +/maven/components/trunk/apache-maven:751453-767358,767708-768832 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=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/apache-maven/pom.xml (original) +++ maven/components/branches/MNG-2766/apache-maven/pom.xml Mon Apr 27 00:16:42 2009 @@ -74,19 +74,6 @@ <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> </dependency> - <!--Mercury MP3--> - <dependency> - <groupId>org.sonatype.mercury</groupId> - <artifactId>mercury-mp3-cli</artifactId> - </dependency> - <dependency> - <!-- - FIXME: org.sonatype.mercury:mercury-mp3:1.0-alpha-1:pom depends on a snapshot version of mercury-event. - --> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-event</artifactId> - <version>${mercuryVersion}</version> - </dependency> </dependencies> <build> Modified: maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml (original) +++ maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml Mon Apr 27 00:16:42 2009 @@ -60,12 +60,6 @@ <exclude>org.apache.maven.mercury:mercury-crypto-basic</exclude> </excludes> </dependencySet> - <dependencySet> - <outputDirectory>bin/.cd/bin</outputDirectory> - <includes> - <include>org.sonatype.mercury:mercury-mp3-cli</include> - </includes> - </dependencySet> </dependencySets> <fileSets> <fileSet> Modified: maven/components/branches/MNG-2766/build.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/build.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/build.xml (original) +++ maven/components/branches/MNG-2766/build.xml Mon Apr 27 00:16:42 2009 @@ -167,7 +167,7 @@ <modello file="maven-plugin-api/src/main/mdo/lifecycle.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-toolchain/src/main/mdo/toolchains.mdo"/> <modello file="maven-compat/src/main/mdo/metadata.mdo"/> </target> Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +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 +/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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-compat/src/main/java/org/apache/maven/project/ModelUtils.java:751453-767358,767708-768832 /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 Mon Apr 27 00:16:42 2009 @@ -1,4 +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 +/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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-compat/src/main/java/org/apache/maven/project/path:751453-767358,767708-768832 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-compat/src/main/mdo/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +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 +/maven/components/trunk/maven-compat/src/main/mdo:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-compat/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +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 +/maven/components/trunk/maven-compat/src/test:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/project/path/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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-compat/src/test/java/org/apache/maven/project/path:751453-767358,767708-768832 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681 Modified: maven/components/branches/MNG-2766/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/pom.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-core/pom.xml (original) +++ maven/components/branches/MNG-2766/maven-core/pom.xml Mon Apr 27 00:16:42 2009 @@ -18,11 +18,8 @@ <artifactId>maven</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>maven-core</artifactId> - <name>Maven Core</name> - <dependencies> <!-- Maven --> <dependency> @@ -75,27 +72,12 @@ </dependency> <dependency> <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-plugin-manager</artifactId> - </dependency> - <dependency> - <!-- - NOTE: This is originally a transitive dependency of plexus-plugin-manager. However, unless we specify this - artifact as a direct dependency of ourselves, Maven's project sorter will not detect the (indirect) dependency - of maven-core on maven-mercury. Proper detection of this dependency is crucial to ensure that maven-mercury is - built before maven-core. Otherwise, Maven would query the repos instead of the reactor cache for maven-mercury - when building maven-core, happily using out-dated snapshots and potentially failing the build. - --> - <groupId>org.apache.maven</groupId> - <artifactId>maven-mercury</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </dependency> <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> + <scope>test</scope> </dependency> </dependencies> Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +4,4 @@ /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:739385,741841,747468,748815,749612 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972 -/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,4 +4,4 @@ /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:739385,741841,747468,748815,749612 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972 -/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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:751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358,767708-768832 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681 Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Mon Apr 27 00:16:42 2009 @@ -9,15 +9,8 @@ import org.apache.maven.model.Extension; import org.apache.maven.model.Model; import org.apache.maven.model.ProjectUri; -import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Configuration; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.sonatype.plexus.plugin.manager.PlexusPluginManager; -import org.sonatype.plexus.plugin.manager.PluginMetadata; -import org.sonatype.plexus.plugin.manager.PluginResolutionRequest; -import org.sonatype.plexus.plugin.manager.PluginResolutionResult; /** * This listener has two parts: the collection of the extension elements which happens during POM construction, @@ -36,8 +29,8 @@ @Configuration(value = "true") private boolean inBuild = true; - @Requirement - PlexusPluginManager pluginManager; + //@Requirement + //PlexusPluginManager pluginManager; private List<Extension> buildExtensions = new ArrayList<Extension>(); @@ -69,6 +62,7 @@ for ( Extension be : buildExtensions ) { + /* PluginResolutionRequest request = new PluginResolutionRequest() .setPluginMetadata( new PluginMetadata( be.getGroupId(), be.getArtifactId(), be.getVersion() ) ) .addLocalRepository( session.getRequest().getLocalRepositoryPath() ) @@ -90,6 +84,7 @@ { e.printStackTrace(); } + */ } } Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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:751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358,767708-768832 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,5 +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:751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,5 +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:751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,5 +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:751453-767358 +/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681 Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java Mon Apr 27 00:16:42 2009 @@ -23,6 +23,7 @@ public void testBuildExtensionListener() throws Exception { + /* BuildExtensionListener listener = (BuildExtensionListener) lookup( MavenModelEventListener.class, "extensions" ); Extension extension = new Extension(); @@ -54,7 +55,9 @@ // Now we should be able to find the extension. lookup( Wagon.class, "dav" ); - } + + */ + } private MavenSession newMavenSession() throws CycleDetectedException, DuplicateProjectException Propchange: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -3,5 +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:751453-767358 +/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358,767708-768832 /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-model-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 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:767708-768832 /maven/components/trunk/maven-project-builder:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/mdo/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 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:767708-768832 Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 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:767708-768832 /maven/components/trunk/maven-project/src/main/resources:688587-696625,696644-699681 Modified: maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original) +++ maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Apr 27 00:16:42 2009 @@ -160,14 +160,22 @@ } domainModel = ProcessorContext.mergeProfilesIntoModel( externalProfiles, domainModel ); + } catch ( IOException e ) { throw new ProjectBuildingException("", ""); } - //Interpolation - MavenProject project = interpolateDomainModel( domainModel, configuration, pomFile ); + //Interpolation & Management + MavenProject project; + try { + Model model = ProcessorContext.processManagementNodes(interpolateDomainModel( domainModel, configuration, pomFile )); + project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile); + } catch (IOException e) { + throw new ProjectBuildingException("", ""); + } + project.setActiveProfiles( projectProfiles ); Build build = project.getBuild(); @@ -269,7 +277,14 @@ { throw new ProjectBuildingException("", ""); } - project = interpolateDomainModel( domainModel, configuration, artifact.getFile() ); + + try { + Model model = ProcessorContext.processManagementNodes(interpolateDomainModel( domainModel, configuration, artifact.getFile() )); + project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, artifact.getFile()); + } catch (IOException e) { + throw new ProjectBuildingException("", ""); + } + project.setActiveProfiles( projectProfiles ); artifact.setFile( artifact.getFile() ); project.setVersion( artifact.getVersion() ); @@ -368,7 +383,7 @@ return new MavenProjectBuildingResult( project, result ); } - private MavenProject interpolateDomainModel( PomClassicDomainModel domainModel, ProjectBuilderConfiguration config, File projectDescriptor ) + private Model interpolateDomainModel( PomClassicDomainModel domainModel, ProjectBuilderConfiguration config, File projectDescriptor ) throws ProjectBuildingException { Model model; @@ -403,9 +418,15 @@ throw new ProjectBuildingException(projectId, "", projectDescriptor, e); } + return model; + } + + private MavenProject fromDomainModelToMavenProject(Model model, File parentFile, ProjectBuilderConfiguration config, File projectDescriptor) + throws InvalidProjectModelException, IOException + { MavenProject project; - + String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() ); try { project = new MavenProject( model, repositorySystem, this, config ); @@ -415,7 +436,7 @@ Artifact projectArtifact = repositorySystem.createArtifact( project.getGroupId(), project.getArtifactId(), project.getVersion(), null, project.getPackaging() ); project.setArtifact( projectArtifact ); - project.setParentFile( domainModel.getParentFile() ); + project.setParentFile( parentFile ); } catch ( InvalidRepositoryException e ) @@ -423,7 +444,7 @@ throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e ); } - return project; + return project; } private PomClassicDomainModel build( String projectId, File pomFile, ProjectBuilderConfiguration projectBuilderConfiguration ) @@ -544,7 +565,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/MNG-2766/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Mon Apr 27 00:16:42 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 ); } Modified: maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original) +++ maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Mon Apr 27 00:16:42 2009 @@ -149,7 +149,7 @@ System.out.println(pom.getDomainModel().asString()); } - */ + /*MNG- 4010*/ public void testDuplicateExclusionsDependency() throws Exception @@ -885,6 +885,14 @@ assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) ); } + /** IT-0021*/ + public void testProfileDependenciesMultipleProfiles() + throws Exception + { + PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" ); + assertEquals(2, ( (List<?>) pom.getValue( "dependencies" ) ).size() ); + } + public void testDependencyInheritance() throws Exception { @@ -892,7 +900,7 @@ assertEquals(1, ( (List<?>) pom.getValue( "dependencies" ) ).size() ); assertEquals("4.4", pom.getValue("dependencies[1]/version") ); } - + /** MNG-4034 */ public void testManagedProfileDependency() throws Exception @@ -1401,7 +1409,32 @@ { PomTestWrapper pom = this.buildPom( "distribution-management"); assertEquals("legacy", pom.getValue( "distributionManagement/repository/layout" )); -} + } + + public void testDependencyScopeInheritance() + throws Exception + { + PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" ); + String scope = (String) pom.getValue("dependencies[1]/scope"); + assertNull("Scope not null: " + scope, scope); + System.out.println(pom.getDomainModel().asString()); + + } + + public void testDependencyScope() + throws Exception + { + PomTestWrapper pom = buildPom( "dependency-scope/sub" ); + // System.out.println(pom.getDomainModel().asString()); + } + + //This will fail on a validation error if incorrect + public void testDependencyManagementWithInterpolation() + throws Exception + { + PomTestWrapper pom = buildPom( "dependency-management-with-interpolation/sub" ); + } + private void assertPathSuffixEquals( String expected, Object actual ) { Modified: maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml (original) +++ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml Mon Apr 27 00:16:42 2009 @@ -7,30 +7,12 @@ <version>1.0</version> <dependencyManagement> - <dependencies> <dependency> <groupId>maven-test</groupId> <artifactId>t10-a</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>maven-test</groupId> - <artifactId>t10-b</artifactId> - <version>1.0</version> - <scope>runtime</scope> + <version>2.0</version> </dependency> - - <dependency> - <groupId>maven-test</groupId> - <artifactId>t10-c</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - </dependencies> </dependencyManagement> - </project> \ No newline at end of file Modified: maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml (original) +++ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml Mon Apr 27 00:16:42 2009 @@ -15,17 +15,10 @@ </scm> <dependencies> - <dependency> <groupId>maven-test</groupId> <artifactId>t10-a</artifactId> + <version>1.0</version> </dependency> - - <dependency> - <groupId>maven-test</groupId> - <artifactId>t10-c</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> </project> \ No newline at end of file Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -5,4 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:738757-738972 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:688587-696625,696644-699681 -/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java:751453-767358 +/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -1 +1 @@ -/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java:751453-767358 +/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -5,4 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:738757-738972 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:688587-696625,696644-699681 -/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java:751453-767358 +/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -1 +1 @@ -/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java:751453-767358 +/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -5,4 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738757-738972 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java:688587-696625,696644-699681 -/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java:751453-767358 +/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:688587-696625,696644-699681 +/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:767708-768832 Modified: maven/components/branches/MNG-2766/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/pom.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-toolchain/pom.xml (original) +++ maven/components/branches/MNG-2766/maven-toolchain/pom.xml Mon Apr 27 00:16:42 2009 @@ -69,7 +69,7 @@ <version>1.0.0</version> <packageWithVersion>false</packageWithVersion> <models> - <model>src/main/mdo/toolchains.xml</model> + <model>src/main/mdo/toolchains.mdo</model> </models> </configuration> </plugin> Modified: maven/components/branches/MNG-2766/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/pom.xml?rev=768839&r1=768838&r2=768839&view=diff ============================================================================== --- maven/components/branches/MNG-2766/pom.xml (original) +++ maven/components/branches/MNG-2766/pom.xml Mon Apr 27 00:16:42 2009 @@ -157,7 +157,6 @@ <module>maven-plugin-api</module> <module>maven-project</module> <module>maven-model-builder</module> - <module>maven-mercury</module> <module>maven-embedder</module> <module>maven-toolchain</module> <module>maven-compat</module> @@ -188,11 +187,6 @@ <!--bootstrap-start-comment--> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-mercury</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-lifecycle</artifactId> <version>${project.version}</version> </dependency> @@ -373,78 +367,11 @@ <artifactId>commons-jxpath</artifactId> <version>${jxpathVersion}</version> </dependency> - - <!-- Mercury --> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-artifact</artifactId> - <version>${mercuryVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-external</artifactId> - <version>${mercuryVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-plexus</artifactId> - <version>${mercuryVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-repo-virtual</artifactId> - <version>${mercuryVersion}</version> - </dependency> - <dependency> - <groupId>org.sonatype.mercury</groupId> - <artifactId>mercury-mp3-cli</artifactId> - <version>${mercuryMp3Version}</version> - </dependency> <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> <version>${securityDispatcherVersion}</version> </dependency> - - - <!-- Mercury test dependencies --> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-repo-local-m2</artifactId> - <version>${mercuryVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-repo-remote-m2</artifactId> - <version>${mercuryVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-md-sat</artifactId> - <version>${mercuryVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-util</artifactId> - <version>${mercuryVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-transport-http</artifactId> - <version>${mercuryVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.mercury</groupId> - <artifactId>mercury-transport-http</artifactId> - <version>${mercuryVersion}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-plugin-manager</artifactId> Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 00:16:42 2009 @@ -4,3 +4,4 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:739385,741841,747468,747683,748815,749612,766523 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738757-738972 +/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml:767708-768832