FORGE-1382: MavenPluginFacet now returns plugin dependencies

forge · Dec 28, 2013 · 64b8b5f · 64b8b5f
1 parent 5873c69
commit 64b8b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/maven/api/src/main/java/org/jboss/forge/addon/maven/plugins/MavenPluginAdapter.java b/maven/api/src/main/java/org/jboss/forge/addon/maven/plugins/MavenPluginAdapter.java
@@ -125,6 +125,7 @@ public MavenPluginAdapter(final org.apache.maven.model.Plugin plugin)
       setConfiguration(plugin.getConfiguration());
       setExecutions(clone.getExecutions());
       setExtensions(clone.getExtensions());
+      setDependencies(clone.getDependencies());
    }
 
    @Override

diff --git a/...mpl-projects/src/main/java/org/jboss/forge/addon/maven/projects/MavenPluginFacetImpl.java b/...mpl-projects/src/main/java/org/jboss/forge/addon/maven/projects/MavenPluginFacetImpl.java
@@ -27,12 +27,8 @@
 import org.jboss.forge.addon.dependencies.builder.CoordinateBuilder;
 import org.jboss.forge.addon.dependencies.util.Dependencies;
 import org.jboss.forge.addon.facets.AbstractFacet;
-import org.jboss.forge.addon.maven.plugins.Execution;
 import org.jboss.forge.addon.maven.plugins.MavenPlugin;
 import org.jboss.forge.addon.maven.plugins.MavenPluginAdapter;
-import org.jboss.forge.addon.maven.plugins.MavenPluginBuilder;
-import org.jboss.forge.addon.maven.projects.MavenFacet;
-import org.jboss.forge.addon.maven.projects.MavenPluginFacet;
 import org.jboss.forge.addon.maven.projects.facets.exceptions.PluginNotFoundException;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.parser.java.util.Strings;
@@ -86,19 +82,7 @@ private List<MavenPlugin> listConfiguredPlugins(boolean managedPlugin, boolean e
       List<org.apache.maven.model.Plugin> pomPlugins = getPluginsPOM(managedPlugin, effectivePlugin);
       for (org.apache.maven.model.Plugin plugin : pomPlugins)
       {
-         MavenPluginAdapter adapter = new MavenPluginAdapter(plugin);
-         MavenPluginBuilder pluginBuilder = MavenPluginBuilder
-                  .create()
-                  .setCoordinate(
-                           CoordinateBuilder.create().setGroupId(plugin.getGroupId())
-                                    .setArtifactId(plugin.getArtifactId()).setVersion(plugin.getVersion()))
-
-                  .setConfiguration(adapter.getConfig());
-         for (Execution execution : adapter.listExecutions())
-         {
-            pluginBuilder.addExecution(execution);
-         }
-         plugins.add(pluginBuilder);
+         plugins.add(new MavenPluginAdapter(plugin));
       }
       return plugins;
    }