Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2011-03-15 22:09:43 +0000
committervladt2011-03-16 14:28:27 +0000
commitb2c46b09333f64f045f9e7bb136708cd8d8dad36 (patch)
tree156c655b53961d6d55189830622b4a53ee23d122 /org.eclipse.m2e.maven.runtime
parent3c8be6ee1bd7bf1a586f5d12f622af448f6f793d (diff)
downloadm2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.tar.gz
m2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.tar.xz
m2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.zip
339601: Updating Maven Dependencies Hangs
Diffstat (limited to 'org.eclipse.m2e.maven.runtime')
-rw-r--r--org.eclipse.m2e.maven.runtime/.classpath14
-rw-r--r--org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF16
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar (renamed from org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.1.jar)bin81980 -> 86186 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jarbin49240 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jarbin0 -> 49458 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jarbin28602 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jarbin0 -> 28690 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jarbin121499 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jarbin0 -> 124167 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jarbin15103 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jarbin0 -> 15495 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar (renamed from org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.1.jar)bin118300 -> 119828 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jarbin19723 -> 0 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jarbin0 -> 19744 bytes
-rw-r--r--org.eclipse.m2e.maven.runtime/update-jars-pom.xml4
15 files changed, 17 insertions, 17 deletions
diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath
index 42831746..5d9ff70b 100644
--- a/org.eclipse.m2e.maven.runtime/.classpath
+++ b/org.eclipse.m2e.maven.runtime/.classpath
@@ -37,13 +37,13 @@
<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.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-api-1.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-util-1.10.1.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.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.10.1.jar"/>
- <classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.1.0.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 f25aa414..b0c4710c 100644
--- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
@@ -132,18 +132,18 @@ Bundle-ClassPath: local-patches.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.10.1.jar,
- jars/aether-api-1.10.1.jar,
- jars/aether-spi-1.10.1.jar,
- jars/aether-util-1.10.1.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.10.1.jar,
- jars/aether-connector-asynchttpclient-1.10.1.jar,
- jars/wagon-ahc-1.1.0.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.0,1.6.1)"
+Require-Bundle: com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)"
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar
index 02444da0..5bdade87 100644
--- a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.1.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar
deleted file mode 100644
index 4347c315..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar
new file mode 100644
index 00000000..e422c92a
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar
deleted file mode 100644
index a4711c75..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar
new file mode 100644
index 00000000..b5bf1b80
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar
deleted file mode 100644
index 5c7e82cc..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar
new file mode 100644
index 00000000..8ce9f131
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar
deleted file mode 100644
index de63708d..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar
new file mode 100644
index 00000000..8fb66034
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar
index 44c0fc34..9f517eae 100644
--- a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.1.jar
+++ b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar
Binary files differ
diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar
deleted file mode 100644
index 50e27b51..00000000
--- a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar
+++ /dev/null
Binary files differ
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
new file mode 100644
index 00000000..e6125b08
--- /dev/null
+++ b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar
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 a278009b..7e5d67c5 100644
--- a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
+++ b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml
@@ -30,12 +30,12 @@
<!-- the following MUST match <maven.version/> above. I wish I could make scope=import do this for me -->
<sisu.version>2.0.0</sisu.version>
<classworlds.version>2.4</classworlds.version>
- <aether.version>1.10.1</aether.version>
+ <aether.version>1.11</aether.version>
<sisu-guice.version>2.9.4</sisu-guice.version>
<!-- below are m2e-specific addons -->
<plexus-build-api.version>0.0.7</plexus-build-api.version>
- <wagon-ahc.version>1.1.0</wagon-ahc.version>
+ <wagon-ahc.version>1.2.0</wagon-ahc.version>
<!-- the following need to be reconciled with maven version used -->
<plexus-utils.version>2.0.6</plexus-utils.version>

Back to the top