Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-02-10 04:32:24 +0000
committerIgor Fedorenko2011-02-10 14:21:43 +0000
commit5459a689aac2852f803742e12d3a853f2824f7b1 (patch)
tree32cb2a0de5249d26d050560596271f36a3d1ca9e
parent2d41b45e623b56df61e7ed1292cf60798c5e8ceb (diff)
downloadm2e-core-5459a689aac2852f803742e12d3a853f2824f7b1.tar.gz
m2e-core-5459a689aac2852f803742e12d3a853f2824f7b1.tar.xz
m2e-core-5459a689aac2852f803742e12d3a853f2824f7b1.zip
updated dependencies properly. still broken due to corrupt http download
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--org.eclipse.m2e.maven.runtime/.classpath4
-rw-r--r--org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF65
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jarbin286442 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jarbin44598 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jarbin639592 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jarbin358085 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/netty-3.2.3.Final.jarbin786229 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jarbin216640 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jarbin25496 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jarbin133826 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/update-jars-pom.xml6
11 files changed, 47 insertions, 28 deletions
diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath
index 22e2446a..368e8af3 100644
--- a/org.eclipse.m2e.maven.runtime/.classpath
+++ b/org.eclipse.m2e.maven.runtime/.classpath
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="local-patches.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="src" path="src/main/java/"/>
@@ -44,9 +45,6 @@
<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/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 5f031f6d..eebadbef 100644
--- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
@@ -97,28 +97,49 @@ Export-Package: org.codehaus.plexus.component.factory,org.sonatype.aet
.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-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-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.jar,
+ jars/aether-impl-1.10.jar,
+ jars/aether-connector-asynchttpclient-1.10.jar,
+ jars/wagon-ahc-1.1.0.jar
Bundle-Version: 0.13.0.qualifier
Bundle-Name: Embedded Maven Runtime Bundle
Bundle-ManifestVersion: 2
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
deleted file mode 100644
index b4aa1a00..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/async-http-client-1.5.0.jar
+++ /dev/null
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
deleted file mode 100644
index d1abcbb4..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/commons-logging-api-1.1.jar
+++ /dev/null
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
deleted file mode 100644
index 8e394fac..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/google-collections-1.0.jar
+++ /dev/null
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
deleted file mode 100644
index 9b5a7200..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/log4j-1.2.12.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/netty-3.2.3.Final.jar b/org.eclipse.m2e.maven.runtime/jars/netty-3.2.3.Final.jar
deleted file mode 100644
index 7672fcd8..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/netty-3.2.3.Final.jar
+++ /dev/null
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
deleted file mode 100644
index 02678202..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/plexus-container-default-1.5.5.jar
+++ /dev/null
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
deleted file mode 100644
index f1f4fdd2..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/slf4j-api-1.6.1.jar
+++ /dev/null
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
deleted file mode 100644
index 2c274c7f..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/xbean-reflect-3.4.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
index 69a2cd0e..757ab1d9 100644
--- a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
+++ b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
@@ -67,7 +67,7 @@
</exclusions>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.sonatype.sisu.inject</groupId>
<artifactId>guice-plexus-shim</artifactId>
<version>${sisu.version}</version>
@@ -112,12 +112,12 @@
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-asynchttpclient</artifactId>
<version>${aether.version}</version>
- <!-- <exclusions>
+ <exclusions>
<exclusion>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
</exclusion>
- </exclusions> -->
+ </exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.maven</groupId>

Back to the top