You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2014/02/14 04:21:29 UTC
git commit: Revert "MNG-5552 made classifier part of
MavenProject.artifactMap key"
Updated Branches:
refs/heads/master 30fadd074 -> 0f1fcd706
Revert "MNG-5552 made classifier part of MavenProject.artifactMap key"
This reverts commit f35698c790da5329590d1ceba0502c02f942efdf.
There are plugins that rely on the broken behaviour and I don't have the
time to fix this in backwards compatible way right now.
http://markmail.org/message/gjfuofw5gpsr5yxz
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0f1fcd70
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0f1fcd70
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0f1fcd70
Branch: refs/heads/master
Commit: 0f1fcd70668be2c35fa69e4aedde0425f570b103
Parents: 30fadd0
Author: Igor Fedorenko <if...@apache.org>
Authored: Thu Feb 13 21:36:03 2014 -0500
Committer: Igor Fedorenko <if...@apache.org>
Committed: Thu Feb 13 21:41:07 2014 -0500
----------------------------------------------------------------------
.../apache/maven/artifact/ArtifactUtils.java | 15 ++------
.../PluginParameterExpressionEvaluatorTest.java | 38 --------------------
2 files changed, 2 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0f1fcd70/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index a373c33..8efc45c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -68,16 +68,11 @@ public final class ArtifactUtils
public static String versionlessKey( Artifact artifact )
{
- return versionlessKey( artifact.getGroupId(), artifact.getArtifactId(), artifact.getClassifier() );
+ return versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
}
public static String versionlessKey( String groupId, String artifactId )
{
- return versionlessKey( groupId, artifactId, null );
- }
-
- public static String versionlessKey( String groupId, String artifactId, String classifier )
- {
if ( groupId == null )
{
throw new NullPointerException( "groupId is null" );
@@ -86,13 +81,7 @@ public final class ArtifactUtils
{
throw new NullPointerException( "artifactId is null" );
}
- StringBuilder key = new StringBuilder();
- key.append( groupId ).append( ':' ).append( artifactId );
- if ( classifier != null && !"".equals( classifier.trim() ) )
- {
- key.append( ':' ).append( classifier );
- }
- return key.toString();
+ return groupId + ":" + artifactId;
}
public static String key( Artifact artifact )
http://git-wip-us.apache.org/repos/asf/maven/blob/0f1fcd70/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index aca8afd..5f6744c 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -22,11 +22,9 @@ package org.apache.maven.plugin;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Set;
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.artifact.Artifact;
@@ -382,28 +380,6 @@ public class PluginParameterExpressionEvaluatorTest
assertEquals( "testGroup", result.getGroupId() );
}
- public void testProjectArtifactMap()
- throws Exception
- {
- Model model = new Model();
- MavenProject project = new MavenProject( model );
- Set<Artifact> artifacts = new HashSet<Artifact>();
- artifacts.add( createArtifact( "testGroup", "testArtifact", "1.0" ) );
- artifacts.add( createArtifact( "testGroup", "testArtifact", "1.0", "testClassifier" ) );
- project.setArtifacts( artifacts );
- ExpressionEvaluator ee = createExpressionEvaluator( project, null, new Properties() );
-
- @SuppressWarnings( "unchecked" )
- Map<String, Artifact> depResults = (Map<String, Artifact>) ee.evaluate( "${project.artifactMap}" );
- assertEquals( 2, depResults.size() );
- assertNotNull( depResults.get( "testGroup:testArtifact" ) );
- assertNotNull( depResults.get( "testGroup:testArtifact:testClassifier" ) );
-
- assertNull( ( (Artifact) ee.evaluate( "${project.artifactMap(testGroup:testArtifact)}" ) ).getClassifier() );
- assertEquals( "testClassifier",
- ( (Artifact) ee.evaluate( "${project.artifactMap(testGroup:testArtifact:testClassifier)}" ) ).getClassifier() );
- }
-
private MavenProject createDefaultProject()
{
return new MavenProject( new Model() );
@@ -440,20 +416,6 @@ public class PluginParameterExpressionEvaluatorTest
return factory.createDependencyArtifact( dependency );
}
- protected Artifact createArtifact( String groupId, String artifactId, String version, String classifier )
- throws Exception
- {
- Dependency dependency = new Dependency();
- dependency.setGroupId( groupId );
- dependency.setArtifactId( artifactId );
- dependency.setVersion( version );
- dependency.setClassifier( classifier );
- dependency.setType( "jar" );
- dependency.setScope( "compile" );
-
- return factory.createDependencyArtifact( dependency );
- }
-
private MojoExecution newMojoExecution()
{
PluginDescriptor pd = new PluginDescriptor();