You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/10 04:57:11 UTC
svn commit: r169398 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-plugins/maven-idea-plugin
Author: brett
Date: Mon May 9 19:57:10 2005
New Revision: 169398
URL: http://svn.apache.org/viewcvs?rev=169398&view=rev
Log:
we do not currently support concurrent versions of a plugin a build as there is no access to the resolved version outside of the artifact container
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=169398&r1=169397&r2=169398&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon May 9 19:57:10 2005
@@ -130,6 +130,7 @@
{
if ( artifactHandler.packageGoal() != null )
{
+ // TODO: need to inject plugin configuration here
configureMojo( artifactHandler.packageGoal(), session, phaseMap );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=169398&r1=169397&r2=169398&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Mon May 9 19:57:10 2005
@@ -86,6 +86,8 @@
private ArtifactFactory artifactFactory;
+ private Set pluginsInProcess = new HashSet();
+
public DefaultPluginManager()
{
pluginDescriptors = new HashMap();
@@ -95,23 +97,6 @@
pluginDescriptorBuilder = new PluginDescriptorBuilder();
}
- private PluginDescriptor getPluginDescriptor( String groupId, String artifactId, String version )
- {
- return (PluginDescriptor) pluginDescriptors.get(
- PluginDescriptor.constructPluginKey( groupId, artifactId, version ) );
- }
-
- private PluginDescriptor getPluginDescriptor( String prefix )
- {
- return (PluginDescriptor) pluginDescriptorsByPrefix.get( prefix );
- }
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- private Set pluginsInProcess = new HashSet();
-
// ----------------------------------------------------------------------
// Mojo discovery
// ----------------------------------------------------------------------
@@ -131,7 +116,9 @@
"' was built with Maven 2.0 Alpha 2" );
}
- String key = pluginDescriptor.getId();
+// String key = pluginDescriptor.getId();
+ // TODO: see comment in getPluginDescriptor
+ String key = pluginDescriptor.getGroupId() + ":" + pluginDescriptor.getArtifactId();
if ( !pluginsInProcess.contains( key ) )
{
@@ -152,9 +139,27 @@
//
// ----------------------------------------------------------------------
+ private PluginDescriptor getPluginDescriptor( String groupId, String artifactId, String version )
+ {
+// String key = PluginDescriptor.constructPluginKey( groupId, artifactId, version );
+ // TODO: include version, but can't do this in the plugin manager as it is not resolved to the right version
+ // at that point. Instead, move the duplication check to the artifact container, or store it locally based on
+ // the unresolved version?
+ String key = groupId + ":" + artifactId;
+ return (PluginDescriptor) pluginDescriptors.get( key );
+ }
+
+ private PluginDescriptor getPluginDescriptor( String prefix )
+ {
+ return (PluginDescriptor) pluginDescriptorsByPrefix.get( prefix );
+ }
+
private boolean isPluginInstalled( String groupId, String artifactId, String version )
{
- return pluginDescriptors.containsKey( PluginDescriptor.constructPluginKey( groupId, artifactId, version ) );
+// String key = PluginDescriptor.constructPluginKey( groupId, artifactId, version );
+ // TODO: see comment in getPluginDescriptor
+ String key = groupId + ":" + artifactId;
+ return pluginDescriptors.containsKey( key );
}
private boolean isPluginInstalled( String prefix )
Modified: maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml?rev=169398&r1=169397&r2=169398&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml Mon May 9 19:57:10 2005
@@ -6,7 +6,7 @@
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>maven-idea-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven IDEA Plugin</name>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org