diff options
author | vladt | 2011-03-15 22:09:43 +0000 |
---|---|---|
committer | vladt | 2011-03-16 14:28:27 +0000 |
commit | b2c46b09333f64f045f9e7bb136708cd8d8dad36 (patch) | |
tree | 156c655b53961d6d55189830622b4a53ee23d122 | |
parent | 3c8be6ee1bd7bf1a586f5d12f622af448f6f793d (diff) | |
download | m2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.tar.gz m2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.tar.xz m2e-core-b2c46b09333f64f045f9e7bb136708cd8d8dad36.zip |
339601: Updating Maven Dependencies Hangs
21 files changed, 78 insertions, 67 deletions
diff --git a/com.ning.async-http-client/.classpath b/com.ning.async-http-client/.classpath index c8a25ac0..09110abb 100644 --- a/com.ning.async-http-client/.classpath +++ b/com.ning.async-http-client/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="async-http-client-1.6.0.jar"/> + <classpathentry exported="true" kind="lib" path="async-http-client-1.6.3-SNAPSHOT.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/com.ning.async-http-client/META-INF/MANIFEST.MF b/com.ning.async-http-client/META-INF/MANIFEST.MF index 82e60a45..7cd55c8e 100644 --- a/com.ning.async-http-client/META-INF/MANIFEST.MF +++ b/com.ning.async-http-client/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Export-Package: com.ning.http.client;version="1.6.0"; +Export-Package: com.ning.http.client;version="1.6.3"; uses:="org.slf4j, com.ning.http.client.filter, com.ning.http.client.providers.jdk, @@ -7,22 +7,23 @@ Export-Package: com.ning.http.client;version="1.6.0"; javax.net.ssl, com.ning.http.util, com.ning.http.client.simple", - com.ning.http.client.consumers;version="1.6.0";uses:="com.ning.http.client", - com.ning.http.client.extra;version="1.6.0"; + com.ning.http.client.consumers;version="1.6.3";uses:="com.ning.http.client", + com.ning.http.client.extra;version="1.6.3"; uses:="com.ning.http.client.resumable, org.slf4j, com.ning.http.client, com.ning.http.client.filter", - com.ning.http.client.filter;version="1.6.0";uses:="com.ning.http.client", - com.ning.http.client.generators;version="1.6.0";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.listener;version="1.6.0";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.ntlm;version="1.6.0";uses:="com.ning.http.util,javax.crypto.spec,javax.crypto", - com.ning.http.client.oauth;version="1.6.0"; + com.ning.http.client.filter;version="1.6.3";uses:="com.ning.http.client", + com.ning.http.client.generators;version="1.6.3";uses:="com.ning.http.client,org.slf4j", + com.ning.http.client.listenable;version="1.6.3";uses:="com.ning.http.client", + com.ning.http.client.listener;version="1.6.3";uses:="com.ning.http.client,org.slf4j", + com.ning.http.client.ntlm;version="1.6.3";uses:="com.ning.http.util,javax.crypto.spec,javax.crypto", + com.ning.http.client.oauth;version="1.6.3"; uses:="com.ning.http.util, com.ning.http.client, javax.crypto.spec, javax.crypto", - com.ning.http.client.providers.apache;version="1.6.0"; + com.ning.http.client.providers.apache;version="1.6.3"; uses:="org.apache.commons.httpclient.protocol, javax.net, org.apache.commons.httpclient.params, @@ -36,8 +37,9 @@ Export-Package: com.ning.http.client;version="1.6.0"; org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods.multipart, org.apache.commons.httpclient.util, - com.ning.http.client.resumable", - com.ning.http.client.providers.jdk;version="1.6.0"; + com.ning.http.client.resumable, + com.ning.http.client.listenable", + com.ning.http.client.providers.jdk;version="1.6.3"; uses:="javax.net.ssl, com.ning.http.client, org.jboss.netty.buffer, @@ -45,74 +47,83 @@ Export-Package: com.ning.http.client;version="1.6.0"; com.ning.http.util, com.ning.http.multipart, org.slf4j, - com.ning.http.client.filter", - com.ning.http.client.providers.netty;version="1.6.0"; + com.ning.http.client.filter, + com.ning.http.client.listenable", + com.ning.http.client.providers.netty;version="1.6.3"; uses:="org.jboss.netty.buffer, org.jboss.netty.handler.stream, com.ning.http.client, org.jboss.netty.channel, - org.jboss.netty.channel.group, + com.ning.http.util, org.jboss.netty.handler.codec.http, javax.net.ssl, org.jboss.netty.handler.ssl, org.slf4j, - com.ning.http.util, - com.ning.http.client.filter, com.ning.http.client.listener, + org.jboss.netty.channel.group, org.jboss.netty.channel.socket.oio, - com.ning.http.client.ntlm, com.ning.http.client.providers.netty.spnego, + com.ning.http.client.ntlm, org.jboss.netty.bootstrap, com.ning.http.multipart, org.jboss.netty.channel.socket.nio, + com.ning.http.client.filter, org.jboss.netty.channel.socket, - org.jboss.netty.util", - com.ning.http.client.providers.netty.spnego;version="1.6.0";uses:="com.ning.http.util,org.ietf.jgss,org.slf4j", - com.ning.http.client.resumable;version="1.6.0"; + org.jboss.netty.util, + com.ning.http.client.listenable", + com.ning.http.client.providers.netty.spnego;version="1.6.3";uses:="com.ning.http.util,org.ietf.jgss,org.slf4j", + com.ning.http.client.resumable;version="1.6.3"; uses:="org.slf4j, com.ning.http.client.listener, com.ning.http.client, com.ning.http.client.filter", - com.ning.http.client.simple;version="1.6.0";uses:="com.ning.http.client", - com.ning.http.client.webdav;version="1.6.0"; + com.ning.http.client.simple;version="1.6.3";uses:="com.ning.http.client", + com.ning.http.client.webdav;version="1.6.3"; uses:="com.ning.http.client, javax.xml.parsers, org.w3c.dom, org.slf4j, org.xml.sax", - com.ning.http.multipart;version="1.6.0";uses:="com.ning.http.client,org.slf4j", - com.ning.http.util;version="1.6.0";uses:="com.ning.http.multipart,com.ning.http.client,javax.net.ssl" -Built-By: jfarcand + com.ning.http.multipart;version="1.6.3";uses:="com.ning.http.client,org.slf4j", + com.ning.http.util;version="1.6.3"; + uses:="com.ning.http.multipart, + com.ning.http.client, + org.jboss.netty.channel, + org.jboss.netty.channel.group, + org.slf4j, + javax.net.ssl" +Built-By: Administrator Tool: Bnd-0.0.357 Bundle-Name: async-http-client Created-By: Apache Maven Bundle Plugin Bundle-Vendor: Sonatype -Build-Jdk: 1.6.0_22 -Bundle-Version: 1.6.0 -Bnd-LastModified: 1297279244304 +Build-Jdk: 1.6.0_24 +Bundle-Version: 1.6.3.20110315-1708 +Bnd-LastModified: 1300223323250 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html Bundle-Description: Async Http Client library purpose is to allow Java applications to easily execute HTTP requests and asynchronous ly process the HTTP responses. Bundle-SymbolicName: com.ning.async-http-client -Import-Package: com.ning.http.client;version="1.6.0", - com.ning.http.client.consumers;version="1.6.0", - com.ning.http.client.extra;version="1.6.0", - com.ning.http.client.filter;version="1.6.0", - com.ning.http.client.generators;version="1.6.0", - com.ning.http.client.listener;version="1.6.0", - com.ning.http.client.ntlm;version="1.6.0", - com.ning.http.client.oauth;version="1.6.0", - com.ning.http.client.providers.apache;version="1.6.0", - com.ning.http.client.providers.jdk;version="1.6.0", - com.ning.http.client.providers.netty;version="1.6.0", - com.ning.http.client.providers.netty.spnego;version="1.6.0", - com.ning.http.client.resumable;version="1.6.0", - com.ning.http.client.simple;version="1.6.0", - com.ning.http.client.webdav;version="1.6.0", - com.ning.http.multipart;version="1.6.0", - com.ning.http.util;version="1.6.0", +Import-Package: com.ning.http.client;version="1.6.3", + com.ning.http.client.consumers;version="1.6.3", + com.ning.http.client.extra;version="1.6.3", + com.ning.http.client.filter;version="1.6.3", + com.ning.http.client.generators;version="1.6.3", + com.ning.http.client.listenable;version="1.6.3", + com.ning.http.client.listener;version="1.6.3", + com.ning.http.client.ntlm;version="1.6.3", + com.ning.http.client.oauth;version="1.6.3", + com.ning.http.client.providers.apache;version="1.6.3", + com.ning.http.client.providers.jdk;version="1.6.3", + com.ning.http.client.providers.netty;version="1.6.3", + com.ning.http.client.providers.netty.spnego;version="1.6.3", + com.ning.http.client.resumable;version="1.6.3", + com.ning.http.client.simple;version="1.6.3", + com.ning.http.client.webdav;version="1.6.3", + com.ning.http.multipart;version="1.6.3", + com.ning.http.util;version="1.6.3", javax.crypto, javax.crypto.spec, javax.naming, @@ -138,9 +149,9 @@ Import-Package: com.ning.http.client;version="1.6.0", org.jboss.netty.handler.ssl;version="3.2";resolution:=optional, org.jboss.netty.handler.stream;version="3.2";resolution:=optional, org.jboss.netty.util;version="3.2";resolution:=optional, - org.slf4j;version="1.5.0", + org.slf4j;version="1.6", org.w3c.dom, org.xml.sax -Bundle-ClassPath: async-http-client-1.6.0.jar +Bundle-ClassPath: async-http-client-1.6.3-SNAPSHOT.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 diff --git a/com.ning.async-http-client/async-http-client-1.6.0.jar b/com.ning.async-http-client/async-http-client-1.6.0.jar Binary files differdeleted file mode 100644 index 115838e9..00000000 --- a/com.ning.async-http-client/async-http-client-1.6.0.jar +++ /dev/null diff --git a/com.ning.async-http-client/async-http-client-1.6.3-SNAPSHOT.jar b/com.ning.async-http-client/async-http-client-1.6.3-SNAPSHOT.jar Binary files differnew file mode 100644 index 00000000..4725cf66 --- /dev/null +++ b/com.ning.async-http-client/async-http-client-1.6.3-SNAPSHOT.jar diff --git a/com.ning.async-http-client/build.properties b/com.ning.async-http-client/build.properties index 4a9758c1..d205cfc6 100644 --- a/com.ning.async-http-client/build.properties +++ b/com.ning.async-http-client/build.properties @@ -10,4 +10,4 @@ # bin.includes = META-INF/,\ - async-http-client-1.6.0.jar + async-http-client-1.6.3-SNAPSHOT.jar diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 65e98a5b..6a44c799 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: 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.6.1", - com.ning.async-http-client;bundle-version="[1.6.0,1.6.1)", + com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)", org.jboss.netty;bundle-version="3.2.3" Eclipse-LazyStart: true Bundle-ClassPath: . 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 Binary files differindex 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 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 Binary files differdeleted file mode 100644 index 4347c315..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..e422c92a --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar 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 Binary files differdeleted file mode 100644 index a4711c75..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..b5bf1b80 --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar 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 Binary files differdeleted file mode 100644 index 5c7e82cc..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..8ce9f131 --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar 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 Binary files differdeleted file mode 100644 index de63708d..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..8fb66034 --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar 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 Binary files differindex 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 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 Binary files differdeleted file mode 100644 index 50e27b51..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.1.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar Binary files differnew file mode 100644 index 00000000..e6125b08 --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar 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> |