Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason van Zyl2013-09-28 23:07:19 -0400
committerIgor Fedorenko2013-10-06 17:33:38 -0400
commitb29933bbb8cf2659d05d42e288c9c14ba7a416ea (patch)
treeeb493754e8711549d8e8fdf20b25089a24f72828 /org.eclipse.m2e.launching
parent85527e1eb1638654d8f33a7106900ef9d1158bc2 (diff)
downloadm2e-core-b29933bbb8cf2659d05d42e288c9c14ba7a416ea.tar.gz
m2e-core-b29933bbb8cf2659d05d42e288c9c14ba7a416ea.tar.xz
m2e-core-b29933bbb8cf2659d05d42e288c9c14ba7a416ea.zip
418263 Replaced netty/ahc with okhttp
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.launching')
-rw-r--r--org.eclipse.m2e.launching/build.properties1
-rw-r--r--org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jarbin0 -> 5928 bytes
-rw-r--r--org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java4
3 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.m2e.launching/build.properties b/org.eclipse.m2e.launching/build.properties
index a2e0058c..f6ea9b9e 100644
--- a/org.eclipse.m2e.launching/build.properties
+++ b/org.eclipse.m2e.launching/build.properties
@@ -16,6 +16,7 @@ bin.includes = META-INF/,\
icons/,\
org.eclipse.m2e.cliresolver.jar,\
org.eclipse.m2e.cliresolver30.jar,\
+ org.eclipse.m2e.cliresolver31.jar,\
about.html,\
schema/
jars.compile.order = .
diff --git a/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar b/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar
new file mode 100644
index 00000000..d42ed596
--- /dev/null
+++ b/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar
Binary files differ
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
index 44761cc1..98076317 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
@@ -64,8 +64,10 @@ public class MavenLaunchUtils {
public static String getCliResolver(MavenRuntime runtime) throws CoreException {
String jarname;
String runtimeVersion = runtime.getVersion();
- if(runtimeVersion.startsWith("3.")) { //$NON-NLS-1$
+ if(runtimeVersion.startsWith("3.0")) { //$NON-NLS-1$
jarname = "org.eclipse.m2e.cliresolver30.jar"; //$NON-NLS-1$
+ } else if(runtimeVersion.startsWith("3.")) { //$NON-NLS-1$
+ jarname = "org.eclipse.m2e.cliresolver31.jar"; //$NON-NLS-1$
} else {
jarname = "org.eclipse.m2e.cliresolver.jar"; //$NON-NLS-1$
}

Back to the top