Permalink
Browse files

418263 Replaced netty/ahc with okhttp

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
  • Loading branch information...
Jason van Zyl authored and ifedorenko committed Sep 29, 2013
1 parent 85527e1 commit b29933bbb8cf2659d05d42e288c9c14ba7a416ea
Showing with 368 additions and 1,009 deletions.
  1. +0 −70 m2e-maven-runtime/com.ning.async-http-client/pom.xml
  2. +0 −2 m2e-maven-runtime/com.ning.async-http-client/src/main/resources/OSGI-INF/l10n/bundle.properties
  3. +0 −202 m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt
  4. +14 −0 m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
  5. +0 −1 m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
  6. +13 −23 m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
  7. +0 −85 m2e-maven-runtime/org.jboss.netty/pom.xml
  8. +0 −2 m2e-maven-runtime/org.jboss.netty/src/main/resources/OSGI-INF/l10n/bundle.properties
  9. +0 −48 m2e-maven-runtime/org.jboss.netty/src/main/resources/about.html
  10. +0 −202 m2e-maven-runtime/org.jboss.netty/src/main/resources/about_files/LICENSE-2.0.txt
  11. +0 −2 m2e-maven-runtime/pom.xml
  12. +4 −23 ...runtime/com.ning.async-http-client/src/main/resources → org.eclipse.m2e.cliresolver31}/about.html
  13. +95 −0 org.eclipse.m2e.cliresolver31/pom.xml
  14. +56 −0 ...eclipse.m2e.cliresolver31/src/main/java/org/eclipse/m2e/cliresolver31/EclipseWorkspaceReader.java
  15. +2 −2 org.eclipse.m2e.core.ui/plugin.xml
  16. +1 −2 org.eclipse.m2e.core/META-INF/MANIFEST.MF
  17. +1 −1 org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
  18. +1 −1 org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenEmbeddedRuntime.java
  19. +170 −0 org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
  20. +0 −314 org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java
  21. +3 −2 org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
  22. +1 −1 org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java
  23. +0 −12 org.eclipse.m2e.feature/feature.xml
  24. +1 −1 org.eclipse.m2e.jdt/plugin.xml
  25. +1 −0 org.eclipse.m2e.launching/build.properties
  26. BIN org.eclipse.m2e.launching/org.eclipse.m2e.cliresolver31.jar
  27. +3 −1 org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
  28. +2 −2 org.eclipse.m2e.refactoring/plugin.xml
  29. +0 −10 pom.xml
@@ -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>
@@ -1,2 +0,0 @@
-Bundle-Vendor = Sonatype, Inc.
-Bundle-Name = async-http-client
@@ -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.
@@ -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>
@@ -42,7 +42,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
@@ -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>
@@ -91,31 +91,21 @@
<optional>true</optional>
</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>
Oops, something went wrong.

0 comments on commit b29933b

Please sign in to comment.