Author: jvanzyl
Date: Thu Oct 2 20:14:51 2008
New Revision: 701288
URL: http://svn.apache.org/viewvc?rev=701288&view=rev
Log:
o trying some mercury changes with maven-artifact merged back in. no point in
keeping them separate as it won't be around long anyway.
Added:
maven/components/branches/maven-3.0.x-artifact/maven-artifact/
- copied from r697901, maven/artifact/trunk/
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
(with props)
Modified:
maven/components/branches/maven-3.0.x-artifact/build.xml
maven/components/branches/maven-3.0.x-artifact/maven-artifact/pom.xml
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/branches/maven-3.0.x-artifact/maven-core/pom.xml
maven/components/branches/maven-3.0.x-artifact/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/branches/maven-3.0.x-artifact/maven-distribution/pom.xml
maven/components/branches/maven-3.0.x-artifact/maven-plugin-api/pom.xml
maven/components/branches/maven-3.0.x-artifact/maven-project/pom.xml
maven/components/branches/maven-3.0.x-artifact/maven-toolchain/pom.xml
maven/components/branches/maven-3.0.x-artifact/pom.xml
Modified: maven/components/branches/maven-3.0.x-artifact/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/build.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/build.xml (original)
+++ maven/components/branches/maven-3.0.x-artifact/build.xml Thu Oct 2
20:14:51 2008
@@ -123,10 +123,11 @@
</sequential>
</macrodef>
+ <modello file="maven-artifact/src/main/mdo/metadata.mdo"/>
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
- <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
<modello file="maven-project/src/main/mdo/profiles.mdo"/>
+ <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
</target>
Modified: maven/components/branches/maven-3.0.x-artifact/maven-artifact/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-artifact/pom.xml?rev=701288&r1=697901&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-artifact/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-artifact/pom.xml Thu
Oct 2 20:14:51 2008
@@ -19,41 +19,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <artifactId>maven-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>9-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>3.0-alpha-2-SNAPSHOT</version>
<name>Maven Artifact</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/artifact/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/artifact/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/artifact/trunk</url>
- </scm>
-
- <ciManagement>
- <system>hudson</system>
- <url>http://ci.sonatype.org</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <configuration>
- <address>[EMAIL PROTECTED]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <!-- TODO similar to the svn layout but does make sense to use
${project.artifactId}-${project.version}? -->
-
<url>scp://people.apache.org/www/maven.apache.org/artifact/${project.artifactId}-${project.version}/</url>
- </site>
- </distributionManagement>
<contributors>
<contributor>
<name>Oleg Gusakov</name>
@@ -93,27 +66,22 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-44</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>${wagon.version}</version>
</dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>${wagon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -128,29 +96,10 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-17</version>
<configuration>
<version>1.0.0</version>
<model>src/main/mdo/metadata.mdo</model>
</configuration>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- <execution>
- <id>standard</id>
- <goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -161,68 +110,13 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/maven/artifact/tags</tagBase>
- <useReleaseProfile>true</useReleaseProfile>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<target>1.5</target>
<source>1.5</source>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <comparisonArtifacts>
- <comparisonArtifact>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
- </comparisonArtifact>
- <comparisonArtifact>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>2.0.9</version>
- </comparisonArtifact>
- </comparisonArtifacts>
- <excludes>
- <!-- expanding interfaces we exclude. Worth reviewing on
occasion -->
- <exclude>org/apache/maven/artifact/manager/WagonManager</exclude>
-
<exclude>org/apache/maven/artifact/metadata/ArtifactMetadataSource*</exclude>
-
<exclude>org/apache/maven/artifact/repository/ArtifactRepositoryFactory*</exclude>
-
<exclude>org/apache/maven/artifact/resolver/ArtifactCollector</exclude>
-
<exclude>org/apache/maven/artifact/transform/ArtifactTransformationManager*</exclude>
-
<exclude>org/apache/maven/artifact/resolver/ArtifactResolver*</exclude>
-
<exclude>org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt</exclude>
-
<exclude>org/apache/maven/artifact/resolver/conflict/ConflictResolver*</exclude>
- <!-- plexus interfaces were removed only -->
-
<exclude>org/apache/maven/artifact/transform/DefaultArtifactTransformationManager</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<properties>
<wagon.version>1.0-beta-4</wagon.version>
Modified:
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=701288&r1=697901&r2=701288&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Thu Oct 2 20:14:51 2008
@@ -92,7 +92,7 @@
// deployment shouldn't silently fail when offline
throw new ArtifactDeploymentException( "System is offline. Cannot
deploy artifact: " + artifact + "." );
}
-
+
if ( !artifactHasBeenDeployed( artifact, localRepository,
deploymentRepository ) )
{
try
Added:
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=701288&view=auto
==============================================================================
---
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Thu Oct 2 20:14:51 2008
@@ -0,0 +1,368 @@
+<component-set>
+ <components>
+ <component>
+
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <field-name>repositoryLayouts</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+ <role-hint>oldest</role-hint>
+
<implementation>org.apache.maven.artifact.resolver.conflict.OldestConflictResolver</implementation>
+ <description>Resolves conflicting artifacts by always selecting the
<em>oldest</em> declaration.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>flat</role-hint>
+
<implementation>org.apache.maven.artifact.repository.layout.FlatRepositoryLayout</implementation>
+ <description>The code in this class is taken from
DefaultRepositorylayout, located at:
+http://svn.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.resolver.conflict.GraphConflictResolver</role>
+
<implementation>org.apache.maven.artifact.resolver.conflict.DefaultGraphConflictResolver</implementation>
+ <description>Default conflict resolver.</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionPolicy</role>
+ <field-name>policy</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+ <role-hint>snapshot</role-hint>
+
<implementation>org.apache.maven.artifact.transform.SnapshotTransformation</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ <field-name>repositoryMetadataManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.resolver.conflict.ConflictResolverFactory</role>
+
<implementation>org.apache.maven.artifact.resolver.conflict.DefaultConflictResolverFactory</implementation>
+ <description>A conflict resolver factory that obtains instances from a
plexus container.</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.PlexusContainer</role>
+ <field-name>container</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+ <role-hint>release</role-hint>
+
<implementation>org.apache.maven.artifact.transform.ReleaseArtifactTransformation</implementation>
+ <description>Change the version <code>RELEASE</code> to the
appropriate release version from the remote repository.</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ <field-name>repositoryMetadataManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+ <role-hint>latest</role-hint>
+
<implementation>org.apache.maven.artifact.transform.LatestArtifactTransformation</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ <field-name>repositoryMetadataManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+ <role-hint>farthest</role-hint>
+
<implementation>org.apache.maven.artifact.resolver.conflict.FarthestConflictResolver</implementation>
+ <description>Resolves conflicting artifacts by always selecting the
<em>farthest</em> declaration.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+
<implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+ <field-name>repositoryFactory</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <field-name>wagons</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.UpdateCheckManager</role>
+ <field-name>updateCheckManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>default</role-hint>
+
<implementation>org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
+
<implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
+ <description>Default implementation of the artifact
collector.</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+ <role-hint>nearest</role-hint>
+ <field-name>defaultConflictResolver</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+
<implementation>org.apache.maven.artifact.transform.DefaultArtifactTransformationManager</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
+ <role-hints>
+ <role-hint>release</role-hint>
+ <role-hint>latest</role-hint>
+ <role-hint>snapshot</role-hint>
+ </role-hints>
+ <field-name>artifactTransformations</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+
<implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+ <field-name>artifactHandlerManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
+
<implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+ <field-name>transformationManager</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ <field-name>repositoryMetadataManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+ <role-hint>newest</role-hint>
+
<implementation>org.apache.maven.artifact.resolver.conflict.NewestConflictResolver</implementation>
+ <description>Resolves conflicting artifacts by always selecting the
<em>newest</em> declaration.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+
<implementation>org.apache.maven.artifact.resolver.conflict.DefaultConflictResolver</implementation>
+ <description>The default conflict resolver that delegates to the nearest
strategy.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.transform.ClasspathTransformation</role>
+
<implementation>org.apache.maven.artifact.transform.DefaultClasspathTransformation</implementation>
+ <description>default implementation of the metadata classpath
transformer</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.resolver.conflict.GraphConflictResolver</role>
+ <field-name>conflictResolver</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.manager.UpdateCheckManager</role>
+
<implementation>org.apache.maven.artifact.manager.DefaultUpdateCheckManager</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>legacy</role-hint>
+
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+
<implementation>org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <field-name>artifactHandlers</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+
<implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.UpdateCheckManager</role>
+ <field-name>updateCheckManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionPolicy</role>
+
<implementation>org.apache.maven.artifact.resolver.conflict.DefaultGraphConflictResolutionPolicy</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <configuration>
+ <closer-first>true</closer-first>
+ <newer-first>true</newer-first>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.metadata.MetadataResolver</role>
+
<implementation>org.apache.maven.artifact.resolver.metadata.DefaultMetadataResolver</implementation>
+ <description>default implementation of the metadata
resolver</description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <field-name>artifactResolver</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ <field-name>artifactFactory</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.resolver.metadata.MetadataSource</role>
+ <field-name>metadataSource</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.resolver.conflict.GraphConflictResolver</role>
+ <field-name>conflictResolver</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.transform.ClasspathTransformation</role>
+ <field-name>classpathTransformation</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.conflict.ConflictResolver</role>
+ <role-hint>nearest</role-hint>
+
<implementation>org.apache.maven.artifact.resolver.conflict.NearestConflictResolver</implementation>
+ <description>Resolves conflicting artifacts by always selecting the
<em>nearest</em> declaration.</description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
+
<implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+ <field-name>transformationManager</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ <field-name>repositoryMetadataManager</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ <field-name>metadataSource</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>default</role-hint>
+ <field-name>defaultLayout</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+
<implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
+ <field-name>transformationManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ <field-name>artifactFactory</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
+ <field-name>artifactCollector</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <description></description>
+ <isolated-realm>false</isolated-realm>
+ </component>
+ </components>
+</component-set>
Propchange:
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-3.0.x-artifact/maven-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/branches/maven-3.0.x-artifact/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-core/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-core/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-core/pom.xml Thu Oct
2 20:14:51 2008
@@ -44,7 +44,7 @@
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
Modified:
maven/components/branches/maven-3.0.x-artifact/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-artifact/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(original)
+++
maven/components/branches/maven-3.0.x-artifact/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Thu Oct 2 20:14:51 2008
@@ -60,8 +60,7 @@
if ( ( globalSettingsFile == null ) && ( userSettingsFile == null ) )
{
- getLogger().debug(
- "No settings files provided, and default locations are
disabled for this request. Returning empty Settings instance." );
+ getLogger().debug( "No settings files provided, and default
locations are disabled for this request. Returning empty Settings instance." );
return new Settings();
}
Modified:
maven/components/branches/maven-3.0.x-artifact/maven-distribution/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-distribution/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-distribution/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-distribution/pom.xml
Thu Oct 2 20:14:51 2008
@@ -45,6 +45,10 @@
<artifactId>maven-compat</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
Modified:
maven/components/branches/maven-3.0.x-artifact/maven-plugin-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-plugin-api/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-plugin-api/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-plugin-api/pom.xml Thu
Oct 2 20:14:51 2008
@@ -31,7 +31,7 @@
<name>Maven Plugin API</name>
<dependencies>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/maven-3.0.x-artifact/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-project/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-project/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-project/pom.xml Thu
Oct 2 20:14:51 2008
@@ -45,7 +45,7 @@
<artifactId>plexus-interpolation</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/maven-3.0.x-artifact/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/maven-toolchain/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/maven-toolchain/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-artifact/maven-toolchain/pom.xml Thu
Oct 2 20:14:51 2008
@@ -29,7 +29,7 @@
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
</dependencies>
Modified: maven/components/branches/maven-3.0.x-artifact/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-artifact/pom.xml?rev=701288&r1=701287&r2=701288&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-artifact/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-artifact/pom.xml Thu Oct 2 20:14:51
2008
@@ -260,6 +260,7 @@
</plugins>
</build>
<modules>
+ <module>maven-artifact</module>
<module>maven-core</module>
<module>maven-distribution</module>
<module>maven-lifecycle</module>
@@ -273,7 +274,6 @@
<module>maven-compat</module>
</modules>
<properties>
- <artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
<aspectjVersion>1.5.3</aspectjVersion>
<classWorldsVersion>1.2-alpha-13</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
@@ -353,6 +353,11 @@
<artifactId>maven-compat</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!--end-->
<!-- Plexus -->
<dependency>
@@ -418,11 +423,6 @@
<version>${wagonVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${artifactVersion}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
