[MDEP-494] Remove/replace Maven2 specific code
ArtifactItem.basedVersion should always be based on ArtifactItem.version
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1691728 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
index 99cce09..8a2fb8b 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
@@ -22,6 +22,7 @@
import java.io.File;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.codehaus.plexus.util.StringUtils;
@@ -60,13 +61,6 @@
private String version = null;
/**
- * BaseVersion of Artifact
- *
- * @parameter
- */
- private String baseVersion = null;
-
- /**
* Type of Artifact (War,Jar,etc)
*
* @parameter
@@ -135,7 +129,6 @@
this.setGroupId( artifact.getGroupId() );
this.setType( artifact.getType() );
this.setVersion( artifact.getVersion() );
- this.setBaseVersion( artifact.getBaseVersion() );
}
private String filterEmptyString( String in )
@@ -220,16 +213,7 @@
*/
public String getBaseVersion()
{
- return baseVersion;
- }
-
- /**
- * @param baseVersion
- * The base version to set.
- */
- public void setBaseVersion( String baseVersion )
- {
- this.baseVersion = filterEmptyString( baseVersion );
+ return ArtifactUtils.toSnapshotVersion( version );
}
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
index 5b03c0c..4f8dc1e 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
@@ -32,6 +32,7 @@
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.apache.maven.shared.artifact.install.ArtifactInstaller;
import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
@@ -168,7 +169,7 @@
if ( !"pom".equals( artifact.getType() ) && isCopyPom() )
{
Artifact pomArtifact = getResolvedPomArtifact( artifact );
- if ( pomArtifact.getFile() != null && pomArtifact.getFile().exists() )
+ if ( pomArtifact != null && pomArtifact.getFile() != null && pomArtifact.getFile().exists() )
{
installer.install( buildingRequest, Collections.singletonList( pomArtifact ) );
installBaseSnapshot( pomArtifact, buildingRequest );
@@ -269,7 +270,7 @@
Artifact pomArtifact = getResolvedPomArtifact( artifact );
// Copy the pom
- if ( pomArtifact.getFile() != null && pomArtifact.getFile().exists() )
+ if ( pomArtifact != null && pomArtifact.getFile() != null && pomArtifact.getFile().exists() )
{
File pomDestFile =
new File( destDir, DependencyUtil.getFormattedFileName( pomArtifact, removeVersion, prependGroupId,
@@ -284,16 +285,20 @@
protected Artifact getResolvedPomArtifact( Artifact artifact )
{
- Artifact pomArtifact =
- this.getFactory().createArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- "", "pom" );
+ DefaultArtifactCoordinate coordinate = new DefaultArtifactCoordinate();
+ coordinate.setGroupId( artifact.getGroupId() );
+ coordinate.setArtifactId( artifact.getArtifactId() );
+ coordinate.setVersion( artifact.getVersion() );
+ coordinate.setType( "pom" );
+
+ Artifact pomArtifact = null;
// Resolve the pom artifact using repos
try
{
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
- pomArtifact = getArtifactResolver().resolveArtifact( buildingRequest, pomArtifact ).getArtifact();
+ pomArtifact = getArtifactResolver().resolveArtifact( buildingRequest, coordinate ).getArtifact();
}
catch ( ArtifactResolverException e )
{
diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
index 6e7a54d..19dd65c 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
@@ -26,6 +26,7 @@
import java.io.StringReader;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -130,7 +131,7 @@
{
if ( useBaseVersion )
{
- versionString = "-" + artifact.getBaseVersion();
+ versionString = "-" + ArtifactUtils.toSnapshotVersion( artifact.getVersion() );
}
else
{
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
index f55b0ac..3461aec 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
@@ -146,7 +146,6 @@
item.setArtifactId( "artifact" );
item.setGroupId( "groupId" );
item.setVersion( "1.0-20130210.213424-191" );
- item.setBaseVersion( "1.0-SNAPSHOT" );
list.add(item);
mojo.setArtifactItems( createArtifactItemArtifacts( list ) );
