Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 45543 invoked from network); 5 Sep 2007 03:45:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Sep 2007 03:45:20 -0000 Received: (qmail 78307 invoked by uid 500); 5 Sep 2007 03:45:14 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 78248 invoked by uid 500); 5 Sep 2007 03:45:14 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 78235 invoked by uid 99); 5 Sep 2007 03:45:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 20:45:14 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2007 03:46:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4ED091A9832; Tue, 4 Sep 2007 20:44:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070905034456.4ED091A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.