maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r572868 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Date Wed, 05 Sep 2007 03:44:56 GMT
Author: jvanzyl
Date: Tue Sep  4 20:44:55 2007
New Revision: 572868

URL: http://svn.apache.org/viewvc?rev=572868&view=rev
Log:
o Why would a plugin be executing in its own POM. I think this is a far out case and you shouldn't
be testing your plugin with its own POM. The comment is "I guess...". I don't think this is
right.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=572868&r1=572867&r2=572868&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Tue Sep  4 20:44:55 2007
@@ -61,15 +61,6 @@
     // TODO: Revisit to remove this piece of state. PLUGIN REGISTRY MAY BE UPDATED ON DISK
OUT-OF-PROCESS!
     private Map resolvedMetaVersions = new HashMap();
 
-    /**
-     * @deprecated
-     */
-    public String resolvePluginVersion( String groupId, String artifactId, MavenProject project,
ArtifactRepository localRepository )
-        throws PluginVersionResolutionException, InvalidPluginException, PluginVersionNotFoundException
-    {
-        return resolvePluginVersion( groupId, artifactId, project, localRepository, false
);
-    }
-
     public String resolvePluginVersion( String groupId,
                                         String artifactId,
                                         MavenProject project,
@@ -133,15 +124,6 @@
             // 1. resolve the version to be used
             version = resolveMetaVersion( groupId, artifactId, project, localRepository,
Artifact.RELEASE_VERSION );
             getLogger().debug( "Version from RELEASE metadata: " + version );
-        }
-
-        // if we're still empty here, and the current project matches the plugin in question,
use the current project's
-        // version, I guess...
-        if ( StringUtils.isEmpty( version ) && project.getGroupId().equals( groupId
) &&
-            project.getArtifactId().equals( artifactId ) )
-        {
-            version = project.getVersion();
-            getLogger().debug( "Version from POM itself (this project IS the plugin project):
" + version );
         }
 
         // if we still haven't found a version, then fail early before we get into the update
goop.



Mime
View raw message