Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--m2e-maven-runtime/com.ning.async-http-client/pom.xml70
-rw-r--r--m2e-maven-runtime/com.ning.async-http-client/src/main/resources/OSGI-INF/l10n/bundle.properties2
-rw-r--r--m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt202
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml14
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml1
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml36
-rw-r--r--m2e-maven-runtime/org.jboss.netty/pom.xml85
-rw-r--r--m2e-maven-runtime/org.jboss.netty/src/main/resources/OSGI-INF/l10n/bundle.properties2
-rw-r--r--m2e-maven-runtime/org.jboss.netty/src/main/resources/about.html48
-rw-r--r--m2e-maven-runtime/org.jboss.netty/src/main/resources/about_files/LICENSE-2.0.txt202
-rw-r--r--m2e-maven-runtime/pom.xml2
-rw-r--r--org.eclipse.m2e.cliresolver31/about.html (renamed from m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about.html)27
-rw-r--r--org.eclipse.m2e.cliresolver31/pom.xml95
-rw-r--r--org.eclipse.m2e.cliresolver31/src/main/java/org/eclipse/m2e/cliresolver31/EclipseWorkspaceReader.java56
-rw-r--r--org.eclipse.m2e.core.ui/plugin.xml4
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java170
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java314
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java5
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java2
-rw-r--r--org.eclipse.m2e.feature/feature.xml12
-rw-r--r--org.eclipse.m2e.jdt/plugin.xml2
-rw-r--r--org.eclipse.m2e.launching/build.properties1
-rw-r--r--org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jarbin0 -> 5928 bytes
-rw-r--r--org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java4
-rw-r--r--org.eclipse.m2e.refactoring/plugin.xml4
-rw-r--r--pom.xml10
29 files changed, 368 insertions, 1009 deletions
diff --git a/m2e-maven-runtime/com.ning.async-http-client/pom.xml b/m2e-maven-runtime/com.ning.async-http-client/pom.xml
deleted file mode 100644
index cae8fc4c..00000000
--- a/m2e-maven-runtime/com.ning.async-http-client/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010 Sonatype, Inc.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>m2e-maven-runtime</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>com.ning.async-http-client</artifactId>
- <packaging>bundle</packaging>
-
- <name>async-http-client</name>
-
- <properties>
- <async-http-client.version>1.6.5</async-http-client.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.ning</groupId>
- <artifactId>async-http-client</artifactId>
- <version>${async-http-client.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Embed-Dependency>
- async-http-client
- </Embed-Dependency>
-
- <_exportcontents>
- com.ning.http.*;version="${async-http-client.version}"
- </_exportcontents>
-
- <Bundle-Version>${async-http-client.version}.${osgi-version-qualifier}</Bundle-Version>
-
- <Import-Package>
- !org.apache.commons.httpclient.*,
- org.jboss.netty.*;resolution:=mandatory,
- org.slf4j.*;version="1.6.2";resolution:=mandatory,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/OSGI-INF/l10n/bundle.properties b/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 8e190892..00000000
--- a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Vendor = Sonatype, Inc.
-Bundle-Name = async-http-client \ No newline at end of file
diff --git a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt b/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt
deleted file mode 100644
index d6456956..00000000
--- a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
index 474955e0..8d0397f6 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
@@ -38,8 +38,22 @@
<artifactId>velocity</artifactId>
<groupId>velocity</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>plexus-container-default</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>0.0.0.M2a</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
index 5f362a23..4d34460f 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
@@ -42,7 +42,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
index 84c79d03..f4762e1e 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -27,7 +27,7 @@
<guava.version>14.0.1</guava.version>
<!-- below are m2e-specific addons -->
<plexus-build-api.version>0.0.7</plexus-build-api.version>
- <wagon-ahc.version>1.2.1</wagon-ahc.version>
+ <okhttp-connector.version>0.0.8</okhttp-connector.version>
</properties>
<dependencies>
@@ -92,30 +92,20 @@
</dependency>
<dependency>
+ <groupId>io.tesla.aether</groupId>
+ <artifactId>aether-connector-okhttp</artifactId>
+ <version>${okhttp-connector.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>sisu-inject-plexus</artifactId>
- <groupId>org.sonatype.sisu</groupId>
- </exclusion>
- </exclusions>
- <optional>true</optional>
</dependency>
+
<dependency>
- <groupId>org.sonatype.maven</groupId>
- <artifactId>wagon-ahc</artifactId>
- <version>${wagon-ahc.version}</version>
- <optional>true</optional>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -139,7 +129,7 @@
<configuration>
<instructions>
<Embed-Dependency>
- *;scope=compile|runtime;artifactId=!aopalliance|apache-maven|async-http-client|netty|slf4j-api
+ *;scope=compile|runtime;artifactId=!aopalliance|apache-maven|slf4j-api
</Embed-Dependency>
<Embed-Directory>jars</Embed-Directory>
@@ -153,14 +143,14 @@
com.google.inject.*,
com.google.common.*,
javax.inject.*,
- org.sonatype.maven.wagon.*,
+ com.squareup.okhttp.*,
+ io.tesla.aether.*,
</_exportcontents>
<Import-Package>
!*
</Import-Package>
<Require-Bundle>
- com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)",
org.slf4j.api;bundle-version="1.6.2"
</Require-Bundle>
diff --git a/m2e-maven-runtime/org.jboss.netty/pom.xml b/m2e-maven-runtime/org.jboss.netty/pom.xml
deleted file mode 100644
index 06c5697b..00000000
--- a/m2e-maven-runtime/org.jboss.netty/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010 Sonatype, Inc.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>m2e-maven-runtime</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.jboss.netty</artifactId>
- <packaging>bundle</packaging>
-
- <name>The Netty Project</name>
-
- <properties>
- <netty.version>3.2.5.Final</netty.version>
- <osgi-version-qualifier>Final-${maven.build.timestamp}</osgi-version-qualifier>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Embed-Dependency>
- netty
- </Embed-Dependency>
-
- <_exportcontents>
- org.jboss.netty.*;version="3.2.5"
- </_exportcontents>
-
- <Bundle-Version>3.2.5.${osgi-version-qualifier}</Bundle-Version>
- <Bundle-Activator>org.jboss.netty.container.osgi.NettyBundleActivator</Bundle-Activator>
-
- <Import-Package>
- org.jboss.netty.*;version="[3.2,5)",
- org.slf4j;version="[1.5.0,2.0.0)",
- org.osgi.*,
- !*
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <properties>
- <osgi-version-qualifier>qualifier</osgi-version-qualifier>
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/m2e-maven-runtime/org.jboss.netty/src/main/resources/OSGI-INF/l10n/bundle.properties b/m2e-maven-runtime/org.jboss.netty/src/main/resources/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 4b82e7d1..00000000
--- a/m2e-maven-runtime/org.jboss.netty/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Vendor = JBoss
-Bundle-Name = The Netty Project \ No newline at end of file
diff --git a/m2e-maven-runtime/org.jboss.netty/src/main/resources/about.html b/m2e-maven-runtime/org.jboss.netty/src/main/resources/about.html
deleted file mode 100644
index 1c122189..00000000
--- a/m2e-maven-runtime/org.jboss.netty/src/main/resources/about.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 6 2011</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>
-The Content includes items that have been sourced from third parties as set out below. If you
-did not receive this Content directly from the Eclipse Foundation, the following is provided
-for informational purposes only, and you should look to the Redistributor&rsquo;s license for
-terms and conditions of use.
-</p>
-
-<h4>Netty 3.2.4.Final</h4>
-<p>
-The plug-in includes software developed by RedHat, Inc., as part of the JBoss project.
-Your use of Netty 3.2.4.Final in binary code form contained in the plug-in is subject to the terms and conditions of the
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).
-A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
-<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>.
-
-
-</body>
-</html> \ No newline at end of file
diff --git a/m2e-maven-runtime/org.jboss.netty/src/main/resources/about_files/LICENSE-2.0.txt b/m2e-maven-runtime/org.jboss.netty/src/main/resources/about_files/LICENSE-2.0.txt
deleted file mode 100644
index d6456956..00000000
--- a/m2e-maven-runtime/org.jboss.netty/src/main/resources/about_files/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml
index 644d7e71..589af64c 100644
--- a/m2e-maven-runtime/pom.xml
+++ b/m2e-maven-runtime/pom.xml
@@ -39,11 +39,9 @@
</properties>
<modules>
- <module>com.ning.async-http-client</module>
<module>org.eclipse.m2e.archetype.common</module>
<module>org.eclipse.m2e.maven.indexer</module>
<module>org.eclipse.m2e.maven.runtime</module>
- <module>org.jboss.netty</module>
</modules>
<build>
diff --git a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about.html b/org.eclipse.m2e.cliresolver31/about.html
index 190e2e45..70e4b67c 100644
--- a/m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about.html
+++ b/org.eclipse.m2e.cliresolver31/about.html
@@ -2,13 +2,13 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June, 6 2011</p>
+<p>October 29, 2010</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
@@ -22,26 +22,7 @@ being redistributed by another party (&quot;Redistributor&quot;) and different t
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>
-The Content includes items that have been sourced from third parties as set out below. If you
-did not receive this Content directly from the Eclipse Foundation, the following is provided
-for informational purposes only, and you should look to the Redistributor&rsquo;s license for
-terms and conditions of use.
-</p>
-
-<h4>Async HTTP Client 1.6.3</h4>
-<p>
-The plug-in includes software developed by Sonatype, Inc.
-Your use of Async HTTP Client 1.6.3 in binary code form contained in the plug-in is subject to the terms and conditions of the
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).
-A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
-<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>.
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/org.eclipse.m2e.cliresolver31/pom.xml b/org.eclipse.m2e.cliresolver31/pom.xml
new file mode 100644
index 00000000..d1c1b11a
--- /dev/null
+++ b/org.eclipse.m2e.cliresolver31/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2008 Sonatype, Inc. All rights reserved. This program
+ and the accompanying materials are made available under the terms of
+ the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>org.eclipse.m2e.cliresolver31</artifactId>
+ <version>1.0.100-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.tesla.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>org.eclipse.m2e.cliresolver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins
+ </groupId>
+ <artifactId>maven-compiler-plugin
+ </artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.eclipse.m2e:org.eclipse.m2e.cliresolver</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>org.eclipse.m2e:org.eclipse.m2e.cliresolver</artifact>
+ <includes>
+ <include>org/eclipse/m2e/cli/**</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
diff --git a/org.eclipse.m2e.cliresolver31/src/main/java/org/eclipse/m2e/cliresolver31/EclipseWorkspaceReader.java b/org.eclipse.m2e.cliresolver31/src/main/java/org/eclipse/m2e/cliresolver31/EclipseWorkspaceReader.java
new file mode 100644
index 00000000..8ee3345f
--- /dev/null
+++ b/org.eclipse.m2e.cliresolver31/src/main/java/org/eclipse/m2e/cliresolver31/EclipseWorkspaceReader.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Sonatype, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.m2e.cliresolver31;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.codehaus.plexus.component.annotations.Component;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
+import org.eclipse.m2e.cli.WorkspaceState;
+
+
+/**
+ * Enables workspace resolution in Maven 3.1.0 and newer.
+ */
+@Component(role = WorkspaceReader.class, hint = "ide")
+public final class EclipseWorkspaceReader implements WorkspaceReader {
+
+ private WorkspaceRepository workspaceRepository;
+
+ public EclipseWorkspaceReader() {
+ this.workspaceRepository = new WorkspaceRepository("ide", getClass());
+ }
+
+ @Override
+ public int hashCode() {
+ return getClass().hashCode(); // no state
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof EclipseWorkspaceReader;
+ }
+
+ public WorkspaceRepository getRepository() {
+ return workspaceRepository;
+ }
+
+ public File findArtifact(org.eclipse.aether.artifact.Artifact artifact) {
+ return WorkspaceState.findArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getExtension(),
+ artifact.getBaseVersion());
+ }
+
+ public List<String> findVersions(org.eclipse.aether.artifact.Artifact artifact) {
+ return Collections.emptyList();
+ }
+
+}
diff --git a/org.eclipse.m2e.core.ui/plugin.xml b/org.eclipse.m2e.core.ui/plugin.xml
index b97e0ba6..8eabaf2a 100644
--- a/org.eclipse.m2e.core.ui/plugin.xml
+++ b/org.eclipse.m2e.core.ui/plugin.xml
@@ -279,7 +279,7 @@
enablesFor="1"/>
</objectContribution>
<objectContribution id="org.eclipse.m2e.core.openAetherPomDependencyNode"
- objectClass="org.sonatype.aether.graph.DependencyNode"
+ objectClass="org.eclipse.aether.graph.DependencyNode"
adaptable="false">
<action id="org.eclipse.m2e.core.ui.openPomDependency"
class="org.eclipse.m2e.core.ui.internal.actions.OpenPomAction"
@@ -362,7 +362,7 @@
class="org.eclipse.m2e.core.ui.internal.actions.MavenPropertyTester"
namespace="org.eclipse.m2e"
properties="isTransitiveDependencyTreeNode,isDirectDependencyTreeNode"
- type="org.sonatype.aether.graph.DependencyNode"/>
+ type="org.eclipse.aether.graph.DependencyNode"/>
</extension>
<extension point="org.eclipse.ui.commands">
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 4ded3855..44059ce3 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@ Require-Bundle:
org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)",
org.eclipse.m2e.archetype.common;bundle-version="[1.5.0,1.6.0)",
org.eclipse.m2e.maven.indexer;bundle-version="[1.5.0,1.6.0)",
- org.slf4j.api;bundle-version="1.6.2",
- com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)"
+ org.slf4j.api;bundle-version="1.6.2"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
index 2ede00d6..0ffcb5ad 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
@@ -30,7 +30,7 @@ public interface IMavenConfiguration {
public boolean isOffline();
/**
- * One of org.sonatype.aether.repository.RepositoryPolicy.UPDATE constants or null. If not null, the specified update
+ * One of org.eclipse.aether.repository.RepositoryPolicy.UPDATE constants or null. If not null, the specified update
* policy overrides the update policies of the remote repositories being used for resolution.
*/
public String getGlobalUpdatePolicy();
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java
index 16f78792..6673cc9d 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java
@@ -124,7 +124,7 @@ public class MavenEmbeddedRuntime implements MavenRuntime {
addBundleClasspathEntries(allentries, mavenRuntimeBundle);
// find and add more bundles
- for(String sname : new String[] {"com.ning.async-http-client", "org.jboss.netty", "org.slf4j.api"}) {
+ for(String sname : new String[] {"org.slf4j.api"}) {
Bundle dependency = findDependencyBundle(mavenRuntimeBundle, sname, new HashSet<Bundle>());
if(dependency != null) {
addBundleClasspathEntries(allentries, dependency);
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
new file mode 100644
index 00000000..a86d5084
--- /dev/null
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Sonatype, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Sonatype, Inc. - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.m2e.core.internal.index.nexus;
+
+import io.tesla.aether.client.AetherClient;
+import io.tesla.aether.client.AetherClientAuthentication;
+import io.tesla.aether.client.AetherClientConfig;
+import io.tesla.aether.client.AetherClientProxy;
+import io.tesla.aether.client.Response;
+import io.tesla.aether.okhttp.OkHttpAetherClient;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.common.io.Closer;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+
+import org.apache.maven.index.updater.AbstractResourceFetcher;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+
+import org.eclipse.m2e.core.internal.MavenPluginActivator;
+
+
+public class AetherClientResourceFetcher extends AbstractResourceFetcher {
+
+ private AetherClient aetherClient;
+
+ private final AuthenticationInfo authInfo;
+
+ private final ProxyInfo proxyInfo;
+
+ private final String userAgent;
+
+ private final IProgressMonitor monitor;
+
+ private String baseUrl;
+
+ public AetherClientResourceFetcher(final AuthenticationInfo authInfo, final ProxyInfo proxyInfo,
+ final IProgressMonitor monitor) {
+ this.authInfo = authInfo;
+ this.proxyInfo = proxyInfo;
+ this.monitor = (monitor != null) ? monitor : new NullProgressMonitor();
+ this.userAgent = MavenPluginActivator.getUserAgent();
+ }
+
+ public void connect(String id, String url) throws IOException {
+ aetherClient = new OkHttpAetherClient(new AetherClientConfigAdapter(authInfo, proxyInfo, userAgent,
+ new HashMap<String, String>()));
+ this.baseUrl = url;
+ }
+
+ public void disconnect() throws IOException {
+ aetherClient.close();
+ }
+
+ public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
+
+ String url = baseUrl + "/" + name;
+ Response response = aetherClient.get(url);
+
+ Closer closer = Closer.create();
+ try {
+ InputStream is = closer.register(response.getInputStream());
+ OutputStream os = closer.register(new BufferedOutputStream(new FileOutputStream(targetFile)));
+ final byte[] buffer = new byte[1024 * 1024];
+ int n = 0;
+ while(-1 != (n = is.read(buffer))) {
+ os.write(buffer, 0, n);
+ if(monitor.isCanceled()) {
+ throw new OperationCanceledException();
+ }
+ }
+ } finally {
+ closer.close();
+ }
+ }
+
+ class AetherClientConfigAdapter extends AetherClientConfig {
+
+ int connectionTimeout;
+
+ int requestTimeout;
+
+ AuthenticationInfo authInfo;
+
+ ProxyInfo proxyInfo;
+
+ String userAgent;
+
+ Map<String, String> headers;
+
+ public AetherClientConfigAdapter(AuthenticationInfo authInfo, ProxyInfo proxyInfo, String userAgent,
+ Map<String, String> headers) {
+ this.authInfo = authInfo;
+ this.proxyInfo = proxyInfo;
+ this.userAgent = userAgent;
+ this.headers = headers;
+ }
+
+ public String getUserAgent() {
+ return userAgent;
+ }
+
+ public int getConnectionTimeout() {
+ return connectionTimeout;
+ }
+
+ public int getRequestTimeout() {
+ return requestTimeout;
+ }
+
+ public AetherClientProxy getProxy() {
+
+ if(proxyInfo == null) {
+ return null;
+ }
+
+ return new AetherClientProxy() {
+
+ public String getHost() {
+ return proxyInfo.getHost();
+ }
+
+ public int getPort() {
+ return proxyInfo.getPort();
+ }
+
+ public AetherClientAuthentication getAuthentication() {
+
+ if(proxyInfo != null && proxyInfo.getUserName() != null && proxyInfo.getPassword() != null) {
+ return new AetherClientAuthentication(proxyInfo.getUserName(), proxyInfo.getPassword());
+ }
+ return null;
+ }
+ };
+ }
+
+ public AetherClientAuthentication getAuthentication() {
+
+ if(authInfo != null) {
+ return new AetherClientAuthentication(authInfo.getUserName(), authInfo.getPassword());
+ }
+ return null;
+ }
+
+ public Map<String, String> getHeaders() {
+ return headers;
+ }
+ }
+}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java
deleted file mode 100644
index b9a8ad50..00000000
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.core.internal.index.nexus;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.net.HttpURLConnection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ning.http.client.BodyConsumer;
-import com.ning.http.client.ProxyServer;
-import com.ning.http.client.Realm.AuthScheme;
-import com.ning.http.client.Response;
-import com.ning.http.client.SimpleAsyncHttpClient;
-import com.ning.http.client.SimpleAsyncHttpClient.ErrorDocumentBehaviour;
-import com.ning.http.client.ThrowableHandler;
-import com.ning.http.client.consumers.OutputStreamBodyConsumer;
-import com.ning.http.client.simple.HeaderMap;
-import com.ning.http.client.simple.SimpleAHCTransferListener;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.io.RawInputStreamFacade;
-
-import org.apache.maven.index.updater.AbstractResourceFetcher;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.proxy.ProxyUtils;
-import org.apache.maven.wagon.repository.Repository;
-
-import org.eclipse.m2e.core.internal.MavenPluginActivator;
-import org.eclipse.m2e.core.internal.Messages;
-
-
-/**
- * A resource fetcher using Async HTTP Client.
- *
- * @author Benjamin Hanzelmann
- */
-public class AsyncFetcher extends AbstractResourceFetcher {
-
- private static Logger log = LoggerFactory.getLogger(AsyncFetcher.class);
-
- private final AuthenticationInfo authInfo;
-
- private final ProxyInfo proxyInfo;
-
- private final String userAgent;
-
- private final IProgressMonitor monitor;
-
- private SimpleAsyncHttpClient httpClient;
-
- private String baseUrl;
-
- private final Map<String, Future<Response>> futures = new ConcurrentHashMap<String, Future<Response>>();
-
- private final Map<String, Streams> streams = new ConcurrentHashMap<String, Streams>();
-
- public AsyncFetcher(final AuthenticationInfo authInfo, final ProxyInfo proxyInfo, final IProgressMonitor monitor) {
- this.authInfo = authInfo;
- this.proxyInfo = proxyInfo;
- this.monitor = (monitor != null) ? monitor : new NullProgressMonitor();
- this.userAgent = computeUserAgent();
- }
-
- void cancel(String url) {
- Future<Response> future = futures.remove(url);
- if(future != null) {
- future.cancel(true);
- }
- }
-
- void closeStream(String url, Throwable exception) {
- log.debug("Closing streams for {} due to {}", new Object[] {url, exception.getMessage(), exception});
-
- Streams s = streams.remove(url);
-
- if(s == null) {
- return;
- }
-
- PipedErrorInputStream pis = s.in;
- pis.setError(exception);
-
- try {
- s.out.close();
- } catch(IOException ex) {
- // we tried
- }
- }
-
- public void connect(String id, String url) {
- httpClient = createClient(url);
- baseUrl = url.endsWith("/") ? url : (url + '/'); //$NON-NLS-1$
- }
-
- private SimpleAsyncHttpClient createClient(String url) {
- SimpleAsyncHttpClient.Builder sahcBuilder = new SimpleAsyncHttpClient.Builder();
-
- sahcBuilder.setUserAgent(userAgent);
-
- sahcBuilder.setConnectionTimeoutInMs(15 * 1000);
- sahcBuilder.setRequestTimeoutInMs(60 * 1000);
- sahcBuilder.setCompressionEnabled(true);
- sahcBuilder.setFollowRedirects(true);
- sahcBuilder.setErrorDocumentBehaviour(ErrorDocumentBehaviour.OMIT);
- sahcBuilder.setListener(new MonitorListener(monitor));
-
- addAuthInfo(sahcBuilder);
- addProxyInfo(url, sahcBuilder);
-
- return sahcBuilder.build();
- }
-
- private String computeUserAgent() {
- return MavenPluginActivator.getUserAgent();
- }
-
- private void addAuthInfo(SimpleAsyncHttpClient.Builder configBuilder) {
- if(authInfo != null && authInfo.getUserName() != null && authInfo.getUserName().length() > 0) {
- configBuilder.setRealmScheme(AuthScheme.BASIC);
- configBuilder.setRealmPrincipal(authInfo.getUserName());
- configBuilder.setRealmPassword(authInfo.getPassword());
- configBuilder.setRealmUsePreemptiveAuth(true);
- }
- }
-
- private void addProxyInfo(String url, SimpleAsyncHttpClient.Builder configBuilder) {
- if(proxyInfo != null) {
- Repository repo = new Repository("id", url); //$NON-NLS-1$
- if(!ProxyUtils.validateNonProxyHosts(proxyInfo, repo.getHost())) {
- if(proxyInfo != null) {
- ProxyServer.Protocol protocol = "https".equalsIgnoreCase(proxyInfo.getType()) ? ProxyServer.Protocol.HTTPS //$NON-NLS-1$
- : ProxyServer.Protocol.HTTP;
-
- configBuilder.setProxyProtocol(protocol);
- configBuilder.setProxyHost(proxyInfo.getHost());
- configBuilder.setProxyPort(proxyInfo.getPort());
- configBuilder.setProxyPrincipal(proxyInfo.getUserName());
- configBuilder.setProxyPassword(proxyInfo.getPassword());
- }
- }
- }
- }
-
- public void disconnect() {
- baseUrl = null;
- futures.clear();
-
- if(httpClient != null) {
- httpClient.close();
- }
-
- httpClient = null;
- }
-
- @SuppressWarnings("deprecation")
- public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
- InputStream is = retrieve(name);
- try {
- FileUtils.copyStreamToFile(new RawInputStreamFacade(is), targetFile);
- } finally {
- IOUtil.close(is);
- }
- }
-
- @Override
- public InputStream retrieve(String name) throws IOException, FileNotFoundException {
- final String url = buildUrl(baseUrl, name);
-
- monitor.subTask(NLS.bind(Messages.AsyncFetcher_task_fetching, url));
-
- PipedErrorInputStream pis = new PipedErrorInputStream();
- PipedOutputStream pos = new PipedOutputStream(pis);
- BodyConsumer consumer = new OutputStreamBodyConsumer(pos);
-
- streams.put(url, new Streams(pis, pos));
-
- Future<Response> future = httpClient.derive().setUrl(url).build().get(consumer, new ErrorPropagator(url));
-
- futures.put(url, future);
-
- return pis;
- }
-
- private static String buildUrl(String baseUrl, String resourceName) {
- String url = baseUrl;
-
- if(resourceName.startsWith("/")) { //$NON-NLS-1$
- url += resourceName.substring(1);
- } else {
- url += resourceName;
- }
-
- return url;
- }
-
- final class ErrorPropagator implements ThrowableHandler {
-
- private final String url;
-
- ErrorPropagator(String url) {
- this.url = url;
- }
-
- public void onThrowable(Throwable t) {
- closeStream(this.url, t);
- }
- }
-
- static final class PipedErrorInputStream extends PipedInputStream {
-
- private volatile Throwable error;
-
- public PipedErrorInputStream() {
- buffer = new byte[1024 * 128];
- }
-
- public void setError(Throwable t) {
- if(error == null) {
- error = t;
- }
- }
-
- private void checkError() throws IOException {
- if(error != null) {
- throw (IOException) new IOException(error.getMessage()).initCause(error);
- }
- }
-
- @Override
- public synchronized int read() throws IOException {
- checkError();
- int b = super.read();
- checkError();
- return b;
- }
- }
-
- private class MonitorListener implements SimpleAHCTransferListener {
-
- private IProgressMonitor monitor;
-
- public MonitorListener(IProgressMonitor monitor) {
- this.monitor = monitor;
- }
-
- private void checkCancelled(String url) {
- if(monitor.isCanceled()) {
- cancel(url);
- }
- }
-
- public void onStatus(String url, int code, String text) {
- checkCancelled(url);
- if(code != HttpURLConnection.HTTP_OK) {
- closeStream(url, new IOException(NLS.bind(Messages.AsyncFetcher_error_server, code, text)));
- }
- }
-
- public void onHeaders(String url, HeaderMap arg1) {
- checkCancelled(url);
- }
-
- public void onBytesReceived(String url, long amount, long current, long total) {
- checkCancelled(url);
- monitor.subTask(NLS.bind(Messages.AsyncFetcher_task_fetching2, url, amount * 100 / total));
- }
-
- public void onBytesSent(String arg0, long arg1, long arg2, long arg3) {
- // we only retrieve
- }
-
- public void onCompleted(String arg0, int arg1, String arg2) {
- monitor.subTask(""); //$NON-NLS-1$
- }
-
- }
-
- private final class Streams {
- PipedErrorInputStream in;
-
- PipedOutputStream out;
-
- public Streams(PipedErrorInputStream pis, PipedOutputStream pos) {
- this.in = pis;
- this.out = pos;
- }
- }
-
-}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
index 71959134..b42bfbb6 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
@@ -1178,11 +1178,12 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
protected IndexUpdateRequest newIndexUpdateRequest(IRepository repository, IndexingContext context,
IProgressMonitor monitor) throws IOException, CoreException {
+ //TODO: remove Wagon API
ProxyInfo proxyInfo = maven.getProxyInfo(repository.getProtocol());
AuthenticationInfo authenticationInfo = repository.getAuthenticationInfo();
- IndexUpdateRequest request = new IndexUpdateRequest(context, new AsyncFetcher(authenticationInfo, proxyInfo,
- monitor));
+ IndexUpdateRequest request = new IndexUpdateRequest(context, new AetherClientResourceFetcher(authenticationInfo,
+ proxyInfo, monitor));
File localRepo = repositoryRegistry.getLocalRepository().getBasedir();
File indexCacheBasedir = new File(localRepo, ".cache/m2e/" + MavenPluginActivator.getVersion()).getCanonicalFile(); //$NON-NLS-1$
File indexCacheDir = new File(indexCacheBasedir, repository.getUid());
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java
index 607a1d34..b6b0b885 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java
@@ -31,7 +31,7 @@ public interface MavenPreferenceConstants {
/** boolean */
public static final String P_OFFLINE = PREFIX + "offline"; //$NON-NLS-1$
- /** boolean. if true, use org.sonatype.aether.repository.RepositoryPolicy.UPDATE_POLICY_NEVER as global update policy */
+ /** boolean. if true, use org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_NEVER as global update policy */
public static final String P_GLOBAL_UPDATE_NEVER = PREFIX + "globalUpdatePolicy"; //$NON-NLS-1$
/** boolean */
diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml
index a70f00bf..01a19ea9 100644
--- a/org.eclipse.m2e.feature/feature.xml
+++ b/org.eclipse.m2e.feature/feature.xml
@@ -126,16 +126,4 @@
install-size="0"
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.jdt/plugin.xml b/org.eclipse.m2e.jdt/plugin.xml
index 8511f676..5cfef040 100644
--- a/org.eclipse.m2e.jdt/plugin.xml
+++ b/org.eclipse.m2e.jdt/plugin.xml
@@ -341,7 +341,7 @@
enablesFor="1" icon="icons/javadoc.gif"/>
</objectContribution>
<objectContribution id="org.eclipse.m2e.openJavaDocDependencyNodeAether"
- objectClass="org.sonatype.aether.graph.DependencyNode"
+ objectClass="org.eclipse.aether.graph.DependencyNode"
adaptable="false">
<action id="org.eclipse.m2e.ui.openJavaDocDependencyNode"
class="org.eclipse.m2e.jdt.internal.actions.OpenJavaDocAction"
diff --git a/org.eclipse.m2e.launching/build.properties b/org.eclipse.m2e.launching/build.properties
index a2e0058c..f6ea9b9e 100644
--- a/org.eclipse.m2e.launching/build.properties
+++ b/org.eclipse.m2e.launching/build.properties
@@ -16,6 +16,7 @@ bin.includes = META-INF/,\
icons/,\
org.eclipse.m2e.cliresolver.jar,\
org.eclipse.m2e.cliresolver30.jar,\
+ org.eclipse.m2e.cliresolver31.jar,\
about.html,\
schema/
jars.compile.order = .
diff --git a/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar b/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar
new file mode 100644
index 00000000..d42ed596
--- /dev/null
+++ b/org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar
Binary files differ
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
index 44761cc1..98076317 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
@@ -64,8 +64,10 @@ public class MavenLaunchUtils {
public static String getCliResolver(MavenRuntime runtime) throws CoreException {
String jarname;
String runtimeVersion = runtime.getVersion();
- if(runtimeVersion.startsWith("3.")) { //$NON-NLS-1$
+ if(runtimeVersion.startsWith("3.0")) { //$NON-NLS-1$
jarname = "org.eclipse.m2e.cliresolver30.jar"; //$NON-NLS-1$
+ } else if(runtimeVersion.startsWith("3.")) { //$NON-NLS-1$
+ jarname = "org.eclipse.m2e.cliresolver31.jar"; //$NON-NLS-1$
} else {
jarname = "org.eclipse.m2e.cliresolver.jar"; //$NON-NLS-1$
}
diff --git a/org.eclipse.m2e.refactoring/plugin.xml b/org.eclipse.m2e.refactoring/plugin.xml
index 041a6184..081b671e 100644
--- a/org.eclipse.m2e.refactoring/plugin.xml
+++ b/org.eclipse.m2e.refactoring/plugin.xml
@@ -62,7 +62,7 @@
<objectContribution
id="org.eclipse.m2e.refactoring.exclude.dependencyContributorAether"
- objectClass="org.sonatype.aether.graph.DependencyNode"
+ objectClass="org.eclipse.aether.graph.DependencyNode"
adaptable="true">
<action id="org.eclipse.m2e.projectMenu.action"
class="org.eclipse.m2e.refactoring.exclude.DependencyExcludeAction"
@@ -74,7 +74,7 @@
<objectContribution
id="org.eclipse.m2e.refactoring.set.dependencyContributorAether"
- objectClass="org.sonatype.aether.graph.DependencyNode"
+ objectClass="org.eclipse.aether.graph.DependencyNode"
adaptable="true">
<action id="org.eclipse.m2e.projectMenu.depSetAction"
class="org.eclipse.m2e.refactoring.dependencyset.DependencySetAction"
diff --git a/pom.xml b/pom.xml
index 874b49dd..199b2777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,11 +116,6 @@
<dependencies>
<dependency>
<groupId>org.eclipse.m2e</groupId>
- <artifactId>com.ning.async-http-client</artifactId>
- <version>${m2e-maven-runtime.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.m2e</groupId>
<artifactId>org.eclipse.m2e.archetype.common</artifactId>
<version>${m2e-maven-runtime.version}</version>
</dependency>
@@ -134,11 +129,6 @@
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
<version>${m2e-maven-runtime.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>org.jboss.netty</artifactId>
- <version>${m2e-maven-runtime.version}</version>
- </dependency>
</dependencies>
<build>

Back to the top