Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2011-02-09 18:26:37 +0000
committerPascal Rapicault2011-02-09 18:26:37 +0000
commit4fe075e9a25fe8cc9183e4ccb72401bced845472 (patch)
tree75ff159c1ec434c26d48ccc1dc21b013b4d94bad
parent4f279be978f98f8c18894975a3e62e0751570efb (diff)
downloadm2e-core-4fe075e9a25fe8cc9183e4ccb72401bced845472.tar.gz
m2e-core-4fe075e9a25fe8cc9183e4ccb72401bced845472.tar.xz
m2e-core-4fe075e9a25fe8cc9183e4ccb72401bced845472.zip
Update to Maven 3.0.2
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.m2e.feature/feature.xml11
-rw-r--r--org.eclipse.m2e.maven.runtime/.classpath80
-rw-r--r--org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF369
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jarbin0 -> 81978 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-api-1.7.jarbin74176 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jarbin0 -> 37225 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-http-1.7.0.jarbin48495 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jarbin0 -> 28609 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.7.jarbin24876 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jarbin0 -> 121524 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-impl-1.7.jarbin106275 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jarbin0 -> 15100 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-spi-1.7.jarbin13549 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jarbin0 -> 118296 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-util-1.7.jarbin107949 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/asm-3.2.jarbin43398 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/async-http-client-1.3.4.jarbin205005 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jarbin0 -> 286442 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jarbin0 -> 44598 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jarbin0 -> 639592 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-1.4.2.jarbin28985 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jarbin0 -> 29657 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-1.4.2.jarbin4455 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jarbin0 -> 4437 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-1.4.2.jarbin6667 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jarbin0 -> 7491 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-1.4.2.jarbin33573 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jarbin0 -> 46861 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-1.4.2.jarbin35995 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jarbin0 -> 37634 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-1.4.2.jarbin8853 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jarbin0 -> 74859 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-1.4.2.jarbin24846 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jarbin0 -> 24877 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-1.4.2.jarbin8365 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jarbin0 -> 8522 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-1.4.2.jarbin11032 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jarbin0 -> 13454 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-1.4.2.jarbin13433 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jarbin0 -> 13411 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-1.4.2.jarbin18338 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jarbin0 -> 18018 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-1.4.2.jarbin113809 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jarbin0 -> 124791 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jarbin0 -> 358085 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jarbin0 -> 53842 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.jarbin51189 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.jar)bin51908 -> 52108 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.jar)bin284889 -> 286416 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.jar)bin527040 -> 546363 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jarbin0 -> 43747 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.jarbin39561 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.jar)bin164685 -> 164709 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.jar)bin147974 -> 148383 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.jar)bin48920 -> 49162 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.jar)bin30082 -> 30089 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.jar)bin46667 -> 46677 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar (renamed from org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.jar)bin37780 -> 41028 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7-SNAPSHOT.jarbin8463 -> 8438 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar (renamed from org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.3.jar)bin46830 -> 47058 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jarbin0 -> 216640 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.4.jarbin222137 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6-SNAPSHOT.jarbin0 -> 223401 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.1.7-noaop.jarbin471737 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.1-noaop.jarbin0 -> 477039 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jarbin0 -> 483594 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jarbin0 -> 25496 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar (renamed from org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.0.0.jar)bin25335 -> 19723 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar (renamed from org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-6.jar)bin11040 -> 11063 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jarbin53184 -> 53186 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jarbin0 -> 133826 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java200
-rw-r--r--org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/PluginRealmCache.java85
-rw-r--r--org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java72
-rw-r--r--org.eclipse.m2e.maven.runtime/update-jars-pom.xml91
-rw-r--r--org.eclipse.m2e.parent/pom.xml14
77 files changed, 594 insertions, 332 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index fff5ae65..1ec1749e 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Require-Bundle:
org.eclipse.m2e.maven.indexer;bundle-version="[0.13.0,0.14.0)",
org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)",
com.ibm.icu;bundle-version="4.0.1",
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.5.11",
+ com.ning.async-http-client;bundle-version="1.5.0",
+ org.jboss.netty;bundle-version="3.2.3"
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml
index 128a383c..06bbf12a 100644
--- a/org.eclipse.m2e.feature/feature.xml
+++ b/org.eclipse.m2e.feature/feature.xml
@@ -127,4 +127,15 @@
version="0.0.0"
unpack="false"/>
+ <plugin id="com.ning.async-http-client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin id="org.jboss.netty"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath
index 38d6319a..22e2446a 100644
--- a/org.eclipse.m2e.maven.runtime/.classpath
+++ b/org.eclipse.m2e.maven.runtime/.classpath
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
<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 exported="true" kind="lib" path="jars/maven-embedder-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-settings-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-plugin-api-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-model-builder-3.0.jar"/>
+ <classpathentry kind="src" path="src/main/java/"/>
+ <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.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-model-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-settings-builder-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-repository-metadata-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-artifact-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/maven-aether-provider-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-impl-1.7.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.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-6.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.7.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.0.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/wagon-provider-api-1.0-beta-6.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/plexus-utils-2.0.4.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-SNAPSHOT.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-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/async-http-client-1.3.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/aether-api-1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/aether-util-1.10.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.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/async-http-client-1.5.0.jar"/>
<classpathentry exported="true" kind="lib" path="jars/netty-3.2.3.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-connector-http-1.7.0.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-api-1.7.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.7.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-util-1.7.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/javax.inject-1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/asm-3.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-binders-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-converters-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-inject-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-locators-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-reflect-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-bean-scanners-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-binders-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/plexus-component-annotations-1.5.5.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-converters-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-locators-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/plexus-classworlds-2.3.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-metadata-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-scanners-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/guice-plexus-shim-1.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/sisu-guice-2.1.7-noaop.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/slf4j-api-1.6.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.1.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 14a98b0e..e80432dc 100644
--- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
@@ -1,242 +1,127 @@
-Manifest-Version: 1.0
-Export-Package: META-INF.plexus,
- com.google.inject,
- com.google.inject.binder,
- com.google.inject.internal,
- com.google.inject.internal.util,
- com.google.inject.matcher,
- com.google.inject.name,
- com.google.inject.spi,
- com.google.inject.util,
- com.ning.http.client,
- com.ning.http.util,
- org.apache.maven,
- org.apache.maven.artifact,
- org.apache.maven.artifact.deployer,
- org.apache.maven.artifact.factory,
- org.apache.maven.artifact.handler,
- org.apache.maven.artifact.handler.manager,
- org.apache.maven.artifact.installer,
- org.apache.maven.artifact.manager,
- org.apache.maven.artifact.metadata,
- org.apache.maven.artifact.repository,
- org.apache.maven.artifact.repository.layout,
- org.apache.maven.artifact.repository.metadata,
- org.apache.maven.artifact.repository.metadata.io,
- org.apache.maven.artifact.repository.metadata.io.xpp3,
- org.apache.maven.artifact.resolver,
- org.apache.maven.artifact.resolver.filter,
- org.apache.maven.artifact.versioning,
- org.apache.maven.classrealm,
- org.apache.maven.cli,
- org.apache.maven.configuration,
- org.apache.maven.configuration.internal,
- org.apache.maven.exception,
- org.apache.maven.execution,
- org.apache.maven.lifecycle,
- org.apache.maven.lifecycle.internal,
- org.apache.maven.lifecycle.mapping,
- org.apache.maven.messages,
- org.apache.maven.model,
- org.apache.maven.model.building,
- org.apache.maven.model.composition,
- org.apache.maven.model.inheritance,
- org.apache.maven.model.interpolation,
- org.apache.maven.model.io,
- org.apache.maven.model.io.xpp3,
- org.apache.maven.model.locator,
- org.apache.maven.model.management,
- org.apache.maven.model.merge,
- org.apache.maven.model.normalization,
- org.apache.maven.model.path,
- org.apache.maven.model.plugin,
- org.apache.maven.model.profile,
- org.apache.maven.model.profile.activation,
- org.apache.maven.model.resolution,
- org.apache.maven.model.superpom,
- org.apache.maven.model.validation,
- org.apache.maven.monitor.event,
- org.apache.maven.monitor.logging,
- org.apache.maven.plugin,
- org.apache.maven.plugin.descriptor,
- org.apache.maven.plugin.internal,
- org.apache.maven.plugin.lifecycle,
- org.apache.maven.plugin.lifecycle.io.xpp3,
- org.apache.maven.plugin.logging,
- org.apache.maven.plugin.prefix,
- org.apache.maven.plugin.prefix.internal,
- org.apache.maven.plugin.version,
- org.apache.maven.plugin.version.internal,
- org.apache.maven.profiles,
- org.apache.maven.profiles.activation,
- org.apache.maven.profiles.io.xpp3,
- org.apache.maven.project,
- org.apache.maven.project.artifact,
- org.apache.maven.project.inheritance,
- org.apache.maven.project.interpolation,
- org.apache.maven.project.path,
- org.apache.maven.project.validation,
- org.apache.maven.properties.internal,
- org.apache.maven.reporting,
- org.apache.maven.repository,
- org.apache.maven.repository.internal,
- org.apache.maven.repository.legacy,
- org.apache.maven.repository.legacy.metadata,
- org.apache.maven.repository.legacy.repository,
- org.apache.maven.repository.legacy.resolver,
- org.apache.maven.repository.legacy.resolver.conflict,
- org.apache.maven.repository.legacy.resolver.transform,
- org.apache.maven.repository.metadata,
- org.apache.maven.settings,
- org.apache.maven.settings.building,
- org.apache.maven.settings.crypto,
- org.apache.maven.settings.io,
- org.apache.maven.settings.io.xpp3,
- org.apache.maven.settings.merge,
- org.apache.maven.settings.validation,
- org.apache.maven.toolchain,
- org.apache.maven.toolchain.java,
- org.apache.maven.toolchain.model,
- org.apache.maven.toolchain.model.io.xpp3,
- org.apache.maven.usability.plugin,
- org.apache.maven.usability.plugin.io.xpp3,
- org.apache.maven.wagon,
- org.apache.maven.wagon.authentication,
- org.apache.maven.wagon.authorization,
- org.apache.maven.wagon.events,
- org.apache.maven.wagon.observers,
- org.apache.maven.wagon.providers.file,
- org.apache.maven.wagon.proxy,
- org.apache.maven.wagon.repository,
- org.apache.maven.wagon.resource,
- org.codehaus.plexus,
- org.codehaus.plexus.classworlds,
- org.codehaus.plexus.classworlds.launcher,
- org.codehaus.plexus.classworlds.realm,
- org.codehaus.plexus.classworlds.strategy,
- org.codehaus.plexus.component,
- org.codehaus.plexus.component.annotations,
- org.codehaus.plexus.component.composition,
- org.codehaus.plexus.component.configurator,
- org.codehaus.plexus.component.configurator.converters,
- org.codehaus.plexus.component.configurator.converters.basic,
- org.codehaus.plexus.component.configurator.converters.composite,
- org.codehaus.plexus.component.configurator.converters.lookup,
- org.codehaus.plexus.component.configurator.converters.special,
- org.codehaus.plexus.component.configurator.expression,
- org.codehaus.plexus.component.factory,
- org.codehaus.plexus.component.repository,
- org.codehaus.plexus.component.repository.exception,
- org.codehaus.plexus.configuration,
- org.codehaus.plexus.configuration.xml,
- org.codehaus.plexus.context,
- org.codehaus.plexus.interpolation,
- org.codehaus.plexus.interpolation.multi,
- org.codehaus.plexus.interpolation.object,
- org.codehaus.plexus.interpolation.os,
- org.codehaus.plexus.interpolation.reflection,
- org.codehaus.plexus.interpolation.util,
- org.codehaus.plexus.logging,
- org.codehaus.plexus.logging.console,
- org.codehaus.plexus.personality.plexus.lifecycle.phase,
- 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,
- org.sonatype.aether,
- org.sonatype.aether.artifact,
- org.sonatype.aether.collection,
- org.sonatype.aether.connector.async,
- org.sonatype.aether.connector.wagon,
- org.sonatype.aether.deployment,
- org.sonatype.aether.graph,
- org.sonatype.aether.impl,
- org.sonatype.aether.impl.internal,
- org.sonatype.aether.installation,
- org.sonatype.aether.metadata,
- org.sonatype.aether.repository,
- org.sonatype.aether.resolution,
- org.sonatype.aether.spi.connector,
- org.sonatype.aether.spi.io,
- org.sonatype.aether.spi.locator,
- org.sonatype.aether.spi.log,
- org.sonatype.aether.transfer,
- org.sonatype.aether.util,
- org.sonatype.aether.util.artifact,
- org.sonatype.aether.util.filter,
- org.sonatype.aether.util.graph,
- org.sonatype.aether.util.graph.manager,
- org.sonatype.aether.util.graph.selector,
- org.sonatype.aether.util.graph.transformer,
- org.sonatype.aether.util.graph.traverser,
- org.sonatype.aether.util.layout,
- org.sonatype.aether.util.listener,
- org.sonatype.aether.util.metadata,
- org.sonatype.aether.util.repository,
- org.sonatype.aether.util.version,
- org.sonatype.aether.version,
- org.sonatype.maven.wagon,
- org.sonatype.plexus.build.incremental,
- org.sonatype.plexus.components.cipher,
- org.sonatype.plexus.components.sec.dispatcher,
- org.sonatype.plexus.components.sec.dispatcher.model,
- org.sonatype.plexus.components.sec.dispatcher.model.io.xpp3
-Bundle-Vendor: Sonatype
-Bundle-ClassPath: local-patches.jar,
- jars/maven-embedder-3.0.jar,
- jars/maven-settings-3.0.jar,
- jars/maven-plugin-api-3.0.jar,
- jars/maven-model-builder-3.0.jar,
- jars/plexus-sec-dispatcher-1.3.jar,
- jars/plexus-cipher-1.4.jar,
- jars/maven-core-3.0.jar,
- jars/maven-model-3.0.jar,
- jars/maven-settings-builder-3.0.jar,
- jars/maven-repository-metadata-3.0.jar,
- jars/maven-artifact-3.0.jar,
- jars/maven-aether-provider-3.0.jar,
- jars/aether-impl-1.7.jar,
- jars/plexus-interpolation-1.14.jar,
- jars/maven-compat-3.0.jar,
- jars/commons-cli-1.2.jar,
- jars/wagon-file-1.0-beta-6.jar,
- jars/aether-connector-wagon-1.7.jar,
- jars/wagon-ahc-1.0.0.jar,
- jars/wagon-provider-api-1.0-beta-6.jar,
- jars/plexus-utils-2.0.4.jar,
- jars/plexus-build-api-0.0.7-SNAPSHOT.jar,
- jars/async-http-client-1.3.4.jar,
- jars/netty-3.2.3.Final.jar,
- jars/aether-connector-http-1.7.0.jar,
- jars/aether-api-1.7.jar,
- jars/aether-spi-1.7.jar,
- jars/aether-util-1.7.jar,
- jars/javax.inject-1.jar,
- jars/asm-3.2.jar,
- jars/guice-bean-binders-1.4.2.jar,
- jars/guice-bean-converters-1.4.2.jar,
- jars/guice-bean-inject-1.4.2.jar,
- jars/guice-bean-locators-1.4.2.jar,
- jars/guice-bean-reflect-1.4.2.jar,
- jars/guice-bean-scanners-1.4.2.jar,
- jars/guice-plexus-binders-1.4.2.jar,
- jars/plexus-component-annotations-1.5.5.jar,
- jars/guice-plexus-converters-1.4.2.jar,
- jars/guice-plexus-locators-1.4.2.jar,
- jars/plexus-classworlds-2.3.jar,
- jars/guice-plexus-metadata-1.4.2.jar,
- jars/guice-plexus-scanners-1.4.2.jar,
- jars/guice-plexus-shim-1.4.2.jar,
- jars/sisu-guice-2.1.7-noaop.jar
-Bundle-Version: 0.13.0.qualifier
-Bundle-Name: Maven Embedder Bundle
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.m2e.maven.runtime;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- JavaSE-1.6
-
+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,org.apache.maven.s
+ ettings.io.xpp3,META-INF.plexus,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
+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,j
+ ars/maven-core-3.0.2.jar,jars/maven-model-3.0.2.jar,jars/maven-settin
+ gs-builder-3.0.2.jar,jars/maven-repository-metadata-3.0.2.jar,jars/ma
+ ven-artifact-3.0.2.jar,jars/maven-aether-provider-3.0.2.jar,jars/plex
+ us-interpolation-1.14.jar,jars/maven-compat-3.0.2.jar,jars/commons-cl
+ i-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.ja
+ r,jars/guice-bean-locators-2.0.0.jar,jars/guice-bean-binders-2.0.0.ja
+ r,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-converter
+ s-2.0.0.jar,jars/guice-plexus-locators-2.0.0.jar,jars/guice-plexus-bi
+ nders-2.0.0.jar,jars/guice-plexus-scanners-2.0.0.jar,jars/plexus-clas
+ sworlds-2.4.jar,jars/plexus-utils-2.0.6-SNAPSHOT.jar,jars/sisu-guice-
+ 2.9.4-no_aop.jar,jars/plexus-build-api-0.0.7-SNAPSHOT.jar,jars/aether
+ -connector-wagon-1.10.jar,jars/aether-api-1.10.jar,jars/aether-spi-1.
+ 10.jar,jars/aether-util-1.10.jar,jars/wagon-provider-api-1.0-beta-6.j
+ ar,jars/aether-impl-1.10.jar,jars/aether-connector-asynchttpclient-1.
+ 10.jar,jars/async-http-client-1.5.0.jar,jars/netty-3.2.3.Final.jar,ja
+ rs/slf4j-api-1.6.1.jar,jars/wagon-ahc-1.1.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
+
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jar
new file mode 100644
index 00000000..7ed415f8
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.7.jar b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.7.jar
deleted file mode 100644
index 04addb15..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar
new file mode 100644
index 00000000..878df1d0
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-http-1.7.0.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-http-1.7.0.jar
deleted file mode 100644
index 17ffffe7..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-http-1.7.0.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jar
new file mode 100644
index 00000000..fd835337
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.7.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.7.jar
deleted file mode 100644
index 05770388..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jar
new file mode 100644
index 00000000..b5a3f0f4
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.7.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.7.jar
deleted file mode 100644
index c96139d1..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar
new file mode 100644
index 00000000..af13c0de
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.7.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.7.jar
deleted file mode 100644
index 5e293cd4..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jar
new file mode 100644
index 00000000..1ecd1457
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.7.jar b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.7.jar
deleted file mode 100644
index 033c40fa..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.7.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/asm-3.2.jar b/org.eclipse.m2e.maven.runtime/jars/asm-3.2.jar
deleted file mode 100644
index ca9f8d28..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/asm-3.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.3.4.jar b/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.3.4.jar
deleted file mode 100644
index 61d77263..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.3.4.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jar b/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jar
new file mode 100644
index 00000000..b4aa1a00
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jar b/org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jar
new file mode 100644
index 00000000..d1abcbb4
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jar b/org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jar
new file mode 100644
index 00000000..8e394fac
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-1.4.2.jar
deleted file mode 100644
index 66be3622..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar
new file mode 100644
index 00000000..d902a9dd
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-1.4.2.jar
deleted file mode 100644
index ff171dbb..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar
new file mode 100644
index 00000000..d78b2ee9
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-1.4.2.jar
deleted file mode 100644
index a9e4b9d7..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar
new file mode 100644
index 00000000..f20c2095
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-1.4.2.jar
deleted file mode 100644
index be857a01..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar
new file mode 100644
index 00000000..89892874
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-1.4.2.jar
deleted file mode 100644
index 0a0db76d..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar
new file mode 100644
index 00000000..ba284249
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-1.4.2.jar
deleted file mode 100644
index c11f2b21..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar
new file mode 100644
index 00000000..d286ecc6
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-1.4.2.jar
deleted file mode 100644
index ba346d2d..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar
new file mode 100644
index 00000000..5d01444e
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-1.4.2.jar
deleted file mode 100644
index f46e9061..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar
new file mode 100644
index 00000000..ab2839a1
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-1.4.2.jar
deleted file mode 100644
index 6af041c6..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar
new file mode 100644
index 00000000..cc387466
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-1.4.2.jar
deleted file mode 100644
index b2ed74eb..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar
new file mode 100644
index 00000000..17e04d71
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-1.4.2.jar
deleted file mode 100644
index d38d109a..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar
new file mode 100644
index 00000000..c577291f
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-1.4.2.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-1.4.2.jar
deleted file mode 100644
index faaebe7d..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-1.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar
new file mode 100644
index 00000000..db7036de
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jar b/org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jar
new file mode 100644
index 00000000..9b5a7200
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jar
Binary files differ
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
new file mode 100644
index 00000000..e6994bcb
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.jar
deleted file mode 100644
index adb55ec7..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar
index 824aec54..c60fd16c 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar
index 29c4db13..d2599860 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar
index 9698cdd0..34935d66 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar
Binary files differ
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
new file mode 100644
index 00000000..5aa98a97
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.jar
deleted file mode 100644
index 75b4fe6c..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar
index 79936996..8b64b866 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar
index ea9a50fb..df8ffbbe 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar
index bbb4f008..d074043c 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar
index f28813cf..eb579ce8 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar
index 6b8f98fb..d9a485ce 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar
index daffe290..08b7c855 100644
--- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7-SNAPSHOT.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7-SNAPSHOT.jar
index c68fa1e4..c9aa2b00 100644
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7-SNAPSHOT.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7-SNAPSHOT.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.3.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar
index 7c654105..ef07b83a 100644
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.3.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jar
new file mode 100644
index 00000000..02678202
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.4.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.4.jar
deleted file mode 100644
index 2a6972cc..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.4.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6-SNAPSHOT.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6-SNAPSHOT.jar
new file mode 100644
index 00000000..fb799b8d
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6-SNAPSHOT.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.1.7-noaop.jar b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.1.7-noaop.jar
deleted file mode 100644
index aa668444..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.1.7-noaop.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.1-noaop.jar b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.1-noaop.jar
new file mode 100644
index 00000000..bae6c312
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.1-noaop.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar
new file mode 100644
index 00000000..4ccd861a
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jar b/org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jar
new file mode 100644
index 00000000..f1f4fdd2
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar
index 215ae097..50e27b51 100644
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.0.0.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-6.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar
index 12c554e5..2e59d4be 100644
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-6.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar
Binary files differ
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
index b0dfde6a..246548df 100644
--- 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
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jar b/org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jar
new file mode 100644
index 00000000..2c274c7f
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
new file mode 100644
index 00000000..578ee51f
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -0,0 +1,200 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.component.annotations.Component;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.graph.DependencyFilter;
+import org.sonatype.aether.repository.LocalRepository;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.repository.WorkspaceRepository;
+
+/**
+ * Default PluginCache implementation. Assumes cached data does not change.
+ */
+@Component( role = PluginRealmCache.class )
+public class DefaultPluginRealmCache
+ implements PluginRealmCache
+{
+
+ protected static class CacheKey
+ implements Key
+ {
+
+ private final Plugin plugin;
+
+ private final WorkspaceRepository workspace;
+
+ private final LocalRepository localRepo;
+
+ private final List<RemoteRepository> repositories;
+
+ private final ClassLoader parentRealm;
+
+ private final Map<String, ClassLoader> foreignImports;
+
+ private final DependencyFilter filter;
+
+ private final int hashCode;
+
+ public CacheKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader> foreignImports,
+ DependencyFilter dependencyFilter, List<RemoteRepository> repositories,
+ RepositorySystemSession session )
+ {
+ this.plugin = plugin.clone();
+ this.workspace = CacheUtils.getWorkspace( session );
+ this.localRepo = session.getLocalRepository();
+ this.repositories = new ArrayList<RemoteRepository>( repositories.size() );
+ for ( RemoteRepository repository : repositories )
+ {
+ if ( repository.isRepositoryManager() )
+ {
+ this.repositories.addAll( repository.getMirroredRepositories() );
+ }
+ else
+ {
+ this.repositories.add( repository );
+ }
+ }
+ this.parentRealm = parentRealm;
+ this.foreignImports =
+ ( foreignImports != null ) ? foreignImports : Collections.<String, ClassLoader> emptyMap();
+ this.filter = dependencyFilter;
+
+ int hash = 17;
+ hash = hash * 31 + CacheUtils.pluginHashCode( plugin );
+ hash = hash * 31 + hash( workspace );
+ hash = hash * 31 + hash( localRepo );
+ hash = hash * 31 + CacheUtils.repositoriesHashCode( repositories );
+ hash = hash * 31 + hash( parentRealm );
+ hash = hash * 31 + this.foreignImports.hashCode();
+ hash = hash * 31 + hash( dependencyFilter );
+ this.hashCode = hash;
+ }
+
+ @Override
+ public String toString()
+ {
+ return plugin.getId();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ private static int hash( Object obj )
+ {
+ return obj != null ? obj.hashCode() : 0;
+ }
+
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( o == this )
+ {
+ return true;
+ }
+
+ if ( !( o instanceof CacheKey ) )
+ {
+ return false;
+ }
+
+ CacheKey that = (CacheKey) o;
+
+ return parentRealm == that.parentRealm && CacheUtils.pluginEquals( plugin, that.plugin )
+ && eq( workspace, that.workspace ) && eq( localRepo, that.localRepo )
+ && CacheUtils.repositoriesEquals( this.repositories, that.repositories ) && eq( filter, that.filter )
+ && eq( foreignImports, that.foreignImports );
+ }
+
+ private static <T> boolean eq( T s1, T s2 )
+ {
+ return s1 != null ? s1.equals( s2 ) : s2 == null;
+ }
+
+ }
+
+ protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<Key, CacheRecord>();
+
+ public Key createKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader> foreignImports,
+ DependencyFilter dependencyFilter, List<RemoteRepository> repositories,
+ RepositorySystemSession session )
+ {
+ return new CacheKey( plugin, parentRealm, foreignImports, dependencyFilter, repositories, session );
+ }
+
+ public CacheRecord get( Key key )
+ {
+ return cache.get( key );
+ }
+
+ public CacheRecord put( Key key, ClassRealm pluginRealm, List<Artifact> pluginArtifacts )
+ {
+ if ( pluginRealm == null || pluginArtifacts == null )
+ {
+ throw new IllegalArgumentException();
+ }
+
+ if ( cache.containsKey( key ) )
+ {
+ throw new IllegalStateException( "Duplicate plugin realm for plugin " + key );
+ }
+
+ CacheRecord record = new CacheRecord( pluginRealm, pluginArtifacts );
+
+ cache.put( key, record );
+
+ return record;
+ }
+
+ public void flush()
+ {
+ cache.clear();
+ }
+
+ protected static int pluginHashCode( Plugin plugin )
+ {
+ return CacheUtils.pluginHashCode( plugin );
+ }
+
+ protected static boolean pluginEquals( Plugin a, Plugin b )
+ {
+ return CacheUtils.pluginEquals( a, b );
+ }
+
+ public void register( MavenProject project, CacheRecord record )
+ {
+ // default cache does not track plugin usage
+ }
+
+}
diff --git a/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
new file mode 100644
index 00000000..48271591
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -0,0 +1,85 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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.List;
+import java.util.Map;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.graph.DependencyFilter;
+import org.sonatype.aether.repository.RemoteRepository;
+
+/**
+ * Caches plugin class realms. <strong>Warning:</strong> This is an internal utility interface that is only public for
+ * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
+ * prior notice.
+ *
+ * @author Igor Fedorenko
+ * @author Benjamin Bentmann
+ */
+public interface PluginRealmCache
+{
+
+ public static class CacheRecord
+ {
+ public final ClassRealm realm;
+
+ public final List<Artifact> artifacts;
+
+ public CacheRecord( ClassRealm realm, List<Artifact> artifacts )
+ {
+ this.realm = realm;
+ this.artifacts = artifacts;
+ }
+ }
+
+ /**
+ * A cache key.
+ */
+ interface Key
+ {
+ // marker interface for cache keys
+ }
+
+ Key createKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader> foreignImports,
+ DependencyFilter dependencyFilter, List<RemoteRepository> repositories,
+ RepositorySystemSession session );
+
+ CacheRecord get( Key key );
+
+ CacheRecord put( Key key, ClassRealm pluginRealm, List<Artifact> pluginArtifacts );
+
+ void flush();
+
+ /**
+ * Registers the specified cache record for usage with the given project. Integrators can use the information
+ * collected from this method in combination with a custom cache implementation to dispose unused records from the
+ * cache.
+ *
+ * @param project The project that employs the plugin realm, must not be {@code null}.
+ * @param record The cache record being used for the project, must not be {@code null}.
+ */
+ void register( MavenProject project, CacheRecord record );
+
+}
diff --git a/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 3b2e7df4..603e6704 100644
--- a/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/org.eclipse.m2e.maven.runtime/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -30,6 +30,7 @@ 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;
@@ -54,6 +55,7 @@ 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;
@@ -63,6 +65,7 @@ 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;
@@ -122,6 +125,9 @@ public class DefaultMavenPluginManager
@Requirement
private PluginDependenciesResolver pluginDependenciesResolver;
+ @Requirement
+ private RuntimeInformation runtimeInformation;
+
private PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
public synchronized PluginDescriptor getPluginDescriptor( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
@@ -133,11 +139,15 @@ public class DefaultMavenPluginManager
if ( pluginDescriptor == null )
{
- Artifact pluginArtifact =
- RepositoryUtils.toArtifact( pluginDependenciesResolver.resolve( plugin, repositories, session ) );
+ 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 );
}
@@ -260,6 +270,27 @@ public class DefaultMavenPluginManager
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
@@ -268,8 +299,10 @@ public class DefaultMavenPluginManager
MavenProject project = session.getCurrentProject();
+ Map<String, ClassLoader> foreignImports = calcImports( project, parent, imports );
+
PluginRealmCache.Key cacheKey =
- pluginRealmCache.createKey( plugin, parent, imports, filter, project.getRemotePluginRepositories(),
+ pluginRealmCache.createKey( plugin, parent, foreignImports, filter, project.getRemotePluginRepositories(),
session.getRepositorySession() );
PluginRealmCache.CacheRecord cacheRecord = pluginRealmCache.get( cacheKey );
@@ -285,7 +318,7 @@ public class DefaultMavenPluginManager
}
else
{
- createPluginRealm( pluginDescriptor, session, parent, imports, filter );
+ createPluginRealm( pluginDescriptor, session, parent, foreignImports, filter );
cacheRecord =
pluginRealmCache.put( cacheKey, pluginDescriptor.getClassRealm(), pluginDescriptor.getArtifacts() );
@@ -295,7 +328,7 @@ public class DefaultMavenPluginManager
}
private void createPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session, ClassLoader parent,
- List<String> imports, DependencyFilter filter )
+ Map<String, ClassLoader> foreignImports, DependencyFilter filter )
throws PluginResolutionException, PluginContainerException
{
Plugin plugin = pluginDescriptor.getPlugin();
@@ -338,7 +371,8 @@ public class DefaultMavenPluginManager
List<org.sonatype.aether.artifact.Artifact> pluginArtifacts = nlg.getArtifacts( true );
- ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, imports, pluginArtifacts );
+ ClassRealm pluginRealm =
+ classRealmManager.createPluginRealm( plugin, parent, null, foreignImports, pluginArtifacts );
pluginDescriptor.setClassRealm( pluginRealm );
pluginDescriptor.setArtifacts( exposedPluginArtifacts );
@@ -365,6 +399,31 @@ public class DefaultMavenPluginManager
}
}
+ 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
{
@@ -383,7 +442,6 @@ public class DefaultMavenPluginManager
// 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 );
- container.setLookupRealm( pluginRealm );
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( pluginRealm );
diff --git a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
index ab64fa20..69a2cd0e 100644
--- a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
+++ b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
@@ -23,17 +23,17 @@
<properties>
<!-- maven core version -->
- <maven.version>3.0.1-RC1</maven.version>
+ <maven.version>3.0.2</maven.version>
<!-- the following MUST match <maven.version/> above. I wish I could make scope=import do this for me -->
- <sisu.version>1.4.3.1</sisu.version>
+ <sisu.version>2.0.0</sisu.version>
<classworlds.version>2.4</classworlds.version>
- <aether.version>1.8</aether.version>
- <sisu-guice.version>2.9.1</sisu-guice.version>
+ <aether.version>1.10</aether.version>
+ <sisu-guice.version>2.9.4</sisu-guice.version>
<!-- below are m2e-specific addons -->
- <plexus-build-api.version>0.0.6</plexus-build-api.version>
- <wagon-ahc.version>1.0.0</wagon-ahc.version>
+ <plexus-build-api.version>0.0.7-SNAPSHOT</plexus-build-api.version>
+ <wagon-ahc.version>1.1.0</wagon-ahc.version>
<!-- the following need to be reconciled with maven version used -->
<plexus-utils.version>2.0.6-SNAPSHOT</plexus-utils.version>
@@ -67,60 +67,68 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-bean-binders</artifactId>
- <version>${sisu.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-bean-inject</artifactId>
- <version>${sisu.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-plexus-binders</artifactId>
- <version>${sisu.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-plexus-converters</artifactId>
- <version>${sisu.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-plexus-locators</artifactId>
- <version>${sisu.version}</version>
- </dependency>
- <dependency>
+<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>noaop</classifier>
+ <classifier>no_aop</classifier>
</dependency>
-
+
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>${plexus-build-api.version}</version>
</dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-asynchttpclient</artifactId>
- <version>${aether.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ <version>${aether.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <version>${aether.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-connector-asynchttpclient</artifactId>
+ <version>${aether.version}</version>
+ <!-- <exclusions>
+ <exclusion>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ </exclusion>
+ </exclusions> -->
+ </dependency>
<dependency>
<groupId>org.sonatype.maven</groupId>
<artifactId>wagon-ahc</artifactId>
<version>${wagon-ahc.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -142,7 +150,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexus-utils.version.version}</version>
+ <version>${plexus-utils.version}</version>
</dependency>
</dependencies>
@@ -170,7 +178,6 @@
org.sonatype.plexus.*,
org.sonatype.aether.*,
com.google.inject.*,
- com.ning.http.client.*,
org.sonatype.maven.wagon.*,
META-INF.plexus,
</exportPackages>
diff --git a/org.eclipse.m2e.parent/pom.xml b/org.eclipse.m2e.parent/pom.xml
index f2120804..85f8dce0 100644
--- a/org.eclipse.m2e.parent/pom.xml
+++ b/org.eclipse.m2e.parent/pom.xml
@@ -110,6 +110,19 @@
<module>../target-platform</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.2.3.Final</version>
+ </dependency>
+ </dependencies>
+
<dependencyManagement>
<dependencies>
<!-- m2eclipse -->
@@ -235,6 +248,7 @@
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
<target>
<artifact>
<groupId>org.eclipse.m2e</groupId>

Back to the top