Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason van Zyl2013-09-28 23:07:01 -0400
committerIgor Fedorenko2013-10-06 15:08:22 -0400
commit85527e1eb1638654d8f33a7106900ef9d1158bc2 (patch)
treebb9427a78ab8b089f02085e84f33ffa90a8bfc09 /org.eclipse.m2e.refactoring
parent51cad437f6dcaf9330cfe215038bcd6edc0ff368 (diff)
downloadm2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.tar.gz
m2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.tar.xz
m2e-core-85527e1eb1638654d8f33a7106900ef9d1158bc2.zip
416882 updated m2e maven runtime to maven 3.1.1
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.refactoring')
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/dependencyset/DependencySetAction.java4
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java4
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java9
3 files changed, 8 insertions, 9 deletions
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/dependencyset/DependencySetAction.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/dependencyset/DependencySetAction.java
index 91aaaf2b..9a27bb23 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/dependencyset/DependencySetAction.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/dependencyset/DependencySetAction.java
@@ -66,9 +66,9 @@ public class DependencySetAction implements IActionDelegate {
file = getFileFromEditor();
keys.add(new ArtifactKey((Artifact) selected));
- } else*/if(selected instanceof org.sonatype.aether.graph.DependencyNode) {
+ } else*/if(selected instanceof org.eclipse.aether.graph.DependencyNode) {
file = getFileFromEditor();
- org.sonatype.aether.graph.DependencyNode selected2 = (org.sonatype.aether.graph.DependencyNode) selected;
+ org.eclipse.aether.graph.DependencyNode selected2 = (org.eclipse.aether.graph.DependencyNode) selected;
if(selected2.getData().get("LEVEL") == null) {
keys.add(new ArtifactKey(selected2.getDependency().getArtifact()));
}
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java
index f409996a..980ad1ff 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/DependencyExcludeAction.java
@@ -85,9 +85,9 @@ public class DependencyExcludeAction implements IActionDelegate {
if(selected instanceof Artifact) {
file = getFileFromEditor();
keys.add(new ArtifactKey((Artifact) selected));
- } else if(selected instanceof org.sonatype.aether.graph.DependencyNode) {
+ } else if(selected instanceof org.eclipse.aether.graph.DependencyNode) {
file = getFileFromEditor();
- keys.add(new ArtifactKey(((org.sonatype.aether.graph.DependencyNode) selected).getDependency().getArtifact()));
+ keys.add(new ArtifactKey(((org.eclipse.aether.graph.DependencyNode) selected).getDependency().getArtifact()));
} else if(selected instanceof RequiredProjectWrapper) {
RequiredProjectWrapper w = (RequiredProjectWrapper) selected;
file = getFileFromProject(w.getParentClassPathContainer().getJavaProject());
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java
index a7045baf..b939d31b 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/exclude/ExcludeArtifactRefactoring.java
@@ -20,6 +20,10 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.util.artifact.JavaScopes;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -38,11 +42,6 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.graph.DependencyVisitor;
-import org.sonatype.aether.util.artifact.JavaScopes;
-
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.m2e.core.embedder.ICallable;

Back to the top