moved maven runtime to separate source tree

mostly working implementation

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

75 files changed, 20 insertions, 3256 deletions

diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
index 98797939..c62d0103 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
@@ -154,6 +154,7 @@ import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.MavenPluginActivator;
 import org.eclipse.m2e.core.internal.Messages;
 import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants;
+import org.eclipse.m2e.maven.runtime.internal.M2EMavenRuntime;
 
 
 public class MavenImpl implements IMaven, IMavenConfigurationChangeListener {
@@ -1103,7 +1104,7 @@ public class MavenImpl implements IMaven, IMavenConfigurationChangeListener {
 
   private static DefaultPlexusContainer newPlexusContainer() throws PlexusContainerException {
     ContainerConfiguration mavenCoreCC = new DefaultContainerConfiguration().setClassWorld(
-        new ClassWorld(MAVEN_CORE_REALM_ID, ClassWorld.class.getClassLoader())).setName(
+        new ClassWorld(MAVEN_CORE_REALM_ID, M2EMavenRuntime.class.getClassLoader())).setName(
         "mavenCore"); //$NON-NLS-1$
 
     mavenCoreCC.setAutoWiring(true);
diff --git a/org.eclipse.m2e.maven.plexus-utils/.classpath b/org.eclipse.m2e.maven.plexus-utils/.classpath
deleted file mode 100644
index d2febfb6..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-utils-2.0.6.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.m2e.maven.plexus-utils/.gitignore b/org.eclipse.m2e.maven.plexus-utils/.gitignore
deleted file mode 100644
index 5e56e040..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/org.eclipse.m2e.maven.plexus-utils/.project b/org.eclipse.m2e.maven.plexus-utils/.project
deleted file mode 100644
index e0f06f3f..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.m2e.maven.runtime.plexus-utils</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.m2e.maven.plexus-utils/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.maven.plexus-utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9091179e..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue May 03 22:36:57 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.m2e.maven.plexus-utils/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.plexus-utils/META-INF/MANIFEST.MF
deleted file mode 100644
index 20d514f1..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Plexus-utils
-Bundle-SymbolicName: org.eclipse.m2e.maven.runtime.plexus-utils
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: jars/plexus-utils-2.0.6.jar
-Export-Package: org.codehaus.plexus.util,
- org.codehaus.plexus.util.cli,
- org.codehaus.plexus.util.cli.shell,
- org.codehaus.plexus.util.dag,
- org.codehaus.plexus.util.introspection,
- org.codehaus.plexus.util.io,
- org.codehaus.plexus.util.reflection,
- org.codehaus.plexus.util.xml,
- org.codehaus.plexus.util.xml.pull
diff --git a/org.eclipse.m2e.maven.plexus-utils/build.properties b/org.eclipse.m2e.maven.plexus-utils/build.properties
deleted file mode 100644
index 51baedc4..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = META-INF/,\
-               jars/plexus-utils-2.0.6.jar
-jars.compile.order = 
diff --git a/org.eclipse.m2e.maven.plexus-utils/jars/plexus-utils-2.0.6.jar b/org.eclipse.m2e.maven.plexus-utils/jars/plexus-utils-2.0.6.jar
deleted file mode 100644
index 25002a4b..00000000
--- a/org.eclipse.m2e.maven.plexus-utils/jars/plexus-utils-2.0.6.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/.classpath b/org.eclipse.m2e.maven.runtime.aether/.classpath
deleted file mode 100644
index c8350676..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.m2e.maven.runtime.aether/.gitignore b/org.eclipse.m2e.maven.runtime.aether/.gitignore
deleted file mode 100644
index 5e56e040..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/org.eclipse.m2e.maven.runtime.aether/.project b/org.eclipse.m2e.maven.runtime.aether/.project
deleted file mode 100644
index 6198a292..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.m2e.maven.runtime.aether</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.m2e.maven.runtime.aether/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.maven.runtime.aether/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ed1e5641..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue May 03 22:28:23 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.m2e.maven.runtime.aether/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime.aether/META-INF/MANIFEST.MF
deleted file mode 100644
index 1b198aa2..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Aether
-Bundle-SymbolicName: org.eclipse.m2e.maven.runtime.aether
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.m2e.maven.runtime.aether/build.properties b/org.eclipse.m2e.maven.runtime.aether/build.properties
deleted file mode 100644
index d1fd18c5..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = META-INF/
-jars.compile.order = 
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-api-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-api-1.11.jar
deleted file mode 100644
index 5bdade87..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-api-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-asynchttpclient-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-asynchttpclient-1.11.jar
deleted file mode 100644
index e422c92a..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-asynchttpclient-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-wagon-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-wagon-1.11.jar
deleted file mode 100644
index b5bf1b80..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-connector-wagon-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-impl-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-impl-1.11.jar
deleted file mode 100644
index 8ce9f131..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-impl-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-spi-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-spi-1.11.jar
deleted file mode 100644
index 8fb66034..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-spi-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.aether/jars/aether-util-1.11.jar b/org.eclipse.m2e.maven.runtime.aether/jars/aether-util-1.11.jar
deleted file mode 100644
index 9f517eae..00000000
--- a/org.eclipse.m2e.maven.runtime.aether/jars/aether-util-1.11.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/.classpath b/org.eclipse.m2e.maven.runtime.sisu/.classpath
deleted file mode 100644
index acad1c22..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.m2e.maven.runtime.sisu/.gitignore b/org.eclipse.m2e.maven.runtime.sisu/.gitignore
deleted file mode 100644
index 934e0e06..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin
-/target
diff --git a/org.eclipse.m2e.maven.runtime.sisu/.project b/org.eclipse.m2e.maven.runtime.sisu/.project
deleted file mode 100644
index 9ccba0b4..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.m2e.maven.runtime.sisu</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.m2e.maven.runtime.sisu/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.maven.runtime.sisu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cd974707..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue May 03 23:45:26 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/org.eclipse.m2e.maven.runtime.sisu/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime.sisu/META-INF/MANIFEST.MF
deleted file mode 100644
index ad3a252d..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,174 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: com.google.inject.internal;uses:="com.google.inject.in
- ternal.util,com.google.inject.spi,com.google.inject,com.google.inject
- .name,javax.inject,com.google.inject.binder,com.google.inject.matcher
- ,com.google.inject.util,org.slf4j";version="0.13.0.SNAPSHOT",com.goog
- le.inject.internal.util;version="0.13.0.SNAPSHOT",com.google.inject.n
- ame;uses:="com.google.inject,com.google.inject.internal.util,com.goog
- le.inject.binder";version="1.3",com.google.inject.spi;uses:="com.goog
- le.inject,com.google.inject.internal.util,com.google.inject.binder,co
- m.google.inject.matcher,com.google.inject.internal,javax.inject";vers
- ion="1.3",com.google.inject.matcher;uses:="com.google.inject.internal
- .util";version="1.3",com.google.inject.binder;uses:="javax.inject,com
- .google.inject";version="1.3",com.google.inject.util;uses:="com.googl
- e.inject,com.google.inject.spi,com.google.inject.internal.util,com.go
- ogle.inject.internal,javax.inject";version="1.3",com.google.inject;us
- es:="com.google.inject.internal.util,com.google.inject.binder,com.goo
- gle.inject.spi,com.google.inject.matcher,com.google.inject.internal,j
- avax.inject,com.google.inject.util";version="1.3",org.sonatype.inject
- ;uses:="javax.inject";version="0.13.0.SNAPSHOT",org.sonatype.guice.pl
- exus.converters;uses:="com.google.inject.spi,com.google.inject.matche
- r,com.google.inject,org.codehaus.plexus.util.xml.pull,org.sonatype.gu
- ice.plexus.config,javax.inject,org.sonatype.guice.bean.reflect";versi
- on="0.13.0.SNAPSHOT",org.sonatype.guice.bean.scanners;uses:="org.sona
- type.guice.bean.scanners.asm,org.sonatype.guice.bean.reflect,javax.in
- ject";version="0.13.0.SNAPSHOT",org.sonatype.guice.bean.scanners.asm;
- version="0.13.0.SNAPSHOT",org.sonatype.guice.plexus.config;uses:="org
- .codehaus.plexus.component.annotations,com.google.inject,org.sonatype
- .guice.bean.reflect,com.google.inject.name";version="0.13.0.SNAPSHOT"
- ,org.sonatype.guice.bean.converters;uses:="com.google.inject.spi,com.
- google.inject.matcher,org.sonatype.guice.bean.reflect,com.google.inje
- ct";version="0.13.0.SNAPSHOT",org.sonatype.guice.bean.inject;uses:="c
- om.google.inject.spi,com.google.inject,org.sonatype.guice.bean.reflec
- t";version="0.13.0.SNAPSHOT",org.sonatype.guice.bean.binders;uses:="o
- rg.sonatype.guice.bean.locators,javax.inject,com.google.inject,org.so
- natype.inject,com.google.inject.spi,org.sonatype.guice.bean.reflect,c
- om.google.inject.name,com.google.inject.binder,com.google.inject.util
- ,com.google.inject.matcher,org.sonatype.guice.bean.scanners,javax.ent
- erprise.inject,org.sonatype.guice.bean.converters";version="0.13.0.SN
- APSHOT",org.sonatype.guice.bean.locators.spi;uses:="com.google.inject
- ";version="0.13.0.SNAPSHOT",org.sonatype.guice.plexus.scanners;uses:=
- "org.sonatype.guice.bean.scanners.asm,org.sonatype.guice.bean.reflect
- ,org.codehaus.plexus.component.annotations,org.sonatype.guice.plexus.
- annotations,org.sonatype.guice.plexus.config,org.codehaus.plexus.util
- ,org.sonatype.guice.bean.scanners,com.google.inject.spi,com.google.in
- ject,org.codehaus.plexus.util.xml.pull,org.codehaus.plexus.util.xml";
- version="0.13.0.SNAPSHOT",org.sonatype.guice.plexus.binders;uses:="or
- g.sonatype.guice.bean.inject,javax.inject,org.sonatype.guice.bean.ref
- lect,org.codehaus.plexus.component.annotations,org.sonatype.guice.ple
- xus.scanners,org.sonatype.guice.plexus.config,com.google.inject,org.s
- onatype.guice.bean.scanners,com.google.inject.spi,com.google.inject.m
- atcher,org.sonatype.guice.bean.locators,org.sonatype.guice.bean.binde
- rs,com.google.inject.binder";version="0.13.0.SNAPSHOT",org.sonatype.g
- uice.bean.reflect;uses:="javax.inject,com.google.inject,org.osgi.fram
- ework,org.slf4j";version="0.13.0.SNAPSHOT",org.sonatype.guice.plexus.
- annotations;uses:="org.codehaus.plexus.component.annotations,org.sona
- type.guice.plexus.config,org.sonatype.guice.bean.reflect";version="0.
- 13.0.SNAPSHOT",org.sonatype.guice.plexus.locators;uses:="org.codehaus
- .plexus.classworlds.realm,org.sonatype.guice.plexus.config,com.google
- .inject.name,org.sonatype.guice.bean.locators,javax.inject,com.google
- .inject,org.sonatype.inject";version="0.13.0.SNAPSHOT",org.sonatype.g
- uice.bean.locators;uses:="org.sonatype.inject,com.google.inject,org.s
- onatype.guice.bean.locators.spi,javax.inject,com.google.inject.spi,or
- g.sonatype.guice.bean.reflect,com.google.inject.name";version="0.13.0
- .SNAPSHOT",org.codehaus.plexus.component.factory;uses:="org.codehaus.
- plexus,org.codehaus.classworlds,org.codehaus.plexus.classworlds.realm
- ,org.codehaus.plexus.component.repository";version="0.13.0.SNAPSHOT",
- org.codehaus.plexus.component.configurator.converters;uses:="org.code
- haus.plexus.configuration,org.codehaus.plexus.component.configurator.
- expression,org.codehaus.plexus.component.configurator,org.codehaus.pl
- exus.component.configurator.converters.lookup,org.codehaus.plexus.uti
- l";version="0.13.0.SNAPSHOT",org.codehaus.plexus.configuration.xml;us
- es:="org.codehaus.plexus.configuration,org.codehaus.plexus.util.xml";
- version="0.13.0.SNAPSHOT",org.codehaus.plexus;uses:="org.codehaus.ple
- xus.component.annotations,org.sonatype.guice.plexus.config,org.codeha
- us.plexus.component.repository,org.sonatype.guice.bean.reflect,org.co
- dehaus.plexus.component.factory,org.codehaus.plexus.classworlds.realm
- ,org.sonatype.guice.plexus.binders,javax.inject,com.google.inject,org
- .sonatype.guice.plexus.annotations,org.codehaus.plexus.classworlds,co
- m.google.inject.name,com.google.inject.binder,org.sonatype.guice.bean
- .binders,org.codehaus.plexus.context,org.sonatype.guice.bean.locators
- ,com.google.inject.util,org.sonatype.guice.plexus.converters,org.code
- haus.plexus.logging,org.codehaus.plexus.component.repository.exceptio
- n,org.sonatype.guice.plexus.locators,org.codehaus.plexus.logging.cons
- ole,org.codehaus.plexus.configuration,org.codehaus.plexus.component.c
- omposition,org.sonatype.guice.bean.inject,org.slf4j,org.codehaus.plex
- us.personality.plexus.lifecycle.phase";version="0.13.0.SNAPSHOT",org.
- codehaus.plexus.logging;uses:="org.sonatype.guice.bean.reflect,org.so
- natype.guice.plexus.config,org.codehaus.plexus.personality.plexus.lif
- ecycle.phase";version="0.13.0.SNAPSHOT",org.codehaus.plexus.personali
- ty.plexus.lifecycle.phase;uses:="org.codehaus.plexus.configuration,or
- g.codehaus.plexus.context,org.codehaus.plexus,org.codehaus.plexus.com
- ponent.repository.exception";version="0.13.0.SNAPSHOT",org.codehaus.p
- lexus.component.configurator.converters.lookup;uses:="org.codehaus.pl
- exus.component.configurator.converters,org.codehaus.plexus.component.
- configurator,org.codehaus.plexus.component.configurator.converters.co
- mposite,org.codehaus.plexus.component.configurator.converters.basic";
- version="0.13.0.SNAPSHOT",org.codehaus.plexus.classworlds.strategy;us
- es:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.classw
- orlds";version="0.13.0.SNAPSHOT",org.codehaus.plexus.logging.console;
- uses:="org.codehaus.plexus.logging";version="0.13.0.SNAPSHOT",org.cod
- ehaus.plexus.component;uses:="org.codehaus.plexus.component.repositor
- y,org.codehaus.plexus.component.configurator";version="0.13.0.SNAPSHO
- T",org.codehaus.plexus.component.configurator;uses:="org.codehaus.ple
- xus.configuration,org.codehaus.classworlds,org.codehaus.plexus.classw
- orlds.realm,org.codehaus.plexus.component.configurator.expression,org
- .codehaus.plexus.component.configurator.converters.lookup,org.codehau
- s.plexus.component.configurator.converters.composite,org.codehaus.ple
- xus.component.configurator.converters,org.codehaus.plexus.component.c
- onfigurator.converters.special,org.codehaus.plexus.component";version
- ="0.13.0.SNAPSHOT",org.codehaus.plexus.component.configurator.convert
- ers.composite;uses:="org.codehaus.plexus.configuration,org.codehaus.p
- lexus.component.configurator.converters,org.codehaus.plexus.component
- .configurator.expression,org.codehaus.plexus.component.configurator,o
- rg.codehaus.plexus.configuration.xml,org.codehaus.plexus.component.co
- nfigurator.converters.lookup,org.codehaus.plexus.util,org.codehaus.pl
- exus.component.configurator.converters.basic";version="0.13.0.SNAPSHO
- T",org.codehaus.plexus.classworlds;uses:="org.codehaus.plexus.classwo
- rlds.realm";version="0.13.0.SNAPSHOT",org.codehaus.plexus.component.c
- omposition;version="0.13.0.SNAPSHOT",org.codehaus.plexus.classworlds.
- launcher;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.pl
- exus.classworlds";version="0.13.0.SNAPSHOT",org.codehaus.plexus.compo
- nent.configurator.expression;version="0.13.0.SNAPSHOT",org.codehaus.p
- lexus.component.configurator.converters.basic;uses:="org.codehaus.ple
- xus.configuration,org.codehaus.plexus.component.configurator.converte
- rs,org.codehaus.plexus.component.configurator.expression,org.codehaus
- .plexus.component.configurator,org.codehaus.plexus.component.configur
- ator.converters.lookup";version="0.13.0.SNAPSHOT",org.codehaus.classw
- orlds;uses:="org.codehaus.plexus.classworlds.realm,org.codehaus.plexu
- s.classworlds,org.codehaus.plexus.classworlds.launcher";version="0.13
- .0.SNAPSHOT",org.codehaus.plexus.classworlds.realm;uses:="org.codehau
- s.plexus.classworlds.strategy,org.codehaus.plexus.classworlds";versio
- n="0.13.0.SNAPSHOT",org.codehaus.plexus.context;version="0.13.0.SNAPS
- HOT",org.codehaus.plexus.component.repository.exception;version="0.13
- .0.SNAPSHOT",org.codehaus.plexus.component.configurator.converters.sp
- ecial;uses:="org.codehaus.plexus.configuration,org.codehaus.classworl
- ds,org.codehaus.plexus.classworlds.realm,org.codehaus.plexus.componen
- t.configurator.converters,org.codehaus.plexus.component.configurator.
- expression,org.codehaus.plexus.component.configurator,org.codehaus.pl
- exus.component.configurator.converters.lookup";version="0.13.0.SNAPSH
- OT",org.codehaus.plexus.configuration;version="0.13.0.SNAPSHOT",org.c
- odehaus.plexus.component.annotations;version="0.13.0.SNAPSHOT",org.co
- dehaus.plexus.component.repository;uses:="org.codehaus.plexus.configu
- ration,org.codehaus.plexus.classworlds.realm,org.sonatype.guice.plexu
- s.config";version="0.13.0.SNAPSHOT",javax.enterprise.inject;version="
- 0.13.0.SNAPSHOT",javax.inject;version="0.13.0.SNAPSHOT"
-Ignore-Package: junit.framework
-Bundle-ClassPath: .,guice-bean-converters-2.0.0.jar,plexus-classworlds
- -2.4.jar,guice-bean-reflect-2.0.0.jar,javax.inject-1.jar,guice-plexus
- -scanners-2.0.0.jar,guice-bean-binders-2.0.0.jar,guice-plexus-binders
- -2.0.0.jar,guice-bean-inject-2.0.0.jar,guice-plexus-shim-2.0.0.jar,si
- su-guice-2.9.4-no_aop.jar,guice-bean-locators-2.0.0.jar,plexus-compon
- ent-annotations-1.5.5.jar,guice-bean-scanners-2.0.0.jar,guice-plexus-
- converters-2.0.0.jar,guice-plexus-metadata-2.0.0.jar,guice-plexus-loc
- ators-2.0.0.jar
-Built-By: igor
-Tool: Bnd-1.43.0
-Bundle-Name: org.eclipse.m2e.maven.runtime.sisu
-Created-By: Apache Maven Bundle Plugin
-Bundle-Vendor: Sonatype, Inc.
-Build-Jdk: 1.6.0_25
-Bundle-Version: 0.13.0.SNAPSHOT
-Bnd-LastModified: 1304482336594
-Embed-Transitive: true
-Bundle-ManifestVersion: 2
-Bundle-Description: Maven Integration for Eclipse provides tight integ
- ration		for Maven into the IDE
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
-Embed-Dependency: *;scope=compile
-Bundle-DocURL: http://www.sonatype.com
-Import-Package: org.codehaus.plexus.util,org.codehaus.plexus.util.xml,
- org.codehaus.plexus.util.xml.pull,org.osgi.framework,org.slf4j
-Bundle-SymbolicName: org.eclipse.m2e.org.eclipse.m2e.maven.runtime.sis
- u
-
diff --git a/org.eclipse.m2e.maven.runtime.sisu/build.properties b/org.eclipse.m2e.maven.runtime.sisu/build.properties
deleted file mode 100644
index 7a7ae6eb..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = META-INF/,\
-               jars/
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-binders-2.0.0.jar
deleted file mode 100644
index d902a9dd..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-binders-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-converters-2.0.0.jar
deleted file mode 100644
index d78b2ee9..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-converters-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-inject-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-inject-2.0.0.jar
deleted file mode 100644
index f20c2095..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-inject-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-locators-2.0.0.jar
deleted file mode 100644
index 89892874..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-locators-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-reflect-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-reflect-2.0.0.jar
deleted file mode 100644
index ba284249..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-reflect-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-scanners-2.0.0.jar
deleted file mode 100644
index d286ecc6..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-bean-scanners-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-binders-2.0.0.jar
deleted file mode 100644
index 5d01444e..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-binders-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-converters-2.0.0.jar
deleted file mode 100644
index ab2839a1..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-converters-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-locators-2.0.0.jar
deleted file mode 100644
index cc387466..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-locators-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-metadata-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-metadata-2.0.0.jar
deleted file mode 100644
index 17e04d71..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-metadata-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-scanners-2.0.0.jar
deleted file mode 100644
index c577291f..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-scanners-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-shim-2.0.0.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-shim-2.0.0.jar
deleted file mode 100644
index db7036de..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/guice-plexus-shim-2.0.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/javax.inject-1.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/javax.inject-1.jar
deleted file mode 100644
index b2a9d0bf..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/javax.inject-1.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-classworlds-2.4.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-classworlds-2.4.jar
deleted file mode 100644
index ef07b83a..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-classworlds-2.4.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-component-annotations-1.5.5.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-component-annotations-1.5.5.jar
deleted file mode 100644
index e4de16fe..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/plexus-component-annotations-1.5.5.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/jarss/sisu-guice-2.9.4-no_aop.jar b/org.eclipse.m2e.maven.runtime.sisu/jarss/sisu-guice-2.9.4-no_aop.jar
deleted file mode 100644
index 4ccd861a..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/jarss/sisu-guice-2.9.4-no_aop.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime.sisu/pom.xml b/org.eclipse.m2e.maven.runtime.sisu/pom.xml
deleted file mode 100644
index bf3262a8..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2008 Sonatype, Inc.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.m2e</groupId>
-    <artifactId>org.eclipse.m2e.parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../org.eclipse.m2e.parent</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.m2e.maven.runtime.sisu</artifactId>
-
-  <properties>
-    <sisu.version>2.0.0</sisu.version>
-    <classworlds.version>2.4</classworlds.version>
-    <sisu-guice.version>2.9.4</sisu-guice.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.sisu.inject</groupId>
-      <artifactId>guice-plexus-shim</artifactId>
-      <version>${sisu.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.sonatype.sisu</groupId>
-          <artifactId>sisu-guice</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <version>${sisu-guice.version}</version>
-      <classifier>no_aop</classifier>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-classworlds</artifactId>
-        <version>${classworlds.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.5-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>bundle</id>
-            <phase>package</phase>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <instructions>
-            <Embed-Dependency>*;scope=compile</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <_exportcontents>
-              com.google.inject.*,
-              org.sonatype.*,
-              org.codehaus.*,
-              javax.*,
-            </_exportcontents>
-            <Import-Package>!junit.framework,*</Import-Package>
-          </instructions>
-          <manifestLocation>META-INF</manifestLocation>
-          <excludeDependencies>aopalliance,plexus-utils</excludeDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/org.eclipse.m2e.maven.runtime.sisu/update-jars-pom.xml b/org.eclipse.m2e.maven.runtime.sisu/update-jars-pom.xml
deleted file mode 100644
index 1111f39f..00000000
--- a/org.eclipse.m2e.maven.runtime.sisu/update-jars-pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2008 Sonatype, Inc.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <!--
-    To include new embedded runtime, 
-
-    * update <maven.version/> and related properties
-    * run the command below from CLI
-    * add ``local-patches.jar'' (without quotes) at the beginning of Bundle-ClassPath manifest attribute
-    * add ``Require-Bundle: com.ning.async-http-client;bundle-version="1.6.0"'' (without quotes) to the manifest
-    * right-click on the project in Eclipse, PDE->Update Classpath
-    * project->clean...->all
-
-    rm -f jars/*; /opt/maven/bin/mvn -e -f update-jars-pom.xml process-classes 
-   -->
-
-  <properties>
-    <sisu.version>2.0.0</sisu.version>
-    <classworlds.version>2.4</classworlds.version>
-    <sisu-guice.version>2.9.4</sisu-guice.version>
-  </properties>
-
-  <groupId>org.eclipse.m2e</groupId>
-  <artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-  <version>0.13.0-SNAPSHOT</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.sisu.inject</groupId>
-      <artifactId>guice-plexus-shim</artifactId>
-      <version>${sisu.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.sonatype.sisu</groupId>
-          <artifactId>sisu-guice</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <version>${sisu-guice.version}</version>
-      <classifier>no_aop</classifier>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-classworlds</artifactId>
-        <version>${classworlds.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>0.12.0</version>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>generate-bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <packageSources>false</packageSources>
-          <exportPackages>
-            com.google.inject.*,
-            org.sonatype.*,
-            org.codehaus.*,
-            javax.*,
-          </exportPackages>
-          <manifestAttributes>
-            <Bundle-RequiredExecutionEnvironment>J2SE-1.5, JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-          </manifestAttributes>
-
-          <exclusions>
-            <exclusion>
-              <groupId>aopalliance</groupId>
-              <artifactId>aopalliance</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.sonatype.sisu</groupId>
-              <artifactId>sisu-guice</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.codehaus.plexus</groupId>
-              <artifactId>plexus-utils</artifactId>
-            </exclusion>
-          </exclusions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath
index 1e696db0..00e032c3 100644
--- a/org.eclipse.m2e.maven.runtime/.classpath
+++ b/org.eclipse.m2e.maven.runtime/.classpath
@@ -1,50 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/maven-3.0.3"/>
-	<classpathentry kind="src" path="src/aether-1.12"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-embedder-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-settings-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-plugin-api-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-model-builder-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-sec-dispatcher-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-cipher-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-core-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-model-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-settings-builder-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-repository-metadata-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-artifact-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-aether-provider-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-interpolation-1.14.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/maven-compat-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/commons-cli-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/wagon-file-1.0-beta-7.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-shim-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-component-annotations-1.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/javax.inject-1.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-reflect-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-inject-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-locators-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-binders-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-scanners-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-bean-converters-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-metadata-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-converters-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-locators-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-binders-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/guice-plexus-scanners-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-classworlds-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-utils-2.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/sisu-guice-2.9.4-no_aop.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/plexus-build-api-0.0.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-api-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-spi-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-util-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/wagon-provider-api-1.0-beta-6.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-impl-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.2.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
index fefdf247..20e5a582 100644
--- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
@@ -1,149 +1,14 @@
 Manifest-Version: 1.0
-Export-Package: org.codehaus.plexus.component.factory,org.sonatype.aet
- her.util.filter,org.sonatype.aether.util.version,org.sonatype.aether,
- org.sonatype.aether.metadata,org.apache.maven.toolchain.model.io.xpp3
- ,org.apache.maven.artifact.repository.metadata,org.sonatype.aether.co
- llection,org.codehaus.plexus.configuration.xml,org.apache.maven.artif
- act.installer,org.sonatype.aether.connector.wagon,com.google.inject.i
- nternal,org.codehaus.plexus.util,org.codehaus.plexus.util.dag,org.cod
- ehaus.plexus,org.apache.maven.wagon.providers.file,org.apache.maven.a
- rtifact.metadata,org.apache.maven.model.inheritance,org.sonatype.aeth
- er.spi.connector,org.apache.maven.artifact.repository.metadata.io,org
- .apache.maven.model.profile,org.apache.maven.wagon.repository,org.apa
- che.maven.repository.legacy.resolver.transform,org.apache.maven.model
- .management,org.sonatype.aether.util.graph.selector,org.apache.maven.
- repository,org.apache.maven.wagon.resource,org.codehaus.plexus.interp
- olation.object,org.sonatype.aether.repository,org.apache.maven.artifa
- ct.repository.metadata.io.xpp3,org.apache.maven.monitor.logging,org.a
- pache.maven.classrealm,org.apache.maven.repository.legacy.resolver,or
- g.apache.maven.wagon,org.sonatype.aether.util.graph,org.apache.maven.
- reporting,org.codehaus.plexus.classworlds.strategy,org.sonatype.aethe
- r.util,org.codehaus.plexus.logging.console,org.codehaus.plexus.compon
- ent,org.apache.maven.usability.plugin.io.xpp3,org.apache.maven.settin
- gs.validation,org.codehaus.plexus.component.configurator,org.apache.m
- aven.model.resolution,org.sonatype.aether.spi.locator,org.sonatype.pl
- exus.components.sec.dispatcher.model.io.xpp3,org.apache.maven.reposit
- ory.legacy.metadata,org.apache.maven.artifact.repository.layout,org.c
- odehaus.plexus.util.reflection,org.apache.maven.lifecycle,com.google.
- inject.internal.util,org.sonatype.aether.util.graph.transformer,org.c
- odehaus.plexus.util.xml,org.sonatype.aether.spi.localrepo,org.sonatyp
- e.plexus.build.incremental,org.apache.maven.artifact.resolver,org.cod
- ehaus.plexus.interpolation.reflection,org.apache.maven.plugin.interna
- l,org.apache.maven.settings,org.sonatype.aether.impl,org.apache.maven
- .toolchain,org.sonatype.aether.spi.io,org.apache.maven.model.profile.
- activation,org.apache.maven.properties.internal,org.apache.maven.mode
- l.building,org.sonatype.aether.util.concurrency,org.apache.maven.repo
- sitory.legacy.repository,org.codehaus.plexus.util.xml.pull,org.codeha
- us.plexus.util.introspection,org.apache.maven.artifact.handler.manage
- r,org.apache.maven.cli,org.apache.maven.lifecycle.mapping,org.apache.
- maven.plugin.version.internal,org.apache.maven.profiles.io.xpp3,org.s
- onatype.aether.installation,org.codehaus.plexus.component.repository.
- exception,org.sonatype.aether.connector.async,org.apache.maven.wagon.
- authorization,org.apache.maven.plugin.lifecycle,org.codehaus.plexus.c
- omponent.configurator.converters.special,org.apache.maven.plugin.life
- cycle.io.xpp3,org.codehaus.plexus.configuration,org.codehaus.plexus.u
- til.cli.shell,org.apache.maven.messages,org.apache.maven.model,org.ap
- ache.maven.artifact.factory,org.apache.maven.repository.legacy,org.ap
- ache.maven.settings.crypto,org.codehaus.plexus.component.repository,o
- rg.apache.maven.wagon.proxy,com.google.inject,org.apache.maven.wagon.
- events,org.apache.maven.toolchain.java,org.codehaus.plexus.util.cli,o
- rg.sonatype.aether.transfer,org.apache.maven.model.plugin,org.apache.
- maven.exception,org.codehaus.plexus.component.configurator.converters
- ,org.apache.maven.plugin.logging,org.apache.maven.plugin.prefix.inter
- nal,org.apache.maven.plugin.descriptor,org.sonatype.aether.version,or
- g.apache.maven.usability.plugin,org.apache.maven.configuration.intern
- al,org.apache.maven.artifact.versioning,org.codehaus.plexus.interpola
- tion,org.codehaus.plexus.logging,org.apache.maven.profiles,org.apache
- .maven.repository.internal,org.apache.maven.model.locator,org.apache.
- maven.eventspy,org.apache.maven.model.validation,org.sonatype.aether.
- util.repository,org.apache.maven.model.normalization,org.sonatype.aet
- her.util.layout,org.apache.maven.artifact.resolver.filter,org.apache.
- maven.model.superpom,org.codehaus.plexus.interpolation.multi,org.apac
- he.maven.execution,org.sonatype.aether.artifact,org.apache.maven.arti
- fact.repository,org.sonatype.aether.util.metadata,org.codehaus.plexus
- .personality.plexus.lifecycle.phase,org.codehaus.plexus.component.con
- figurator.converters.lookup,org.apache.maven.plugin.version,org.apach
- e.maven.artifact.deployer,org.sonatype.aether.spi.log,org.apache.mave
- n.settings.io,org.apache.maven.profiles.activation,META-INF.plexus,or
- g.apache.maven.settings.io.xpp3,org.codehaus.plexus.interpolation.uti
- l,org.apache.maven.project.validation,org.apache.maven.artifact.handl
- er,org.apache.maven.model.interpolation,org.sonatype.aether.util.grap
- h.manager,org.apache.maven.wagon.authentication,org.apache.maven.sett
- ings.merge,org.codehaus.plexus.component.configurator.converters.comp
- osite,org.codehaus.plexus.util.io,org.sonatype.aether.util.artifact,o
- rg.codehaus.plexus.classworlds,org.sonatype.aether.graph,org.codehaus
- .plexus.component.composition,org.apache.maven.model.composition,org.
- codehaus.plexus.classworlds.launcher,org.codehaus.plexus.component.co
- nfigurator.expression,org.apache.maven.project.interpolation,org.code
- haus.plexus.component.configurator.converters.basic,org.sonatype.mave
- n.wagon,org.apache.maven.project.path,org.sonatype.aether.impl.intern
- al,org.apache.maven,org.codehaus.plexus.classworlds.realm,org.apache.
- maven.artifact.manager,org.sonatype.plexus.components.cipher,org.sona
- type.aether.deployment,org.apache.maven.toolchain.model,org.apache.ma
- ven.wagon.observers,com.google.inject.name,org.codehaus.plexus.interp
- olation.os,com.google.inject.spi,org.apache.maven.plugin.prefix,org.a
- pache.maven.configuration,org.sonatype.aether.util.listener,org.apach
- e.maven.repository.legacy.resolver.conflict,org.apache.maven.model.io
- .xpp3,org.sonatype.plexus.components.sec.dispatcher,org.apache.maven.
- model.path,org.sonatype.aether.util.graph.traverser,org.codehaus.plex
- us.context,org.apache.maven.lifecycle.internal,org.apache.maven.model
- .merge,org.apache.maven.monitor.event,org.apache.maven.rtinfo.interna
- l,org.apache.maven.model.io,org.apache.maven.project,com.google.injec
- t.matcher,org.apache.maven.project.artifact,org.apache.maven.reposito
- ry.metadata,org.apache.maven.rtinfo,org.apache.maven.project.inherita
- nce,org.sonatype.plexus.components.sec.dispatcher.model,org.codehaus.
- plexus.component.annotations,org.apache.maven.artifact,org.apache.mav
- en.eventspy.internal,org.sonatype.aether.resolution,com.google.inject
- .binder,com.google.inject.util,org.apache.maven.plugin,org.apache.mav
- en.settings.building
 Bundle-Vendor: Eclipse.org - m2e
-Bundle-ClassPath: local-patches.jar,
- jars/maven-embedder-3.0.2.jar,
- jars/maven-settings-3.0.2.jar,
- jars/maven-plugin-api-3.0.2.jar,
- jars/maven-model-builder-3.0.2.jar,
- jars/plexus-sec-dispatcher-1.3.jar,
- jars/plexus-cipher-1.4.jar,
- jars/maven-core-3.0.2.jar,
- jars/maven-model-3.0.2.jar,
- jars/maven-settings-builder-3.0.2.jar,
- jars/maven-repository-metadata-3.0.2.jar,
- jars/maven-artifact-3.0.2.jar,
- jars/maven-aether-provider-3.0.2.jar,
- jars/plexus-interpolation-1.14.jar,
- jars/maven-compat-3.0.2.jar,
- jars/commons-cli-1.2.jar,
- jars/wagon-file-1.0-beta-7.jar,
- jars/guice-plexus-shim-2.0.0.jar,
- jars/plexus-component-annotations-1.5.5.jar,
- jars/javax.inject-1.jar,
- jars/guice-bean-reflect-2.0.0.jar,
- jars/guice-bean-inject-2.0.0.jar,
- jars/guice-bean-locators-2.0.0.jar,
- jars/guice-bean-binders-2.0.0.jar,
- jars/guice-bean-scanners-2.0.0.jar,
- jars/guice-bean-converters-2.0.0.jar,
- jars/guice-plexus-metadata-2.0.0.jar,
- jars/guice-plexus-converters-2.0.0.jar,
- jars/guice-plexus-locators-2.0.0.jar,
- jars/guice-plexus-binders-2.0.0.jar,
- jars/guice-plexus-scanners-2.0.0.jar,
- jars/plexus-classworlds-2.4.jar,
- jars/plexus-utils-2.0.6.jar,
- jars/sisu-guice-2.9.4-no_aop.jar,
- jars/plexus-build-api-0.0.7.jar,
- jars/aether-connector-wagon-1.11.jar,
- jars/aether-api-1.11.jar,
- jars/aether-spi-1.11.jar,
- jars/aether-util-1.11.jar,
- jars/wagon-provider-api-1.0-beta-6.jar,
- jars/aether-impl-1.11.jar,
- jars/aether-connector-asynchttpclient-1.11.jar,
- jars/wagon-ahc-1.2.0.jar
 Bundle-Version: 0.13.0.qualifier
 Bundle-Name: Embedded Maven Runtime Bundle
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.maven.runtime;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6
-Require-Bundle: com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)"
-
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
+Require-Bundle: com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)",
+ org.eclipse.m2e.maven.maven-core;bundle-version="0.13.0";visibility:=reexport,
+ org.eclipse.m2e.maven.plexus-utils;bundle-version="0.13.0";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime.aether;bundle-version="0.13.0";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime.sisu;bundle-version="0.13.0";visibility:=reexport
+Export-Package: org.eclipse.m2e.maven.runtime.internal;x-friends:="org.eclipse.m2e.core"
diff --git a/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar b/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar
deleted file mode 100644
index ce4b9fff..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar
deleted file mode 100644
index e6994bcb..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar
deleted file mode 100644
index c60fd16c..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar
deleted file mode 100644
index d2599860..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar
deleted file mode 100644
index 34935d66..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar
deleted file mode 100644
index 5aa98a97..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar
deleted file mode 100644
index 8b64b866..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar
deleted file mode 100644
index df8ffbbe..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar
deleted file mode 100644
index d074043c..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar
deleted file mode 100644
index eb579ce8..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar
deleted file mode 100644
index d9a485ce..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar
deleted file mode 100644
index 08b7c855..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar
deleted file mode 100644
index 3a01264e..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar
deleted file mode 100644
index 9227205c..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar
deleted file mode 100644
index eee5c573..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar
deleted file mode 100644
index 9dc9f64b..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar
deleted file mode 100644
index e6125b08..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar
deleted file mode 100644
index 2e59d4be..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar
deleted file mode 100644
index 246548df..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar
+++ /dev/null
diff --git a/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java b/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java
deleted file mode 100644
index 8b13300d..00000000
--- a/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.sonatype.aether.connector.async;
-
-/*******************************************************************************
- * Copyright (c) 2010-2011 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- *   http://www.eclipse.org/legal/epl-v10.html
- * The Apache License v2.0 is available at
- *   http://www.apache.org/licenses/LICENSE-2.0.html
- * You may elect to redistribute this code under either of these licenses.
- *******************************************************************************/
-
-import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.HttpResponseBodyPart;
-import com.ning.http.client.HttpResponseHeaders;
-import com.ning.http.client.HttpResponseStatus;
-import com.ning.http.client.ProgressAsyncHandler;
-import com.ning.http.client.Response;
-import org.sonatype.aether.spi.log.Logger;
-import org.sonatype.aether.transfer.TransferCancelledException;
-import org.sonatype.aether.transfer.TransferEvent;
-import org.sonatype.aether.transfer.TransferListener;
-import org.sonatype.aether.transfer.TransferResource;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * An {@link AsyncHandler} for handling asynchronous download an upload.
- *
- * @author Jeanfrancois Arcand
- */
-class CompletionHandler
-    implements ProgressAsyncHandler<Response>
-{
-    private final Logger logger;
-
-    private HttpResponseStatus status;
-
-    private HttpResponseHeaders headers;
-
-    private final ConcurrentLinkedQueue<TransferListener> listeners = new ConcurrentLinkedQueue<TransferListener>();
-
-    private final AsyncHttpClient httpClient;
-
-    private final AtomicLong byteTransfered = new AtomicLong();
-
-    private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
-
-    private final TransferResource transferResource;
-
-    private final TransferEvent.RequestType requestType;
-
-    public CompletionHandler( TransferResource transferResource, AsyncHttpClient httpClient, Logger logger,
-                              TransferEvent.RequestType requestType )
-    {
-        this.httpClient = httpClient;
-        this.transferResource = transferResource;
-        this.logger = logger;
-        this.requestType = requestType;
-    }
-
-    public STATE onHeaderWriteCompleted()
-    {
-        if ( TransferEvent.RequestType.PUT.equals( requestType ) )
-        {
-            byteTransfered.set( 0 );
-            try
-            {
-                fireTransferStarted();
-            }
-            catch ( TransferCancelledException e )
-            {
-                return STATE.ABORT;
-            }
-        }
-        return STATE.CONTINUE;
-    }
-
-    public STATE onContentWriteCompleted()
-    {
-        return STATE.CONTINUE;
-    }
-
-    public STATE onContentWriteProgress( long amount, long current, long total )
-    {
-        return STATE.CONTINUE;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    /* @Override */
-    public STATE onBodyPartReceived( final HttpResponseBodyPart content )
-        throws Exception
-    {
-        try
-        {
-            fireTransferProgressed( content.getBodyPartBytes() );
-        }
-        catch ( TransferCancelledException e )
-        {
-            return STATE.ABORT;
-        }
-        catch ( Exception ex )
-        {
-            if ( logger.isDebugEnabled() )
-            {
-                logger.debug( "", ex );
-            }
-        }
-        return STATE.CONTINUE;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    /* @Override */
-    public STATE onStatusReceived( final HttpResponseStatus status )
-        throws Exception
-    {
-        this.status = status;
-
-        if ( !TransferEvent.RequestType.PUT.equals( requestType ) )
-        {
-            if ( status.getStatusCode() >= 200 && status.getStatusCode() < 300 )
-            {
-                try
-                {
-                    fireTransferStarted();
-                }
-                catch ( TransferCancelledException e )
-                {
-                    return STATE.ABORT;
-                }
-            }
-        }
-
-        return ( status.getStatusCode() == HttpURLConnection.HTTP_NOT_FOUND ? STATE.ABORT : STATE.CONTINUE );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    /* @Override */
-    public STATE onHeadersReceived( final HttpResponseHeaders headers )
-        throws Exception
-    {
-        this.headers = headers;
-        return STATE.CONTINUE;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    /* @Override */
-    public final Response onCompleted()
-        throws Exception
-    {
-        // The connection has timed out
-        if ( status == null )
-        {
-            throw new TransferException( "Invalid AHC State. Response will possibly gets corrupted." );
-        }
-        return onCompleted( httpClient.getProvider().prepareResponse( status, headers,
-                                                                      Collections.<HttpResponseBodyPart> emptyList() ) );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    /* @Override */
-    public void onThrowable( Throwable t )
-    {
-        exception.set( t );
-    }
-
-    /**
-     * Invoked once the HTTP response has been fully read.
-     *
-     * @param response The {@link com.ning.http.client.Response}
-     * @return Type of the value that will be returned by the associated {@link java.util.concurrent.Future}
-     */
-    public Response onCompleted( Response response )
-        throws Exception
-    {
-        if ( response != null && response.hasResponseStatus() && response.getStatusCode() >= HttpURLConnection.HTTP_OK
-            && response.getStatusCode() <= HttpURLConnection.HTTP_CREATED )
-        {
-            fireTransferSucceeded( response );
-        }
-        return response;
-    }
-
-    void fireTransferProgressed( final byte[] buffer )
-        throws TransferCancelledException
-    {
-        fireTransferProgressed( ByteBuffer.wrap( buffer ) );
-    }
-
-    void fireTransferProgressed( final ByteBuffer buffer )
-        throws TransferCancelledException
-    {
-        final long bytesTransferred = byteTransfered.addAndGet( buffer.remaining() );
-
-        final TransferEvent transferEvent = new AsyncTransferEvent()
-        {
-
-            public EventType getType()
-            {
-                return TransferEvent.EventType.PROGRESSED;
-            }
-
-            public long getTransferredBytes()
-            {
-                return bytesTransferred;
-            }
-
-            public ByteBuffer getDataBuffer()
-            {
-                return buffer.asReadOnlyBuffer();
-            }
-
-            public int getDataLength()
-            {
-                return buffer.remaining();
-            }
-
-        };
-
-        for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); )
-        {
-            final TransferListener listener = iter.next();
-            listener.transferProgressed( transferEvent );
-        }
-    }
-
-    void fireTransferSucceeded( final Response response )
-        throws IOException
-    {
-        final long bytesTransferred = byteTransfered.get();
-
-        final TransferEvent transferEvent = new AsyncTransferEvent()
-        {
-
-            public EventType getType()
-            {
-                return TransferEvent.EventType.SUCCEEDED;
-            }
-
-            public long getTransferredBytes()
-            {
-                return bytesTransferred;
-            }
-
-        };
-
-        for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); )
-        {
-            final TransferListener listener = iter.next();
-            listener.transferSucceeded( transferEvent );
-        }
-    }
-
-    void fireTransferFailed()
-        throws IOException
-    {
-        final long bytesTransferred = byteTransfered.get();
-
-        final TransferEvent transferEvent = new AsyncTransferEvent()
-        {
-
-            public EventType getType()
-            {
-                return TransferEvent.EventType.FAILED;
-            }
-
-            public long getTransferredBytes()
-            {
-                return bytesTransferred;
-            }
-
-        };
-
-        for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); )
-        {
-            final TransferListener listener = iter.next();
-            listener.transferFailed( transferEvent );
-
-        }
-    }
-
-    void fireTransferStarted()
-        throws TransferCancelledException
-    {
-        final TransferEvent transferEvent = new AsyncTransferEvent()
-        {
-
-            public EventType getType()
-            {
-                return TransferEvent.EventType.STARTED;
-            }
-
-            public long getTransferredBytes()
-            {
-                return 0;
-            }
-
-        };
-
-        for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); )
-        {
-            final TransferListener listener = iter.next();
-            listener.transferStarted( transferEvent );
-        }
-    }
-
-    public boolean addTransferListener( TransferListener listener )
-    {
-        if ( listener == null )
-        {
-            return false;
-        }
-        return listeners.offer( listener );
-    }
-
-    public boolean removeTransferListener( TransferListener listener )
-    {
-        if ( listener == null )
-        {
-            return false;
-        }
-        return listeners.remove( listener );
-    }
-
-    protected HttpResponseStatus status()
-    {
-        return status;
-    }
-
-    abstract class AsyncTransferEvent
-        implements TransferEvent
-    {
-
-        public RequestType getRequestType()
-        {
-            return requestType;
-        }
-
-        public TransferResource getResource()
-        {
-            return transferResource;
-        }
-
-        public ByteBuffer getDataBuffer()
-        {
-            return null;
-        }
-
-        public int getDataLength()
-        {
-            return 0;
-        }
-
-        public Exception getException()
-        {
-            return ( Exception.class.isAssignableFrom( exception.get().getClass() ) ? Exception.class.cast( exception.get() )
-                            : new Exception( exception.get() ) );
-        }
-
-        @Override
-        public String toString()
-        {
-            return getRequestType() + " " + getType() + " " + getResource();
-        }
-
-    }
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
deleted file mode 100644
index a719a0c7..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.apache.maven.lifecycle;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
-import org.apache.maven.lifecycle.internal.LifecycleStarter;
-import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
-import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
-import org.apache.maven.lifecycle.internal.MojoExecutor;
-import org.apache.maven.lifecycle.internal.ProjectIndex;
-import org.apache.maven.lifecycle.internal.TaskSegment;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A facade that provides lifecycle services to components outside maven core.
- *
- * Note that this component is not normally used from within core itself.
- *
- * @author Jason van Zyl
- * @author Benjamin Bentmann
- * @author Kristian Rosenvold
- */
-@Component( role = LifecycleExecutor.class )
-public class DefaultLifecycleExecutor
-    implements LifecycleExecutor
-{
-
-    @Requirement
-    private LifeCyclePluginAnalyzer lifeCyclePluginAnalyzer;
-
-    @Requirement
-    private DefaultLifecycles defaultLifeCycles;
-
-    @Requirement
-    private LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator;
-
-    @Requirement
-    private LifecycleExecutionPlanCalculator lifecycleExecutionPlanCalculator;
-
-    @Requirement
-    private MojoExecutor mojoExecutor;
-
-    @Requirement
-    private LifecycleStarter lifecycleStarter;
-
-
-    public void execute( MavenSession session )
-    {
-        lifecycleStarter.execute( session );
-    }
-
-    @Requirement
-    private MojoDescriptorCreator mojoDescriptorCreator;
-
-    // These methods deal with construction intact Plugin object that look like they come from a standard
-    // <plugin/> block in a Maven POM. We have to do some wiggling to pull the sources of information
-    // together and this really shows the problem of constructing a sensible default configuration but
-    // it's all encapsulated here so it appears normalized to the POM builder.
-
-    // We are going to take the project packaging and find all plugin in the default lifecycle and create
-    // fully populated Plugin objects, including executions with goals and default configuration taken
-    // from the plugin.xml inside a plugin.
-    //
-    // TODO: This whole method could probably removed by injecting lifeCyclePluginAnalyzer straight into client site.
-    // TODO: But for some reason the whole plexus appcontext refuses to start when I try this.
-
-    public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
-    {
-        return lifeCyclePluginAnalyzer.getPluginsBoundByDefaultToAllLifecycles( packaging );
-    }
-
-    // USED BY MAVEN HELP PLUGIN
-
-    @SuppressWarnings( { "UnusedDeclaration" } )
-    @Deprecated
-    public Map<String, Lifecycle> getPhaseToLifecycleMap()
-    {
-        return defaultLifeCycles.getPhaseToLifecycleMap();
-    }
-
-    // NOTE: Backward-compat with maven-help-plugin:2.1
-
-    @SuppressWarnings( { "UnusedDeclaration" } )
-    MojoDescriptor getMojoDescriptor( String task, MavenSession session, MavenProject project, String invokedVia,
-                                      boolean canUsePrefix, boolean isOptionalMojo )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginVersionResolutionException
-    {
-        return mojoDescriptorCreator.getMojoDescriptor( task, session, project );
-    }
-
-    // Used by m2eclipse
-
-    @SuppressWarnings( { "UnusedDeclaration" } )
-    public MavenExecutionPlan calculateExecutionPlan( MavenSession session, boolean setup, String... tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
-        PluginVersionResolutionException
-    {
-        List<TaskSegment> taskSegments =
-            lifecycleTaskSegmentCalculator.calculateTaskSegments( session, Arrays.asList( tasks ) );
-
-        TaskSegment mergedSegment = new TaskSegment( false );
-
-        for ( TaskSegment taskSegment : taskSegments )
-        {
-            mergedSegment.getTasks().addAll( taskSegment.getTasks() );
-        }
-
-        return lifecycleExecutionPlanCalculator.calculateExecutionPlan( session, session.getCurrentProject(),
-                                                                        mergedSegment.getTasks(), setup );
-    }
-
-    public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
-        PluginVersionResolutionException
-    {
-        return calculateExecutionPlan( session, true, tasks );
-    }
-
-    // Site 3.x
-    public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        lifecycleExecutionPlanCalculator.calculateForkedExecutions( mojoExecution, session );
-    }
-
-
-    // Site 3.x
-    public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws LifecycleExecutionException
-    {
-        return mojoExecutor.executeForkedExecutions( mojoExecution, session, new ProjectIndex( session.getProjects() ) );
-    }
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java
deleted file mode 100644
index 4c1fe571..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.apache.maven.lifecycle;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.lifecycle.internal.BuilderCommon;
-import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.project.MavenProject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Defines scheduling information needed by weave mode.
- * 
- * @since 3.0
- * @author Kristian Rosenvold
- */
-public class DefaultSchedules
-{
-    List<Scheduling> schedules;
-
-    @SuppressWarnings( { "UnusedDeclaration" } )
-    public DefaultSchedules()
-    {
-    }
-
-    public DefaultSchedules( List<Scheduling> schedules )
-    {
-        this.schedules = schedules;
-    }
-
-    public List<ExecutionPlanItem> createExecutionPlanItem( MavenProject mavenProject, List<MojoExecution> executions )
-    {
-        BuilderCommon.attachToThread( mavenProject );
-
-        List<ExecutionPlanItem> result = new ArrayList<ExecutionPlanItem>();
-        for ( MojoExecution mojoExecution : executions )
-        {
-            String lifeCyclePhase = mojoExecution.getLifecyclePhase();
-            final Scheduling scheduling = getScheduling( "default" );
-            Schedule schedule = null;
-            if ( scheduling != null )
-            {
-                schedule = scheduling.getSchedule( mojoExecution );
-                if ( schedule == null )
-                {
-                    schedule = scheduling.getSchedule( lifeCyclePhase );
-                }
-            }
-            result.add( new ExecutionPlanItem( mojoExecution, schedule ) );
-
-        }
-        return result;
-    }
-
-    /**
-     * Gets scheduling associated with a given phase.
-     * <p/>
-     * This is part of the experimental weave mode and therefore not part of the public api.
-     *
-     * @param lifecyclePhaseName The name of the lifecycle phase
-     * @return Schecduling information related to phase
-     */
-
-    Scheduling getScheduling( String lifecyclePhaseName )
-    {
-        for ( Scheduling schedule : schedules )
-        {
-            if ( lifecyclePhaseName.equals( schedule.getLifecycle() ) )
-            {
-                return schedule;
-            }
-        }
-        return null;
-    }
-
-    public List<Scheduling> getSchedules()
-    {
-        return schedules;
-    }
-}
\ No newline at end of file
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java
deleted file mode 100644
index 37b6e499..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.apache.maven.lifecycle;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.project.MavenProject;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * A facade that provides lifecycle services to components outside maven core.
- *
- *
- * @author Jason van  Zyl
- */
-@SuppressWarnings( { "UnusedDeclaration" } )
-public interface LifecycleExecutor
-{
-
-    // USED BY MAVEN HELP PLUGIN
-    @Deprecated
-    String ROLE = LifecycleExecutor.class.getName();
-
-    // For a given project packaging find all the plugins that are bound to any registered
-    // lifecycles. The project builder needs to now what default plugin information needs to be
-    // merged into POM being built. Once the POM builder has this plugin information, versions can be assigned
-    // by the POM builder because they will have to be defined in plugin management. Once this is setComplete then it
-    // can be passed back so that the default configuraiton information can be populated.
-    //
-    // We need to know the specific version so that we can lookup the right version of the plugin descriptor
-    // which tells us what the default configuration is.
-    //
-
-    /**
-     * @return The plugins bound to the lifecycles of the specified packaging or {@code null} if the packaging is
-     *         unknown.
-     */
-    Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging );
-
-    MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
-        PluginVersionResolutionException;
-
-    MavenExecutionPlan calculateExecutionPlan( MavenSession session, boolean setup, String... tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
-        PluginVersionResolutionException;
-
-    void execute( MavenSession session );
-
-    // used by the site plugin 3.x
-    void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException;
-
-
-    // used by the site plugin 3.x
-    List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws LifecycleExecutionException;
-
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
deleted file mode 100644
index b28e6c01..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.maven.lifecycle.internal;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.DefaultLifecycles;
-import org.apache.maven.lifecycle.DefaultSchedules;
-import org.apache.maven.lifecycle.Lifecycle;
-import org.apache.maven.lifecycle.LifecycleNotFoundException;
-import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
-import org.apache.maven.lifecycle.MavenExecutionPlan;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
-import org.apache.maven.plugin.BuildPluginManager;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.lifecycle.Execution;
-import org.apache.maven.plugin.lifecycle.Phase;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.plugin.version.PluginVersionResolver;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * @since 3.0
- * @author Benjamin Bentmann
- * @author Kristian Rosenvold (Extract class)
- *         <p/>
- *         NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
- */
-@Component( role = LifecycleExecutionPlanCalculator.class )
-public class DefaultLifecycleExecutionPlanCalculator
-    implements LifecycleExecutionPlanCalculator
-{
-    @Requirement
-    private PluginVersionResolver pluginVersionResolver;
-
-    @Requirement
-    private BuildPluginManager pluginManager;
-
-    @Requirement
-    private DefaultLifecycles defaultLifeCycles;
-
-    @Requirement
-    private DefaultSchedules defaultSchedules;
-
-    @Requirement
-    private MojoDescriptorCreator mojoDescriptorCreator;
-
-    @Requirement
-    private LifecyclePluginResolver lifecyclePluginResolver;
-
-    @SuppressWarnings( { "UnusedDeclaration" } )
-    public DefaultLifecycleExecutionPlanCalculator()
-    {
-    }
-
-    public DefaultLifecycleExecutionPlanCalculator( BuildPluginManager pluginManager,
-                                                    DefaultLifecycles defaultLifeCycles,
-                                                    MojoDescriptorCreator mojoDescriptorCreator,
-                                                    LifecyclePluginResolver lifecyclePluginResolver,
-                                                    DefaultSchedules defaultSchedules )
-    {
-        this.pluginManager = pluginManager;
-        this.defaultLifeCycles = defaultLifeCycles;
-        this.mojoDescriptorCreator = mojoDescriptorCreator;
-        this.lifecyclePluginResolver = lifecyclePluginResolver;
-        this.defaultSchedules = defaultSchedules;
-    }
-
-    public MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks, boolean setup )
-        throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
-        PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
-        NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        lifecyclePluginResolver.resolveMissingPluginVersions( project, session );
-
-        final List<MojoExecution> executions = calculateMojoExecutions( session, project, tasks );
-
-        if ( setup )
-        {
-            setupMojoExecutions( session, project, executions );
-        }
-
-        final List<ExecutionPlanItem> planItem = defaultSchedules.createExecutionPlanItem( project, executions );
-
-        return new MavenExecutionPlan( planItem, defaultLifeCycles );
-    }
-
-    public MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks )
-        throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
-        PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
-        NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        return calculateExecutionPlan( session, project, tasks, true );
-    }
-
-    private void setupMojoExecutions( MavenSession session, MavenProject project, List<MojoExecution> mojoExecutions )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        for ( MojoExecution mojoExecution : mojoExecutions )
-        {
-            setupMojoExecution( session, project, mojoExecution );
-        }
-    }
-
-    public void setupMojoExecution( MavenSession session, MavenProject project, MojoExecution mojoExecution )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        if ( mojoDescriptor == null )
-        {
-            mojoDescriptor =
-                pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(),
-                                                 project.getRemotePluginRepositories(),
-                                                 session.getRepositorySession() );
-
-            mojoExecution.setMojoDescriptor( mojoDescriptor );
-        }
-
-        populateMojoExecutionConfiguration( project, mojoExecution,
-                                            MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) );
-
-        finalizeMojoConfiguration( mojoExecution );
-
-        calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() );
-    }
-    
-    public List<MojoExecution> calculateMojoExecutions( MavenSession session, MavenProject project,
-                                                         List<Object> tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginVersionResolutionException, LifecyclePhaseNotFoundException
-    {
-        final List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
-
-        for ( Object task : tasks )
-        {
-            if ( task instanceof GoalTask )
-            {
-                String pluginGoal = ( (GoalTask) task ).pluginGoal;
-
-                MojoDescriptor mojoDescriptor = mojoDescriptorCreator.getMojoDescriptor( pluginGoal, session, project );
-
-                MojoExecution mojoExecution =
-                    new MojoExecution( mojoDescriptor, "default-cli", MojoExecution.Source.CLI );
-
-                mojoExecutions.add( mojoExecution );
-            }
-            else if ( task instanceof LifecycleTask )
-            {
-                String lifecyclePhase = ( (LifecycleTask) task ).getLifecyclePhase();
-
-                Map<String, List<MojoExecution>> phaseToMojoMapping =
-                    calculateLifecycleMappings( session, project, lifecyclePhase );
-
-                for ( List<MojoExecution> mojoExecutionsFromLifecycle : phaseToMojoMapping.values() )
-                {
-                    mojoExecutions.addAll( mojoExecutionsFromLifecycle );
-                }
-            }
-            else
-            {
-                throw new IllegalStateException( "unexpected task " + task );
-            }
-        }
-        return mojoExecutions;
-    }
-
-    private Map<String, List<MojoExecution>> calculateLifecycleMappings( MavenSession session, MavenProject project,
-                                                                         String lifecyclePhase )
-        throws LifecyclePhaseNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException
-    {
-        /*
-         * Determine the lifecycle that corresponds to the given phase.
-         */
-
-        Lifecycle lifecycle = defaultLifeCycles.get( lifecyclePhase );
-
-        if ( lifecycle == null )
-        {
-            throw new LifecyclePhaseNotFoundException(
-                "Unknown lifecycle phase \"" + lifecyclePhase + "\". You must specify a valid lifecycle phase" +
-                    " or a goal in the format <plugin-prefix>:<goal> or" +
-                    " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: " +
-                    defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase );
-        }
-
-        /*
-         * Initialize mapping from lifecycle phase to bound mojos. The key set of this map denotes the phases the caller
-         * is interested in, i.e. all phases up to and including the specified phase.
-         */
-
-        Map<String, Map<Integer, List<MojoExecution>>> mappings =
-            new LinkedHashMap<String, Map<Integer, List<MojoExecution>>>();
-
-        for ( String phase : lifecycle.getPhases() )
-        {
-            Map<Integer, List<MojoExecution>> phaseBindings = new TreeMap<Integer, List<MojoExecution>>();
-
-            mappings.put( phase, phaseBindings );
-
-            if ( phase.equals( lifecyclePhase ) )
-            {
-                break;
-            }
-        }
-
-        /*
-         * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of
-         * the project already contains the plugin executions induced by the project's packaging type. Remember, all
-         * phases of interest and only those are in the lifecyle mapping, if a phase has no value in the map, we are not
-         * interested in any of the executions bound to it.
-         */
-
-        for ( Plugin plugin : project.getBuild().getPlugins() )
-        {
-            for ( PluginExecution execution : plugin.getExecutions() )
-            {
-                // if the phase is specified then I don't have to go fetch the plugin yet and pull it down
-                // to examine the phase it is associated to.
-                if ( execution.getPhase() != null )
-                {
-                    Map<Integer, List<MojoExecution>> phaseBindings = mappings.get( execution.getPhase() );
-                    if ( phaseBindings != null )
-                    {
-                        for ( String goal : execution.getGoals() )
-                        {
-                            MojoExecution mojoExecution = new MojoExecution( plugin, goal, execution.getId() );
-                            mojoExecution.setLifecyclePhase( execution.getPhase() );
-                            addMojoExecution( phaseBindings, mojoExecution, execution.getPriority() );
-                        }
-                    }
-                }
-                // if not then i need to grab the mojo descriptor and look at the phase that is specified
-                else
-                {
-                    for ( String goal : execution.getGoals() )
-                    {
-                        MojoDescriptor mojoDescriptor =
-                            pluginManager.getMojoDescriptor( plugin, goal, project.getRemotePluginRepositories(),
-                                                             session.getRepositorySession() );
-
-                        Map<Integer, List<MojoExecution>> phaseBindings = mappings.get( mojoDescriptor.getPhase() );
-                        if ( phaseBindings != null )
-                        {
-                            MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, execution.getId() );
-                            mojoExecution.setLifecyclePhase( mojoDescriptor.getPhase() );
-                            addMojoExecution( phaseBindings, mojoExecution, execution.getPriority() );
-                        }
-                    }
-                }
-            }
-        }
-
-        Map<String, List<MojoExecution>> lifecycleMappings = new LinkedHashMap<String, List<MojoExecution>>();
-
-        for ( Map.Entry<String, Map<Integer, List<MojoExecution>>> entry : mappings.entrySet() )
-        {
-            List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
-
-            for ( List<MojoExecution> executions : entry.getValue().values() )
-            {
-                mojoExecutions.addAll( executions );
-            }
-
-            lifecycleMappings.put( entry.getKey(), mojoExecutions );
-        }
-
-        return lifecycleMappings;
-    }
-
-    private void addMojoExecution( Map<Integer, List<MojoExecution>> phaseBindings, MojoExecution mojoExecution,
-                                   int priority )
-    {
-        List<MojoExecution> mojoExecutions = phaseBindings.get( priority );
-
-        if ( mojoExecutions == null )
-        {
-            mojoExecutions = new ArrayList<MojoExecution>();
-            phaseBindings.put( priority, mojoExecutions );
-        }
-
-        mojoExecutions.add( mojoExecution );
-    }
-
-    private void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution,
-                                                     boolean allowPluginLevelConfig )
-    {
-        String g = mojoExecution.getGroupId();
-
-        String a = mojoExecution.getArtifactId();
-
-        Plugin plugin = findPlugin( g, a, project.getBuildPlugins() );
-
-        if ( plugin == null && project.getPluginManagement() != null )
-        {
-            plugin = findPlugin( g, a, project.getPluginManagement().getPlugins() );
-        }
-
-        if ( plugin != null )
-        {
-            PluginExecution pluginExecution =
-                findPluginExecution( mojoExecution.getExecutionId(), plugin.getExecutions() );
-
-            Xpp3Dom pomConfiguration = null;
-
-            if ( pluginExecution != null )
-            {
-                pomConfiguration = (Xpp3Dom) pluginExecution.getConfiguration();
-            }
-            else if ( allowPluginLevelConfig )
-            {
-                pomConfiguration = (Xpp3Dom) plugin.getConfiguration();
-            }
-
-            Xpp3Dom mojoConfiguration = ( pomConfiguration != null ) ? new Xpp3Dom( pomConfiguration ) : null;
-
-            mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
-
-            mojoExecution.setConfiguration( mojoConfiguration );
-        }
-    }
-
-    private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin> plugins )
-    {
-        for ( Plugin plugin : plugins )
-        {
-            if ( artifactId.equals( plugin.getArtifactId() ) && groupId.equals( plugin.getGroupId() ) )
-            {
-                return plugin;
-            }
-        }
-
-        return null;
-    }
-
-    private PluginExecution findPluginExecution( String executionId, Collection<PluginExecution> executions )
-    {
-        if ( StringUtils.isNotEmpty( executionId ) )
-        {
-            for ( PluginExecution execution : executions )
-            {
-                if ( executionId.equals( execution.getId() ) )
-                {
-                    return execution;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Post-processes the effective configuration for the specified mojo execution. This step discards all parameters
-     * from the configuration that are not applicable to the mojo and injects the default values for any missing
-     * parameters.
-     *
-     * @param mojoExecution The mojo execution whose configuration should be finalized, must not be {@code null}.
-     */
-    private void finalizeMojoConfiguration( MojoExecution mojoExecution )
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        Xpp3Dom executionConfiguration = mojoExecution.getConfiguration();
-        if ( executionConfiguration == null )
-        {
-            executionConfiguration = new Xpp3Dom( "configuration" );
-        }
-
-        Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
-
-        Xpp3Dom finalConfiguration = new Xpp3Dom( "configuration" );
-
-        if ( mojoDescriptor.getParameters() != null )
-        {
-            for ( Parameter parameter : mojoDescriptor.getParameters() )
-            {
-                Xpp3Dom parameterConfiguration = executionConfiguration.getChild( parameter.getName() );
-
-                if ( parameterConfiguration == null )
-                {
-                    parameterConfiguration = executionConfiguration.getChild( parameter.getAlias() );
-                }
-
-                Xpp3Dom parameterDefaults = defaultConfiguration.getChild( parameter.getName() );
-
-                parameterConfiguration =
-                    Xpp3Dom.mergeXpp3Dom( parameterConfiguration, parameterDefaults, Boolean.TRUE );
-
-                if ( parameterConfiguration != null )
-                {
-                    parameterConfiguration = new Xpp3Dom( parameterConfiguration, parameter.getName() );
-
-                    if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) ) &&
-                        StringUtils.isNotEmpty( parameter.getImplementation() ) )
-                    {
-                        parameterConfiguration.setAttribute( "implementation", parameter.getImplementation() );
-                    }
-
-                    finalConfiguration.addChild( parameterConfiguration );
-                }
-            }
-        }
-
-        mojoExecution.setConfiguration( finalConfiguration );
-    }
-
-    private Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
-    {
-        return MojoDescriptorCreator.convert( mojoDescriptor );
-    }
-
-    public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        calculateForkedExecutions( mojoExecution, session, session.getCurrentProject(), new HashSet<MojoDescriptor>() );
-    }
-
-    private void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session, MavenProject project,
-                                            Collection<MojoDescriptor> alreadyForkedExecutions )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        if ( !mojoDescriptor.isForking() )
-        {
-            return;
-        }
-
-        if ( !alreadyForkedExecutions.add( mojoDescriptor ) )
-        {
-            return;
-        }
-
-        List<MavenProject> forkedProjects =
-            LifecycleDependencyResolver.getProjects( project, session, mojoDescriptor.isAggregator() );
-
-        for ( MavenProject forkedProject : forkedProjects )
-        {
-            if ( forkedProject != project )
-            {
-                lifecyclePluginResolver.resolveMissingPluginVersions( forkedProject, session );
-            }
-
-            List<MojoExecution> forkedExecutions;
-
-            if ( StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() ) )
-            {
-                forkedExecutions =
-                    calculateForkedLifecycle( mojoExecution, session, forkedProject, alreadyForkedExecutions );
-            }
-            else
-            {
-                forkedExecutions =
-                    calculateForkedGoal( mojoExecution, session, forkedProject, alreadyForkedExecutions );
-            }
-
-            mojoExecution.setForkedExecutions( BuilderCommon.getKey( forkedProject ), forkedExecutions );
-        }
-
-        alreadyForkedExecutions.remove( mojoDescriptor );
-    }
-
-    private List<MojoExecution> calculateForkedLifecycle( MojoExecution mojoExecution, MavenSession session,
-                                                          MavenProject project,
-                                                          Collection<MojoDescriptor> alreadyForkedExecutions )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        String forkedPhase = mojoDescriptor.getExecutePhase();
-
-        Map<String, List<MojoExecution>> lifecycleMappings =
-            calculateLifecycleMappings( session, project, forkedPhase );
-
-        for ( List<MojoExecution> forkedExecutions : lifecycleMappings.values() )
-        {
-            for ( MojoExecution forkedExecution : forkedExecutions )
-            {
-                if ( forkedExecution.getMojoDescriptor() == null )
-                {
-                    MojoDescriptor forkedMojoDescriptor =
-                        pluginManager.getMojoDescriptor( forkedExecution.getPlugin(), forkedExecution.getGoal(),
-                                                         project.getRemotePluginRepositories(),
-                                                         session.getRepositorySession() );
-
-                    forkedExecution.setMojoDescriptor( forkedMojoDescriptor );
-                }
-
-                populateMojoExecutionConfiguration( project, forkedExecution, false );
-            }
-        }
-
-        injectLifecycleOverlay( lifecycleMappings, mojoExecution, session, project );
-
-        List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
-
-        for ( List<MojoExecution> forkedExecutions : lifecycleMappings.values() )
-        {
-            for ( MojoExecution forkedExecution : forkedExecutions )
-            {
-                if ( !alreadyForkedExecutions.contains( forkedExecution.getMojoDescriptor() ) )
-                {
-                    finalizeMojoConfiguration( forkedExecution );
-
-                    calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions );
-
-                    mojoExecutions.add( forkedExecution );
-                }
-            }
-        }
-
-        return mojoExecutions;
-    }
-
-    private void injectLifecycleOverlay( Map<String, List<MojoExecution>> lifecycleMappings,
-                                         MojoExecution mojoExecution, MavenSession session, MavenProject project )
-        throws PluginDescriptorParsingException, LifecycleNotFoundException, MojoNotFoundException,
-        PluginNotFoundException, PluginResolutionException, NoPluginFoundForPrefixException,
-        InvalidPluginDescriptorException, PluginVersionResolutionException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-
-        String forkedLifecycle = mojoDescriptor.getExecuteLifecycle();
-
-        if ( StringUtils.isEmpty( forkedLifecycle ) )
-        {
-            return;
-        }
-
-        org.apache.maven.plugin.lifecycle.Lifecycle lifecycleOverlay;
-
-        try
-        {
-            lifecycleOverlay = pluginDescriptor.getLifecycleMapping( forkedLifecycle );
-        }
-        catch ( IOException e )
-        {
-            throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e );
-        }
-        catch ( XmlPullParserException e )
-        {
-            throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e );
-        }
-
-        if ( lifecycleOverlay == null )
-        {
-            throw new LifecycleNotFoundException( forkedLifecycle );
-        }
-
-        for ( Phase phase : lifecycleOverlay.getPhases() )
-        {
-            List<MojoExecution> forkedExecutions = lifecycleMappings.get( phase.getId() );
-
-            if ( forkedExecutions != null )
-            {
-                for ( Execution execution : phase.getExecutions() )
-                {
-                    for ( String goal : execution.getGoals() )
-                    {
-                        MojoDescriptor forkedMojoDescriptor;
-
-                        if ( goal.indexOf( ':' ) < 0 )
-                        {
-                            forkedMojoDescriptor = pluginDescriptor.getMojo( goal );
-                            if ( forkedMojoDescriptor == null )
-                            {
-                                throw new MojoNotFoundException( goal, pluginDescriptor );
-                            }
-                        }
-                        else
-                        {
-                            forkedMojoDescriptor = mojoDescriptorCreator.getMojoDescriptor( goal, session, project );
-                        }
-
-                        MojoExecution forkedExecution =
-                            new MojoExecution( forkedMojoDescriptor, mojoExecution.getExecutionId() );
-
-                        Xpp3Dom forkedConfiguration = (Xpp3Dom) execution.getConfiguration();
-
-                        forkedExecution.setConfiguration( forkedConfiguration );
-
-                        populateMojoExecutionConfiguration( project, forkedExecution, true );
-
-                        forkedExecutions.add( forkedExecution );
-                    }
-                }
-
-                Xpp3Dom phaseConfiguration = (Xpp3Dom) phase.getConfiguration();
-
-                if ( phaseConfiguration != null )
-                {
-                    for ( MojoExecution forkedExecution : forkedExecutions )
-                    {
-                        Xpp3Dom forkedConfiguration = forkedExecution.getConfiguration();
-
-                        forkedConfiguration = Xpp3Dom.mergeXpp3Dom( phaseConfiguration, forkedConfiguration );
-
-                        forkedExecution.setConfiguration( forkedConfiguration );
-                    }
-                }
-            }
-        }
-    }
-    // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
-    //TODO: take repo mans into account as one may be aggregating prefixes of many
-    //TODO: collect at the root of the repository, read the one at the root, and fetch remote if something is missing
-    //      or the user forces the issue
-
-    private List<MojoExecution> calculateForkedGoal( MojoExecution mojoExecution, MavenSession session,
-                                                     MavenProject project,
-                                                     Collection<MojoDescriptor> alreadyForkedExecutions )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-
-        String forkedGoal = mojoDescriptor.getExecuteGoal();
-
-        MojoDescriptor forkedMojoDescriptor = pluginDescriptor.getMojo( forkedGoal );
-        if ( forkedMojoDescriptor == null )
-        {
-            throw new MojoNotFoundException( forkedGoal, pluginDescriptor );
-        }
-
-        if ( alreadyForkedExecutions.contains( forkedMojoDescriptor ) )
-        {
-            return Collections.emptyList();
-        }
-
-        MojoExecution forkedExecution = new MojoExecution( forkedMojoDescriptor, forkedGoal );
-
-        populateMojoExecutionConfiguration( project, forkedExecution, true );
-
-        finalizeMojoConfiguration( forkedExecution );
-
-        calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions );
-
-        return Collections.singletonList( forkedExecution );
-    }
-
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java
deleted file mode 100644
index 7d35b102..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.apache.maven.lifecycle.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.LifecycleNotFoundException;
-import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
-import org.apache.maven.lifecycle.MavenExecutionPlan;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.project.MavenProject;
-
-import java.util.List;
-
-/**
- * @since 3.0
- * @author Benjamin Bentmann
- * @author Kristian Rosenvold  (extract interface only)
- *         <p/>
- */
-public interface LifecycleExecutionPlanCalculator
-{
-    MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks )
-        throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
-        PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
-        NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException;
-
-    MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks,
-                                               boolean setup )
-        throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
-        PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
-        NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException;
-
-    void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
-        throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
-        PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException;
-
-    void setupMojoExecution( MavenSession session, MavenProject project, MojoExecution mojoExecution )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException,
-        LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException;
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
deleted file mode 100644
index 113a5ab3..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.maven.lifecycle.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.LifecycleNotFoundException;
-import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-
-import java.util.List;
-
-/**
- * Calculates the task segments in the build
- * 
- * @since 3.0
- * @author Benjamin Bentmann
- * @author Jason van Zyl
- * @author jdcasey
- * @author Kristian Rosenvold (extracted interface)
- *         <p/>
- *         NOTE: This interface is not part of any public api and can be changed or deleted without prior notice.
- */
-
-public interface LifecycleTaskSegmentCalculator
-{
-    List<TaskSegment> calculateTaskSegments( MavenSession session )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginVersionResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException;
-
-    public List<TaskSegment> calculateTaskSegments( MavenSession session, List<String> tasks )
-        throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-        PluginVersionResolutionException;
-
-    boolean requiresProject( MavenSession session );
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
deleted file mode 100644
index da0673af..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.apache.maven.model.inheritance;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginContainer;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.Reporting;
-import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelProblemCollector;
-import org.apache.maven.model.merge.MavenModelMerger;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * Handles inheritance of model values.
- *
- * @author Benjamin Bentmann
- */
-@Component( role = InheritanceAssembler.class )
-public class DefaultInheritanceAssembler
-    implements InheritanceAssembler
-{
-
-    private InheritanceModelMerger merger = new InheritanceModelMerger();
-
-    public void assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request,
-                                          ModelProblemCollector problems )
-    {
-        Map<Object, Object> hints = new HashMap<Object, Object>();
-        hints.put( MavenModelMerger.CHILD_PATH_ADJUSTMENT, getChildPathAdjustment( child, parent ) );
-        merger.merge( child, parent, false, hints );
-    }
-
-    /**
-     * Calculates the relative path from the base directory of the parent to the parent directory of the base directory
-     * of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM). This calculation
-     * is only a heuristic based on our conventions. In detail, the algo relies on the following assumptions. The parent
-     * uses aggregation and refers to the child via the modules section. The module path to the child is considered to
-     * point at the POM rather than its base directory if the path ends with ".xml" (ignoring case). The name of the
-     * child's base directory matches the artifact id of the child. Note that for the sake of independence from the user
-     * environment, the filesystem is intentionally not used for the calculation.
-     *
-     * @param child The child model, must not be <code>null</code>.
-     * @param parent The parent model, may be <code>null</code>.
-     * @return The path adjustment, can be empty but never <code>null</code>.
-     */
-    private String getChildPathAdjustment( Model child, Model parent )
-    {
-        String adjustment = "";
-
-        if ( parent != null )
-        {
-            String childArtifactId = child.getArtifactId();
-
-            for ( String module : parent.getModules() )
-            {
-                module = module.replace( '\\', '/' );
-
-                if ( module.regionMatches( true, module.length() - 4, ".xml", 0, 4 ) )
-                {
-                    module = module.substring( 0, module.lastIndexOf( '/' ) + 1 );
-                }
-
-                String moduleName = module;
-                if ( moduleName.endsWith( "/" ) )
-                {
-                    moduleName = moduleName.substring( 0, moduleName.length() - 1 );
-                }
-
-                int lastSlash = moduleName.lastIndexOf( '/' );
-
-                moduleName = moduleName.substring( lastSlash + 1 );
-
-                if ( moduleName.equals( childArtifactId ) && lastSlash >= 0 )
-                {
-                    adjustment = module.substring( 0, lastSlash );
-                    break;
-                }
-            }
-        }
-
-        return adjustment;
-    }
-
-    private static class InheritanceModelMerger
-        extends MavenModelMerger
-    {
-
-        @Override
-        protected void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source,
-                                                     boolean sourceDominant, Map<Object, Object> context )
-        {
-            List<Plugin> src = source.getPlugins();
-            if ( !src.isEmpty() )
-            {
-                List<Plugin> tgt = target.getPlugins();
-                Map<Object, Plugin> master = new LinkedHashMap<Object, Plugin>( src.size() * 2 );
-
-                for ( Plugin element : src )
-                {
-                    if ( element.isInherited() || !element.getExecutions().isEmpty() )
-                    {
-                        // NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions
-                        Plugin plugin = new Plugin();
-                        plugin.setLocation( "", element.getLocation( "" ) );
-                        plugin.setGroupId( null );
-                        mergePlugin( plugin, element, sourceDominant, context );
-
-                        Object key = getPluginKey( element );
-
-                        master.put( key, plugin );
-                    }
-                }
-
-                Map<Object, List<Plugin>> predecessors = new LinkedHashMap<Object, List<Plugin>>();
-                List<Plugin> pending = new ArrayList<Plugin>();
-                for ( Plugin element : tgt )
-                {
-                    Object key = getPluginKey( element );
-                    Plugin existing = master.get( key );
-                    if ( existing != null )
-                    {
-                        mergePlugin( element, existing, sourceDominant, context );
-
-                        master.put( key, element );
-
-                        if ( !pending.isEmpty() )
-                        {
-                            predecessors.put( key, pending );
-                            pending = new ArrayList<Plugin>();
-                        }
-                    }
-                    else
-                    {
-                        pending.add( element );
-                    }
-                }
-
-                List<Plugin> result = new ArrayList<Plugin>( src.size() + tgt.size() );
-                for ( Map.Entry<Object, Plugin> entry : master.entrySet() )
-                {
-                    List<Plugin> pre = predecessors.get( entry.getKey() );
-                    if ( pre != null )
-                    {
-                        result.addAll( pre );
-                    }
-                    result.add( entry.getValue() );
-                }
-                result.addAll( pending );
-
-                target.setPlugins( result );
-            }
-        }
-
-        @Override
-        protected void mergePlugin( Plugin target, Plugin source, boolean sourceDominant, Map<Object, Object> context )
-        {
-            if ( source.isInherited() )
-            {
-                mergeConfigurationContainer( target, source, sourceDominant, context );
-            }
-            mergePlugin_GroupId( target, source, sourceDominant, context );
-            mergePlugin_ArtifactId( target, source, sourceDominant, context );
-            mergePlugin_Version( target, source, sourceDominant, context );
-            mergePlugin_Extensions( target, source, sourceDominant, context );
-            mergePlugin_Dependencies( target, source, sourceDominant, context );
-            mergePlugin_Executions( target, source, sourceDominant, context );
-        }
-
-        @Override
-        protected void mergeReporting_Plugins( Reporting target, Reporting source, boolean sourceDominant,
-                                               Map<Object, Object> context )
-        {
-            List<ReportPlugin> src = source.getPlugins();
-            if ( !src.isEmpty() )
-            {
-                List<ReportPlugin> tgt = target.getPlugins();
-                Map<Object, ReportPlugin> merged =
-                    new LinkedHashMap<Object, ReportPlugin>( ( src.size() + tgt.size() ) * 2 );
-
-                for ( ReportPlugin element :  src )
-                {
-                    Object key = getReportPluginKey( element );
-                    if ( element.isInherited() )
-                    {
-                        // NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions as well
-                        ReportPlugin plugin = new ReportPlugin();
-                        plugin.setLocation( "", element.getLocation( "" ) );
-                        plugin.setGroupId( null );
-                        mergeReportPlugin( plugin, element, sourceDominant, context );
-
-                        merged.put( key, plugin );
-                    }
-                }
-
-                for ( ReportPlugin element : tgt )
-                {
-                    Object key = getReportPluginKey( element );
-                    ReportPlugin existing = merged.get( key );
-                    if ( existing != null )
-                    {
-                        mergeReportPlugin( element, existing, sourceDominant, context );
-                    }
-                    merged.put( key, element );
-                }
-
-                target.setPlugins( new ArrayList<ReportPlugin>( merged.values() ) );
-            }
-        }
-    }
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
deleted file mode 100644
index 9c646b75..00000000
--- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ /dev/null
@@ -1,718 +0,0 @@
-package org.apache.maven.plugin.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.classrealm.ClassRealmManager;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.monitor.logging.DefaultLog;
-import org.apache.maven.plugin.ContextEnabled;
-import org.apache.maven.plugin.DebugConfigurationListener;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MavenPluginManager;
-import org.apache.maven.plugin.MavenPluginValidator;
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginConfigurationException;
-import org.apache.maven.plugin.PluginContainerException;
-import org.apache.maven.plugin.PluginDescriptorCache;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginIncompatibleException;
-import org.apache.maven.plugin.PluginParameterException;
-import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
-import org.apache.maven.plugin.PluginRealmCache;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.rtinfo.RuntimeInformation;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurator;
-import org.codehaus.plexus.component.configurator.ConfigurationListener;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.graph.DependencyFilter;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.util.filter.AndDependencyFilter;
-import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
-
-/**
- * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
- * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build
- * plugins as well as special purpose plugins like reports.
- * 
- * @since 3.0
- * @author Benjamin Bentmann
- */
-@Component( role = MavenPluginManager.class )
-public class DefaultMavenPluginManager
-    implements MavenPluginManager
-{
-
-    @Requirement
-    private Logger logger;
-
-    @Requirement
-    private PlexusContainer container;
-
-    @Requirement
-    private ClassRealmManager classRealmManager;
-
-    @Requirement
-    private PluginDescriptorCache pluginDescriptorCache;
-
-    @Requirement
-    private PluginRealmCache pluginRealmCache;
-
-    @Requirement
-    private PluginDependenciesResolver pluginDependenciesResolver;
-
-    @Requirement
-    private RuntimeInformation runtimeInformation;
-
-    private PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
-
-    public synchronized PluginDescriptor getPluginDescriptor( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
-        throws PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException
-    {
-        PluginDescriptorCache.Key cacheKey = pluginDescriptorCache.createKey( plugin, repositories, session );
-
-        PluginDescriptor pluginDescriptor = pluginDescriptorCache.get( cacheKey );
-
-        if ( pluginDescriptor == null )
-        {
-            org.sonatype.aether.artifact.Artifact artifact =
-                pluginDependenciesResolver.resolve( plugin, repositories, session );
-
-            Artifact pluginArtifact = RepositoryUtils.toArtifact( artifact );
-
-            pluginDescriptor = extractPluginDescriptor( pluginArtifact, plugin );
-
-            pluginDescriptor.setRequiredMavenVersion( artifact.getProperty( "requiredMavenVersion", null ) );
-
-            pluginDescriptorCache.put( cacheKey, pluginDescriptor );
-        }
-
-        pluginDescriptor.setPlugin( plugin );
-
-        return pluginDescriptor;
-    }
-
-    private PluginDescriptor extractPluginDescriptor( Artifact pluginArtifact, Plugin plugin )
-        throws PluginDescriptorParsingException, InvalidPluginDescriptorException
-    {
-        PluginDescriptor pluginDescriptor = null;
-
-        File pluginFile = pluginArtifact.getFile();
-
-        try
-        {
-            if ( pluginFile.isFile() )
-            {
-                JarFile pluginJar = new JarFile( pluginFile, false );
-                try
-                {
-                    ZipEntry pluginDescriptorEntry = pluginJar.getEntry( getPluginDescriptorLocation() );
-
-                    if ( pluginDescriptorEntry != null )
-                    {
-                        InputStream is = pluginJar.getInputStream( pluginDescriptorEntry );
-
-                        pluginDescriptor = parsePluginDescriptor( is, plugin, pluginFile.getAbsolutePath() );
-                    }
-                }
-                finally
-                {
-                    pluginJar.close();
-                }
-            }
-            else
-            {
-                File pluginXml = new File( pluginFile, getPluginDescriptorLocation() );
-
-                if ( pluginXml.isFile() )
-                {
-                    InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) );
-                    try
-                    {
-                        pluginDescriptor = parsePluginDescriptor( is, plugin, pluginXml.getAbsolutePath() );
-                    }
-                    finally
-                    {
-                        IOUtil.close( is );
-                    }
-                }
-            }
-
-            if ( pluginDescriptor == null )
-            {
-                throw new IOException( "No plugin descriptor found at " + getPluginDescriptorLocation() );
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new PluginDescriptorParsingException( plugin, pluginFile.getAbsolutePath(), e );
-        }
-
-        MavenPluginValidator validator = new MavenPluginValidator( pluginArtifact );
-
-        validator.validate( pluginDescriptor );
-
-        if ( validator.hasErrors() )
-        {
-            throw new InvalidPluginDescriptorException( "Invalid plugin descriptor for " + plugin.getId() + " ("
-                + pluginFile + ")", validator.getErrors() );
-        }
-
-        pluginDescriptor.setPluginArtifact( pluginArtifact );
-
-        return pluginDescriptor;
-    }
-
-    private String getPluginDescriptorLocation()
-    {
-        return "META-INF/maven/plugin.xml";
-    }
-
-    private PluginDescriptor parsePluginDescriptor( InputStream is, Plugin plugin, String descriptorLocation )
-        throws PluginDescriptorParsingException
-    {
-        try
-        {
-            Reader reader = ReaderFactory.newXmlReader( is );
-
-            PluginDescriptor pluginDescriptor = builder.build( reader, descriptorLocation );
-
-            return pluginDescriptor;
-        }
-        catch ( IOException e )
-        {
-            throw new PluginDescriptorParsingException( plugin, descriptorLocation, e );
-        }
-        catch ( PlexusConfigurationException e )
-        {
-            throw new PluginDescriptorParsingException( plugin, descriptorLocation, e );
-        }
-    }
-
-    public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, List<RemoteRepository> repositories,
-                                             RepositorySystemSession session )
-        throws MojoNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-        InvalidPluginDescriptorException
-    {
-        PluginDescriptor pluginDescriptor = getPluginDescriptor( plugin, repositories, session );
-
-        MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal );
-
-        if ( mojoDescriptor == null )
-        {
-            throw new MojoNotFoundException( goal, pluginDescriptor );
-        }
-
-        return mojoDescriptor;
-    }
-
-    public void checkRequiredMavenVersion( PluginDescriptor pluginDescriptor )
-        throws PluginIncompatibleException
-    {
-        String requiredMavenVersion = pluginDescriptor.getRequiredMavenVersion();
-        if ( StringUtils.isNotBlank( requiredMavenVersion ) )
-        {
-            try
-            {
-                if ( !runtimeInformation.isMavenVersion( requiredMavenVersion ) )
-                {
-                    throw new PluginIncompatibleException( pluginDescriptor.getPlugin(), "The plugin "
-                        + pluginDescriptor.getId() + " requires Maven version " + requiredMavenVersion );
-                }
-            }
-            catch ( RuntimeException e )
-            {
-                logger.warn( "Could not verify plugin's Maven prerequisite: " + e.getMessage() );
-            }
-        }
-    }
-
-    public synchronized void setupPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session,
-                                               ClassLoader parent, List<String> imports, DependencyFilter filter )
-        throws PluginResolutionException, PluginContainerException
-    {
-        Plugin plugin = pluginDescriptor.getPlugin();
-
-        MavenProject project = session.getCurrentProject();
-
-        PluginRealmCache.Key cacheKey =
-            pluginRealmCache.createKey( plugin, parent, imports, filter, project.getRemotePluginRepositories(),
-                                        session.getRepositorySession() );
-
-        PluginRealmCache.CacheRecord cacheRecord = pluginRealmCache.get( cacheKey );
-
-        if ( cacheRecord != null )
-        {
-            pluginDescriptor.setClassRealm( cacheRecord.realm );
-            pluginDescriptor.setArtifacts( new ArrayList<Artifact>( cacheRecord.artifacts ) );
-            for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
-            {
-                componentDescriptor.setRealm( cacheRecord.realm );
-            }
-        }
-        else
-        {
-            createPluginRealm( pluginDescriptor, session, parent, imports, filter );
-
-            cacheRecord =
-                pluginRealmCache.put( cacheKey, pluginDescriptor.getClassRealm(), pluginDescriptor.getArtifacts() );
-        }
-
-        pluginRealmCache.register( project, cacheRecord );
-    }
-
-    private void createPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session, ClassLoader parent,
-                                    List<String> imports, DependencyFilter filter )
-        throws PluginResolutionException, PluginContainerException
-    {
-        Plugin plugin = pluginDescriptor.getPlugin();
-
-        if ( plugin == null )
-        {
-            throw new IllegalArgumentException( "incomplete plugin descriptor, plugin missing" );
-        }
-
-        Artifact pluginArtifact = pluginDescriptor.getPluginArtifact();
-
-        if ( pluginArtifact == null )
-        {
-            throw new IllegalArgumentException( "incomplete plugin descriptor, plugin artifact missing" );
-        }
-
-        MavenProject project = session.getCurrentProject();
-
-        DependencyFilter dependencyFilter = project.getExtensionDependencyFilter();
-        dependencyFilter = AndDependencyFilter.newInstance( dependencyFilter, filter );
-
-        DependencyNode root =
-            pluginDependenciesResolver.resolve( plugin, RepositoryUtils.toArtifact( pluginArtifact ), dependencyFilter,
-                                                project.getRemotePluginRepositories(), session.getRepositorySession() );
-
-        PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
-        root.accept( nlg );
-
-        List<Artifact> exposedPluginArtifacts = new ArrayList<Artifact>( nlg.getNodes().size() );
-        RepositoryUtils.toArtifacts( exposedPluginArtifacts, Collections.singleton( root ),
-                                     Collections.<String> emptyList(), null );
-        for ( Iterator<Artifact> it = exposedPluginArtifacts.iterator(); it.hasNext(); )
-        {
-            Artifact artifact = it.next();
-            if ( artifact.getFile() == null )
-            {
-                it.remove();
-            }
-        }
-
-        List<org.sonatype.aether.artifact.Artifact> pluginArtifacts = nlg.getArtifacts( true );
-
-        Map<String, ClassLoader> foreignImports = calcImports( project, parent, imports );
-
-        ClassRealm pluginRealm =
-            classRealmManager.createPluginRealm( plugin, parent, null, foreignImports, pluginArtifacts );
-
-        pluginDescriptor.setClassRealm( pluginRealm );
-        pluginDescriptor.setArtifacts( exposedPluginArtifacts );
-
-        try
-        {
-            for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
-            {
-                componentDescriptor.setRealm( pluginRealm );
-                container.addComponentDescriptor( componentDescriptor );
-            }
-
-            container.discoverComponents( pluginRealm );
-        }
-        catch ( PlexusConfigurationException e )
-        {
-            throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin "
-                + plugin.getId() + ": " + e.getMessage(), e );
-        }
-        catch ( CycleDetectedInComponentGraphException e )
-        {
-            throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin "
-                + plugin.getId() + ": " + e.getMessage(), e );
-        }
-    }
-
-    private Map<String, ClassLoader> calcImports( MavenProject project, ClassLoader parent, List<String> imports )
-    {
-        Map<String, ClassLoader> foreignImports = new HashMap<String, ClassLoader>();
-
-        ClassLoader projectRealm = project.getClassRealm();
-        if ( projectRealm != null )
-        {
-            foreignImports.put( "", projectRealm );
-        }
-        else
-        {
-            foreignImports.put( "", classRealmManager.getMavenApiRealm() );
-        }
-
-        if ( parent != null && imports != null )
-        {
-            for ( String parentImport : imports )
-            {
-                foreignImports.put( parentImport, parent );
-            }
-        }
-
-        return foreignImports;
-    }
-
-    public <T> T getConfiguredMojo( Class<T> mojoInterface, MavenSession session, MojoExecution mojoExecution )
-        throws PluginConfigurationException, PluginContainerException
-    {
-        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
-        PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-
-        ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
-
-        if ( logger.isDebugEnabled() )
-        {
-            logger.debug( "Configuring mojo " + mojoDescriptor.getId() + " from plugin realm " + pluginRealm );
-        }
-
-        // We are forcing the use of the plugin realm for all lookups that might occur during
-        // the lifecycle that is part of the lookup. Here we are specifically trying to keep
-        // lookups that occur in contextualize calls in line with the right realm.
-        ClassRealm oldLookupRealm = container.setLookupRealm( pluginRealm );
-
-        ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader( pluginRealm );
-
-        try
-        {
-            T mojo;
-
-            try
-            {
-                mojo = container.lookup( mojoInterface, mojoDescriptor.getRoleHint() );
-            }
-            catch ( ComponentLookupException e )
-            {
-                Throwable cause = e.getCause();
-                while ( cause != null && !( cause instanceof LinkageError )
-                    && !( cause instanceof ClassNotFoundException ) )
-                {
-                    cause = cause.getCause();
-                }
-
-                if ( ( cause instanceof NoClassDefFoundError ) || ( cause instanceof ClassNotFoundException ) )
-                {
-                    ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
-                    PrintStream ps = new PrintStream( os );
-                    ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '"
-                        + pluginDescriptor.getId() + "'. A required class is missing: " + cause.getMessage() );
-                    pluginRealm.display( ps );
-
-                    throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause );
-                }
-                else if ( cause instanceof LinkageError )
-                {
-                    ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
-                    PrintStream ps = new PrintStream( os );
-                    ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '"
-                        + pluginDescriptor.getId() + "' due to an API incompatibility: " + e.getClass().getName()
-                        + ": " + cause.getMessage() );
-                    pluginRealm.display( ps );
-
-                    throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause );
-                }
-
-                throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to load the mojo '"
-                    + mojoDescriptor.getGoal() + "' (or one of its required components) from the plugin '"
-                    + pluginDescriptor.getId() + "'", e );
-            }
-
-            if ( mojo instanceof ContextEnabled )
-            {
-                MavenProject project = session.getCurrentProject();
-
-                Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project );
-
-                if ( pluginContext != null )
-                {
-                    pluginContext.put( "project", project );
-
-                    pluginContext.put( "pluginDescriptor", pluginDescriptor );
-
-                    ( (ContextEnabled) mojo ).setPluginContext( pluginContext );
-                }
-            }
-
-            if ( mojo instanceof Mojo )
-            {
-                ( (Mojo) mojo ).setLog( new DefaultLog( logger ) );
-            }
-
-            Xpp3Dom dom = mojoExecution.getConfiguration();
-
-            PlexusConfiguration pomConfiguration;
-
-            if ( dom == null )
-            {
-                pomConfiguration = new XmlPlexusConfiguration( "configuration" );
-            }
-            else
-            {
-                pomConfiguration = new XmlPlexusConfiguration( dom );
-            }
-
-            ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
-
-            populatePluginFields( mojo, mojoDescriptor, pluginRealm, pomConfiguration, expressionEvaluator );
-
-            return mojo;
-        }
-        finally
-        {
-            Thread.currentThread().setContextClassLoader( oldClassLoader );
-            container.setLookupRealm( oldLookupRealm );
-        }
-    }
-
-    private void populatePluginFields( Object mojo, MojoDescriptor mojoDescriptor, ClassRealm pluginRealm,
-                                       PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator )
-        throws PluginConfigurationException
-    {
-        ComponentConfigurator configurator = null;
-
-        String configuratorId = mojoDescriptor.getComponentConfigurator();
-
-        if ( StringUtils.isEmpty( configuratorId ) )
-        {
-            configuratorId = "basic";
-        }
-
-        try
-        {
-            // TODO: could the configuration be passed to lookup and the configurator known to plexus via the descriptor
-            // so that this method could entirely be handled by a plexus lookup?
-            configurator = container.lookup( ComponentConfigurator.class, configuratorId );
-
-            ConfigurationListener listener = new DebugConfigurationListener( logger );
-
-            ValidatingConfigurationListener validator =
-                new ValidatingConfigurationListener( mojo, mojoDescriptor, listener );
-
-            logger.debug( "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId
-                + " configurator -->" );
-
-            configurator.configureComponent( mojo, configuration, expressionEvaluator, pluginRealm, validator );
-
-            logger.debug( "-- end configuration --" );
-
-            Collection<Parameter> missingParameters = validator.getMissingParameters();
-            if ( !missingParameters.isEmpty() )
-            {
-                if ( "basic".equals( configuratorId ) )
-                {
-                    throw new PluginParameterException( mojoDescriptor, new ArrayList<Parameter>( missingParameters ) );
-                }
-                else
-                {
-                    /*
-                     * NOTE: Other configurators like the map-oriented one don't call into the listener, so do it the
-                     * hard way.
-                     */
-                    validateParameters( mojoDescriptor, configuration, expressionEvaluator );
-                }
-            }
-        }
-        catch ( ComponentConfigurationException e )
-        {
-            String message = "Unable to parse configuration of mojo " + mojoDescriptor.getId();
-            if ( e.getFailedConfiguration() != null )
-            {
-                message += " for parameter " + e.getFailedConfiguration().getName();
-            }
-            message += ": " + e.getMessage();
-
-            throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), message, e );
-        }
-        catch ( ComponentLookupException e )
-        {
-            throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(),
-                                                    "Unable to retrieve component configurator " + configuratorId
-                                                        + " for configuration of mojo " + mojoDescriptor.getId(), e );
-        }
-        catch ( NoClassDefFoundError e )
-        {
-            ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
-            PrintStream ps = new PrintStream( os );
-            ps.println( "A required class was missing during configuration of mojo " + mojoDescriptor.getId() + ": "
-                + e.getMessage() );
-            pluginRealm.display( ps );
-
-            throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), os.toString(), e );
-        }
-        catch ( LinkageError e )
-        {
-            ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
-            PrintStream ps = new PrintStream( os );
-            ps.println( "An API incompatibility was encountered during configuration of mojo " + mojoDescriptor.getId()
-                + ": " + e.getClass().getName() + ": " + e.getMessage() );
-            pluginRealm.display( ps );
-
-            throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), os.toString(), e );
-        }
-        finally
-        {
-            if ( configurator != null )
-            {
-                try
-                {
-                    container.release( configurator );
-                }
-                catch ( ComponentLifecycleException e )
-                {
-                    logger.debug( "Failed to release mojo configurator - ignoring." );
-                }
-            }
-        }
-    }
-
-    private void validateParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration configuration,
-                                     ExpressionEvaluator expressionEvaluator )
-        throws ComponentConfigurationException, PluginParameterException
-    {
-        if ( mojoDescriptor.getParameters() == null )
-        {
-            return;
-        }
-
-        List<Parameter> invalidParameters = new ArrayList<Parameter>();
-
-        for ( Parameter parameter : mojoDescriptor.getParameters() )
-        {
-            if ( !parameter.isRequired() )
-            {
-                continue;
-            }
-
-            Object value = null;
-
-            PlexusConfiguration config = configuration.getChild( parameter.getName(), false );
-            if ( config != null )
-            {
-                String expression = config.getValue( null );
-
-                try
-                {
-                    value = expressionEvaluator.evaluate( expression );
-
-                    if ( value == null )
-                    {
-                        value = config.getAttribute( "default-value", null );
-                    }
-                }
-                catch ( ExpressionEvaluationException e )
-                {
-                    String msg =
-                        "Error evaluating the expression '" + expression + "' for configuration value '"
-                            + configuration.getName() + "'";
-                    throw new ComponentConfigurationException( configuration, msg, e );
-                }
-            }
-
-            if ( value == null && ( config == null || config.getChildCount() <= 0 ) )
-            {
-                invalidParameters.add( parameter );
-            }
-        }
-
-        if ( !invalidParameters.isEmpty() )
-        {
-            throw new PluginParameterException( mojoDescriptor, invalidParameters );
-        }
-    }
-
-    public void releaseMojo( Object mojo, MojoExecution mojoExecution )
-    {
-        if ( mojo != null )
-        {
-            try
-            {
-                container.release( mojo );
-            }
-            catch ( ComponentLifecycleException e )
-            {
-                String goalExecId = mojoExecution.getGoal();
-
-                if ( mojoExecution.getExecutionId() != null )
-                {
-                    goalExecId += " {execution: " + mojoExecution.getExecutionId() + "}";
-                }
-
-                logger.debug( "Error releasing mojo for " + goalExecId, e );
-            }
-        }
-    }
-
-}
diff --git a/org.eclipse.m2e.maven.runtime/src/org/eclipse/m2e/maven/runtime/internal/M2EMavenRuntime.java b/org.eclipse.m2e.maven.runtime/src/org/eclipse/m2e/maven/runtime/internal/M2EMavenRuntime.java
new file mode 100644
index 00000000..d3ff19cd
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/src/org/eclipse/m2e/maven/runtime/internal/M2EMavenRuntime.java
@@ -0,0 +1,9 @@
+package org.eclipse.m2e.maven.runtime.internal;
+
+public final class M2EMavenRuntime {
+
+	private M2EMavenRuntime() {
+
+	}
+
+}