From ea432ab47e2dddc985a348cdfe6dc654e046d102 Mon Sep 17 00:00:00 2001 From: vladt Date: Thu, 17 Feb 2011 11:57:48 -0500 Subject: Cleanup --- org.eclipse.m2e.core/build.properties | 3 --- .../src/org/eclipse/m2e/scm/MavenProjectPomScanner.java | 1 - .../eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java | 2 -- 3 files changed, 6 deletions(-) diff --git a/org.eclipse.m2e.core/build.properties b/org.eclipse.m2e.core/build.properties index 67bbb7d5..6188acf8 100644 --- a/org.eclipse.m2e.core/build.properties +++ b/org.eclipse.m2e.core/build.properties @@ -14,10 +14,7 @@ bin.includes = plugin.xml,\ about.ini,\ plugin.properties,\ .options,\ - icons/,\ - m2eclipse.gif,\ .,\ - intro/,\ schema/,\ about.html jars.compile.order = . diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java index f734e635..e2a54226 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java @@ -32,7 +32,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.internal.Messages; import org.eclipse.m2e.core.project.AbstractProjectScanner; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java index 8137f908..52de1b47 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java @@ -18,7 +18,6 @@ import java.util.List; import org.apache.maven.model.Dependency; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil; @@ -133,7 +132,6 @@ public class MavenMaterializePomWizard extends AbstractMavenProjectWizard implem MavenProjectCheckoutJob job = new MavenProjectCheckoutJob(importConfiguration, checkoutAllProjects, workingSets) { protected List getProjects(IProgressMonitor monitor) throws InterruptedException { - MavenPlugin plugin = MavenPlugin.getDefault(); MavenProjectPomScanner scanner = new MavenProjectPomScanner( developer, dependencies); scanner.run(monitor); -- cgit v1.2.3