Author: jvanzyl
Date: Wed Feb 11 00:05:47 2009
New Revision: 743174
URL: http://svn.apache.org/viewvc?rev=743174&view=rev
Log:
o use annotations for the remainder of the maven-artifact code
o update to latest release of plexus which fixes super/subclass annotation
processing
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Wed Feb 11 00:05:47 2009
@@ -144,6 +144,7 @@
<arg file="bootstrap/target/generated-sources"/>
<arg value="@{version}"/>
<arg value="false"/>
+ <arg value="false"/>
</java>
</sequential>
</macrodef>
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Wed Feb 11 00:05:47 2009
@@ -28,27 +28,29 @@
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.transform.ArtifactTransformationManager;
import org.apache.maven.wagon.TransferFailedException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
-/** @plexus.component */
+...@component (role=ArtifactDeployer.class)
public class DefaultArtifactDeployer
extends AbstractLogEnabled
implements ArtifactDeployer
{
- /** @plexus.requirement */
+ @Requirement
private WagonManager wagonManager;
- /** @plexus.requirement */
+ @Requirement
private ArtifactTransformationManager transformationManager;
- /** @plexus.requirement */
+ @Requirement
private RepositoryMetadataManager repositoryMetadataManager;
- /** @plexus.requirement */
+ @Requirement
private ArtifactMetadataSource metadataSource;
- /** @plexus.requirement role-hint="default" */
+ @Requirement(hint="default")
private ArtifactRepositoryLayout defaultLayout;
/**
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Wed Feb 11 00:05:47 2009
@@ -24,12 +24,14 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
-/** @plexus.component */
+...@component(role=ArtifactFactory.class)
public class DefaultArtifactFactory
implements ArtifactFactory
{
- /** @plexus.requirement */
+ @Requirement
private ArtifactHandlerManager artifactHandlerManager;
public DefaultArtifactFactory()
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
Wed Feb 11 00:05:47 2009
@@ -1,5 +1,7 @@
package org.apache.maven.artifact.handler;
+import org.codehaus.plexus.component.annotations.Component;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,8 +25,8 @@
* @author <a href="mailto:[email protected]";>Brett Porter</a>
* @author Jason van Zyl
* @version $Id$
- * @plexus.component
*/
+...@component(role=ArtifactHandler.class)
public class DefaultArtifactHandler
implements ArtifactHandler
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Wed Feb 11 00:05:47 2009
@@ -21,6 +21,8 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.util.Map;
import java.util.Set;
@@ -28,12 +30,12 @@
/**
* @author Jason van Zyl
* @version $Id$
- * @plexus.component
*/
+...@component(role=ArtifactHandlerManager.class)
public class DefaultArtifactHandlerManager
implements ArtifactHandlerManager
{
- /** @plexus.requirement
role="org.apache.maven.artifact.handler.ArtifactHandler" */
+ @Requirement(role=ArtifactHandler.class)
private Map<String,ArtifactHandler> artifactHandlers;
public ArtifactHandler getArtifactHandler( String type )
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Wed Feb 11 00:05:47 2009
@@ -25,6 +25,8 @@
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataInstallationException;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.transform.ArtifactTransformationManager;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
@@ -33,16 +35,16 @@
/**
* @author Jason van Zyl
- * @plexus.component
*/
+...@component(role=ArtifactInstaller.class)
public class DefaultArtifactInstaller
extends AbstractLogEnabled
implements ArtifactInstaller
{
- /** @plexus.requirement */
+ @Requirement
private ArtifactTransformationManager transformationManager;
- /** @plexus.requirement */
+ @Requirement
private RepositoryMetadataManager repositoryMetadataManager;
/** @deprecated we want to use the artifact method only, and ensure
artifact.file is set correctly. */
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
Wed Feb 11 00:05:47 2009
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -38,7 +39,7 @@
import java.util.Date;
import java.util.Properties;
-/** @plexus.component */
+...@component(role=UpdateCheckManager.class)
public class DefaultUpdateCheckManager
extends AbstractLogEnabled
implements UpdateCheckManager
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Wed Feb 11 00:05:47 2009
@@ -53,6 +53,8 @@
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.configurator.BasicComponentConfigurator;
import
org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
@@ -67,7 +69,7 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-/** @plexus.component */
+...@component(role=WagonManager.class)
public class DefaultWagonManager
extends AbstractLogEnabled
implements WagonManager, Contextualizable
@@ -111,16 +113,16 @@
// Components
- /** @plexus.requirement */
+ @Requirement
private ArtifactRepositoryFactory repositoryFactory;
- /** @plexus.requirement role="org.apache.maven.wagon.Wagon" */
+ @Requirement(role=Wagon.class)
private Map wagons;
/** encapsulates access to Server credentials */
private CredentialsDataSource credentialsDataSource;
- /** @plexus.requirement */
+ @Requirement
private UpdateCheckManager updateCheckManager;
private String httpUserAgent = "Apache-Maven/3.0-alpha-1";
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Wed Feb 11 00:05:47 2009
@@ -22,6 +22,8 @@
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.io.File;
import java.net.MalformedURLException;
@@ -30,8 +32,8 @@
/**
* @author jdcasey
- * @plexus.component
*/
+...@component(role=ArtifactRepositoryFactory.class)
public class DefaultArtifactRepositoryFactory
implements ArtifactRepositoryFactory
{
@@ -43,7 +45,7 @@
// FIXME: This is a non-ThreadLocal cache!!
private final Map<String,ArtifactRepository> artifactRepositories = new
HashMap<String,ArtifactRepository>();
- /** @plexus.requirement
role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" */
+ @Requirement(role=ArtifactRepositoryLayout.class)
private Map<String,ArtifactRepositoryLayout> repositoryLayouts;
public ArtifactRepositoryLayout getLayout( String layoutId )
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
Wed Feb 11 00:05:47 2009
@@ -23,11 +23,12 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.component.annotations.Component;
/**
* @author jdcasey
- * @plexus.component
role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
role-hint="default"
*/
+...@component(role=ArtifactRepositoryLayout.class, hint="default")
public class DefaultRepositoryLayout
implements ArtifactRepositoryLayout
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
Wed Feb 11 00:05:47 2009
@@ -4,14 +4,15 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.component.annotations.Component;
/**
* The code in this class is taken from DefaultRepositorylayout, located at:
*
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
*
* @version $Id$
- * @plexus.component
role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
role-hint="flat"
*/
+...@component(role=ArtifactRepositoryLayout.class, hint="flat")
public class FlatRepositoryLayout
implements ArtifactRepositoryLayout
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
Wed Feb 11 00:05:47 2009
@@ -23,11 +23,12 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.component.annotations.Component;
/**
* @author jdcasey
- * @plexus.component
role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
role-hint="legacy"
*/
+...@component(role=ArtifactRepositoryLayout.class, hint="legacy")
public class LegacyRepositoryLayout
implements ArtifactRepositoryLayout
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Wed Feb 11 00:05:47 2009
@@ -35,6 +35,8 @@
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
@@ -43,16 +45,16 @@
/**
* @author Jason van Zyl
- * @plexus.component
*/
+...@component(role=RepositoryMetadataManager.class)
public class DefaultRepositoryMetadataManager
extends AbstractLogEnabled
implements RepositoryMetadataManager
{
- /** @plexus.requirement */
+ @Requirement
private WagonManager wagonManager;
- /** @plexus.requirement */
+ @Requirement
private UpdateCheckManager updateCheckManager;
protected DefaultRepositoryMetadataManager( WagonManager wagonManager,
UpdateCheckManager updateCheckManager, Logger logger )
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Wed Feb 11 00:05:47 2009
@@ -31,6 +31,8 @@
import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -52,16 +54,15 @@
* @todo This needs to collect all errors and not die on the first error. If
there are problems retrieving the metadata
* then we need all the information so that we can tell users about what
we attempted to do.
* @todo there 8 places where we can can range exceptions which is bad, again
the result of not using a graph.
- * @plexus.component
*/
+...@component(role=ArtifactCollector.class)
public class DefaultArtifactCollector
implements ArtifactCollector, LogEnabled
{
/**
* The conflict resolver to use when none is specified.
- *
- * @plexus.requirement role-hint="nearest"
*/
+ @Requirement(hint="nearest")
private ConflictResolver defaultConflictResolver;
private Logger logger;
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Wed Feb 11 00:05:47 2009
@@ -34,6 +34,8 @@
import org.apache.maven.artifact.transform.ArtifactTransformationManager;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
@@ -49,8 +51,8 @@
/**
* @author Jason van Zyl
- * @plexus.component
*/
+...@component(role=ArtifactResolver.class)
public class DefaultArtifactResolver
extends AbstractLogEnabled
implements ArtifactResolver
@@ -59,16 +61,16 @@
// Components
// ----------------------------------------------------------------------
- /** @plexus.requirement */
+ @Requirement
private WagonManager wagonManager;
- /** @plexus.requirement */
+ @Requirement
private ArtifactTransformationManager transformationManager;
- /** @plexus.requirement */
+ @Requirement
protected ArtifactFactory artifactFactory;
- /** @plexus.requirement */
+ @Requirement
private ArtifactCollector artifactCollector;
// ----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -1,5 +1,7 @@
package org.apache.maven.artifact.resolver.conflict;
+import org.codehaus.plexus.component.annotations.Component;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,9 +28,9 @@
* @version $Id$
* @see NearestConflictResolver
* @deprecated As of 3.0, use a specific implementation instead, e.g.
{...@link NearestConflictResolver}
- * @plexus.component
*/
@Deprecated
+...@component(role=ConflictResolver.class)
public class DefaultConflictResolver
extends NearestConflictResolver
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
Wed Feb 11 00:05:47 2009
@@ -21,6 +21,8 @@
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -31,10 +33,10 @@
*
* @author <a href="mailto:[email protected]";>Mark Hobson</a>
* @version $Id$
- * @plexus.component
* @todo you don't need the container in here with the active maps (jvz).
* @since 3.0
*/
+...@component(role=ConflictResolverFactory.class)
public class DefaultConflictResolverFactory
implements ConflictResolverFactory,
Contextualizable
@@ -43,9 +45,8 @@
/**
* The plexus container used to obtain instances from.
- *
- * @plexus.requirement
*/
+ @Requirement
private PlexusContainer container;
// ConflictResolverFactory methods ----------------------------------------
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
Wed Feb 11 00:05:47 2009
@@ -3,32 +3,29 @@
import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Configuration;
/**
- *
- * @plexus.component
- *
* @author <a href="mailto:[email protected]";>Oleg Gusakov</a>
*
* @version $Id$
*/
+...@component(role=GraphConflictResolutionPolicy.class)
public class DefaultGraphConflictResolutionPolicy
implements GraphConflictResolutionPolicy
-{
-
- /**
+{
+ /**
* artifact, closer to the entry point, is selected
- *
- * @plexus.configuration default-value="true"
*/
- private boolean closerFirst = true;
+ @Configuration(name="closer-first", value="true")
+ private boolean closerFirst = true;
- /**
+ /**
* newer artifact is selected
- *
- * @plexus.configuration default-value="true"
*/
- private boolean newerFirst = true;
+ @Configuration(name="newer-first", value="true")
+ private boolean newerFirst = true;
public MetadataGraphEdge apply(MetadataGraphEdge e1, MetadataGraphEdge
e2)
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -25,6 +25,8 @@
import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.util.ArrayList;
import java.util.List;
@@ -33,19 +35,17 @@
/**
* Default conflict resolver.Implements closer newer first policy by default,
but could be configured via plexus
*
- * @plexus.component
* @author <a href="mailto:[email protected]";>Oleg Gusakov</a>
* @version $Id$
*/
-
+...@component(role=GraphConflictResolver.class)
public class DefaultGraphConflictResolver
implements GraphConflictResolver
{
/**
* artifact, closer to the entry point, is selected
- *
- * @plexus.requirement
role="org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionPolicy"
*/
+ @Requirement(role=GraphConflictResolutionPolicy.class)
protected GraphConflictResolutionPolicy policy;
//
-------------------------------------------------------------------------------------
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Resolves conflicting artifacts by always selecting the <em>farthest</em>
declaration. Farthest is defined as the
@@ -28,8 +29,8 @@
* @author <a href="mailto:[email protected]";>Mark Hobson</a>
* @version $Id$
* @since 3.0
- * @plexus.component role-hint="farthest"
*/
+...@component(role=ConflictResolver.class, hint="farthest")
public class FarthestConflictResolver
implements ConflictResolver
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Resolves conflicting artifacts by always selecting the <em>nearest</em>
declaration. Nearest is defined as the
@@ -29,8 +30,8 @@
* @author <a href="mailto:[email protected]";>Mark Hobson</a>
* @version $Id$
* @since 3.0
- * @plexus.component role-hint="nearest"
*/
+...@component(role=ConflictResolver.class, hint="nearest")
public class NearestConflictResolver
implements ConflictResolver
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Resolves conflicting artifacts by always selecting the <em>newest</em>
declaration. Newest is defined as the
@@ -31,8 +32,8 @@
* @version $Id$
* @see ArtifactVersion#compareTo(Object)
* @since 3.0
- * @plexus.component role-hint="newest"
*/
+...@component(role=ConflictResolver.class, hint="newest")
public class NewestConflictResolver
implements ConflictResolver
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
Wed Feb 11 00:05:47 2009
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Resolves conflicting artifacts by always selecting the <em>oldest</em>
declaration. Oldest is defined as the
@@ -31,8 +32,8 @@
* @version $Id$
* @see ArtifactVersion#compareTo(Object)
* @since 3.0
- * @plexus.component role-hint="oldest"
*/
+...@component(role=ConflictResolver.class, hint="oldest")
public class OldestConflictResolver
implements ConflictResolver
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
Wed Feb 11 00:05:47 2009
@@ -13,6 +13,8 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.conflict.GraphConflictResolver;
import org.apache.maven.artifact.transform.ClasspathTransformation;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -21,28 +23,27 @@
*
* @author <a href="[email protected]">Oleg Gusakov</a>
*
- * @plexus.component
- *
*/
+...@component(role=MetadataResolver.class)
public class DefaultMetadataResolver
extends AbstractLogEnabled
implements MetadataResolver
{
//------------------------------------------------------------------------
- /** @plexus.requirement */
+ @Requirement
ArtifactResolver artifactResolver;
- /** @plexus.requirement */
+ @Requirement
ArtifactFactory artifactFactory;
- /** @plexus.requirement */
+ @Requirement
MetadataSource metadataSource;
- /** @plexus.requirement */
+ @Requirement
GraphConflictResolver conflictResolver;
- /** @plexus.requirement */
+ @Requirement
ClasspathTransformation classpathTransformation;
//------------------------------------------------------------------------
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Wed Feb 11 00:05:47 2009
@@ -29,7 +29,9 @@
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import
org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.component.annotations.Component;
import java.util.List;
@@ -44,10 +46,10 @@
extends AbstractLogEnabled
implements ArtifactTransformation
{
- /** @plexus.requirement */
+ @Requirement
protected RepositoryMetadataManager repositoryMetadataManager;
- /** @plexus.requirement */
+ @Requirement
protected WagonManager wagonManager;
protected String resolveVersion( Artifact artifact,
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
Wed Feb 11 00:05:47 2009
@@ -25,6 +25,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.util.Iterator;
import java.util.List;
@@ -32,15 +34,12 @@
/**
* @author Jason van Zyl
- * @plexus.component
*/
+...@component(role=ArtifactTransformationManager.class)
public class DefaultArtifactTransformationManager
implements ArtifactTransformationManager
{
- /** @plexus.requirement
- * role="org.apache.maven.artifact.transform.ArtifactTransformation"
- * role-hints="release,latest,snapshot"
- */
+ @Requirement(role=ArtifactTransformation.class, hints={"release",
"latest", "snapshot"})
private List<ArtifactTransformation> artifactTransformations;
public void transformForResolve( Artifact artifact,
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java
Wed Feb 11 00:05:47 2009
@@ -12,20 +12,22 @@
import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
/**
* default implementation of the metadata classpath transformer
*
* @author <a href="[email protected]">Oleg Gusakov</a>
*
- * @plexus.component
- *
*/
+...@component(role=ClasspathTransformation.class)
public class DefaultClasspathTransformation
implements ClasspathTransformation
{
- /** @plexus.requirement */
+ @Requirement
GraphConflictResolver conflictResolver;
+
//----------------------------------------------------------------------------------------------------
public ClasspathContainer transform(
MetadataGraph dirtyGraph
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
Wed Feb 11 00:05:47 2009
@@ -25,10 +25,11 @@
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.codehaus.plexus.component.annotations.Component;
import java.util.List;
-/** @plexus.component
role="org.apache.maven.artifact.transform.ArtifactTransformation"
role-hint="latest" */
+...@component(role=ArtifactTransformation.class, hint="latest")
public class LatestArtifactTransformation
extends AbstractVersionTransformation
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
Wed Feb 11 00:05:47 2009
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.codehaus.plexus.component.annotations.Component;
import java.util.List;
@@ -35,8 +36,8 @@
*
* @author <a href="mailto:[email protected]";>Brett Porter</a>
* @version $Id$
- * @plexus.component
role="org.apache.maven.artifact.transform.ArtifactTransformation"
role-hint="release"
*/
+...@component(role=ArtifactTransformation.class, hint="release")
public class ReleaseArtifactTransformation
extends AbstractVersionTransformation
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Wed Feb 11 00:05:47 2009
@@ -29,6 +29,7 @@
import
org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import java.text.DateFormat;
@@ -41,8 +42,8 @@
* @author <a href="mailto:[email protected]";>Brett Porter</a>
* @author <a href="mailto:[email protected]";>Michal Maczka</a>
* @version $Id$
- * @plexus.component
role="org.apache.maven.artifact.transform.ArtifactTransformation"
role-hint="snapshot"
*/
+...@component(role=ArtifactTransformation.class, hint="snapshot")
public class SnapshotTransformation
extends AbstractVersionTransformation
{
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=743174&r1=743173&r2=743174&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Wed Feb 11 00:05:47 2009
@@ -48,17 +48,17 @@
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-3.0.5</plexusVersion>
+ <plexusVersion>1.0-beta-3.0.6</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
- <plexusUtilsVersion>1.5.6</plexusUtilsVersion>
+ <plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.3</modelBuilderVersion>
<mercuryVersion>1.0.0-alpha-2</mercuryVersion>
<mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
<woodstoxVersion>3.2.6</woodstoxVersion>
- <modelloVersion>1.0-alpha-22</modelloVersion>
+ <modelloVersion>1.0.1-SNAPSHOT</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
</properties>
<issueManagement>
@@ -218,6 +218,11 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -406,11 +411,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
<version>${jxpathVersion}</version>
- </dependency>
+ </dependency>
<!-- Mercury -->
<dependency>
@@ -423,11 +428,11 @@
<artifactId>mercury-external</artifactId>
<version>${mercuryVersion}</version>
</dependency>
- <dependency>
- <groupId>org.sonatype.mercury</groupId>
- <artifactId>mercury-mp3-cli</artifactId>
+ <dependency>
+ <groupId>org.sonatype.mercury</groupId>
+ <artifactId>mercury-mp3-cli</artifactId>
<version>${mercuryMp3Version}</version>
- </dependency>
+ </dependency>
<!-- Mercury test dependencies -->
<dependency>
