You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/28 19:09:37 UTC
svn commit: r769467 - in /maven/components/branches/MNG-2766:
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: sisbell
Date: Tue Apr 28 17:09:36 2009
New Revision: 769467
URL: http://svn.apache.org/viewvc?rev=769467&view=rev
Log:
Removed references to MavenProject.injectPlugin
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java?rev=769467&r1=769466&r2=769467&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java Tue Apr 28 17:09:36 2009
@@ -66,38 +66,6 @@
return null;
}
- public void addPluginMapping( String goalPrefix,
- String artifactId )
- {
- addPluginMapping( goalPrefix, artifactId, artifactId );
- }
-
- public void addPluginMapping( String goalPrefix,
- String artifactId,
- String name )
- {
- List plugins = getMetadata().getPlugins();
- boolean found = false;
- for ( Iterator i = plugins.iterator(); i.hasNext() && !found; )
- {
- Plugin plugin = (Plugin) i.next();
- if ( plugin.getPrefix().equals( goalPrefix ) )
- {
- found = true;
- }
- }
- if ( !found )
- {
- Plugin plugin = new Plugin();
- plugin.setPrefix( goalPrefix );
- plugin.setArtifactId( artifactId );
- plugin.setName( name );
-
-
- getMetadata().addPlugin( plugin );
- }
- }
-
public Object getKey()
{
return groupId;
Modified: maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=769467&r1=769466&r2=769467&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/MNG-2766/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Tue Apr 28 17:09:36 2009
@@ -1330,40 +1330,6 @@
return build;
}
- public void addPlugin( Plugin plugin )
- {
- Build build = getModelBuild();
-
- if ( !build.getPluginsAsMap().containsKey( plugin.getKey() ) )
- {
- injectPluginManagementInfo( plugin );
-
- build.addPlugin( plugin );
-
- build.flushPluginMap();
- }
- }
-
- //TODO: remove ModelUtils
- public void injectPluginManagementInfo( Plugin plugin )
- {
- PluginManagement pm = getModelBuild().getPluginManagement();
-
- if ( pm != null )
- {
- Map<String, Plugin> pmByKey = pm.getPluginsAsMap();
-
- String pluginKey = plugin.getKey();
-
- if ( ( pmByKey != null ) && pmByKey.containsKey( pluginKey ) )
- {
- Plugin pmPlugin = pmByKey.get( pluginKey );
-
- ModelUtils.mergePluginDefinitions( plugin, pmPlugin, false );
- }
- }
- }
-
public List<MavenProject> getCollectedProjects()
{
return collectedProjects;