changed license to Apache License Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/222122a4 Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/222122a4 Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/222122a4
Branch: refs/heads/ant-tasks Commit: 222122a4f7265d11152662c7dc3f1aa89af717da Parents: b0c44dd Author: Hervé Boutemy <hbout...@apache.org> Authored: Sat May 7 18:25:24 2016 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat May 7 18:25:24 2016 +0200 ---------------------------------------------------------------------- CONTRIBUTING.md | 5 - build.xml | 24 +- epl-v10.html | 261 ----------- notice.html | 107 ----- pom.xml | 462 ++----------------- src/main/assembly/bin.xml | 24 +- .../aether/internal/ant/AetherUtils.java | 29 +- .../eclipse/aether/internal/ant/AntLogger.java | 29 +- .../aether/internal/ant/AntModelResolver.java | 29 +- .../eclipse/aether/internal/ant/AntRepoSys.java | 47 +- .../internal/ant/AntRepositoryListener.java | 29 +- .../aether/internal/ant/AntSecDispatcher.java | 29 +- .../ant/AntServiceLocatorErrorHandler.java | 29 +- .../ant/AntSettingsDecryptorFactory.java | 29 +- .../internal/ant/AntTransferListener.java | 29 +- .../aether/internal/ant/ConverterUtils.java | 31 +- .../org/eclipse/aether/internal/ant/Names.java | 31 +- .../internal/ant/ProjectWorkspaceReader.java | 29 +- .../aether/internal/ant/SettingsUtils.java | 29 +- .../internal/ant/tasks/AbstractDistTask.java | 31 +- .../ant/tasks/AbstractResolvingTask.java | 33 +- .../ant/tasks/DependencyGraphLogger.java | 29 +- .../aether/internal/ant/tasks/Deploy.java | 29 +- .../aether/internal/ant/tasks/Install.java | 29 +- .../aether/internal/ant/tasks/Layout.java | 29 +- .../aether/internal/ant/tasks/RefTask.java | 29 +- .../aether/internal/ant/tasks/Resolve.java | 41 +- .../aether/internal/ant/types/Artifact.java | 29 +- .../internal/ant/types/ArtifactContainer.java | 29 +- .../aether/internal/ant/types/Artifacts.java | 29 +- .../internal/ant/types/Authentication.java | 29 +- .../aether/internal/ant/types/Dependencies.java | 29 +- .../aether/internal/ant/types/Dependency.java | 29 +- .../internal/ant/types/DependencyContainer.java | 29 +- .../aether/internal/ant/types/Exclusion.java | 29 +- .../internal/ant/types/LocalRepository.java | 29 +- .../aether/internal/ant/types/Mirror.java | 29 +- .../internal/ant/types/ModelValueExtractor.java | 29 +- .../eclipse/aether/internal/ant/types/Pom.java | 29 +- .../ant/types/PomPropertyEvaluator.java | 29 +- .../internal/ant/types/PomPropertyHelper.java | 29 +- .../aether/internal/ant/types/Proxy.java | 29 +- .../internal/ant/types/RemoteRepositories.java | 29 +- .../internal/ant/types/RemoteRepository.java | 31 +- .../ant/types/RemoteRepositoryContainer.java | 29 +- .../aether/internal/ant/types/Settings.java | 29 +- src/main/resources/about.html | 156 ------- src/main/resources/about_files/APACHE-1.1.txt | 56 --- src/main/resources/about_files/APACHE-2.0.txt | 202 -------- src/main/resources/about_files/BSD-3-Clause.txt | 34 -- src/main/resources/about_files/IUEL-1.1.1.txt | 46 -- src/main/resources/about_files/MIT.txt | 43 -- .../resources/org/eclipse/aether/ant/antlib.xml | 24 +- .../aether/internal/ant/AntBuildsTest.java | 29 +- .../eclipse/aether/internal/ant/DeployTest.java | 29 +- .../aether/internal/ant/InstallTest.java | 29 +- .../ant/ProjectWorkspaceReaderTest.java | 29 +- .../aether/internal/ant/ReactorTest.java | 29 +- .../aether/internal/ant/ResolveTest.java | 29 +- .../aether/internal/ant/SettingsTest.java | 29 +- .../aether/internal/ant/tasks/LayoutTest.java | 29 +- .../internal/ant/types/DependencyTest.java | 29 +- .../internal/ant/types/ExclusionTest.java | 29 +- .../aether/internal/ant/types/PomTest.java | 29 +- .../ProjectWorkspaceReader/dummy-pom.xml | 24 +- src/test/resources/ant/Deploy/ant.xml | 24 +- src/test/resources/ant/Deploy/dummy-pom.xml | 24 +- src/test/resources/ant/Deploy/other-pom.xml | 24 +- src/test/resources/ant/Install/ant.xml | 24 +- src/test/resources/ant/Install/dummy-pom.xml | 24 +- src/test/resources/ant/Install/other-pom.xml | 24 +- src/test/resources/ant/Reactor/ant.xml | 24 +- src/test/resources/ant/Reactor/pom1.xml | 24 +- src/test/resources/ant/Reactor/pom2.xml | 24 +- src/test/resources/ant/Resolve/ant.xml | 24 +- src/test/resources/ant/Resolve/dummy-pom.xml | 24 +- src/test/resources/ant/Resolve/pom.xml | 24 +- src/test/resources/ant/Settings/ant.xml | 24 +- src/test/resources/ant/common.xml | 24 +- 79 files changed, 1336 insertions(+), 1989 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 2a98799..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -Contributing Patches -==================== -Please be sure to read our [contribution guide](http://www.eclipse.org/aether/contribution/) first to avoid running down -the wrong path. Non-conforming contributions are less likely to get accepted or might not be noticed by the committers -at all. http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 2bf57a5..b73eca7 100644 --- a/build.xml +++ b/build.xml @@ -1,14 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (c) 2010, 2014 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 + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. --> <project xmlns:aether="antlib:org.eclipse.aether.ant" default="deploy"> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/epl-v10.html ---------------------------------------------------------------------- diff --git a/epl-v10.html b/epl-v10.html deleted file mode 100644 index fd39122..0000000 --- a/epl-v10.html +++ /dev/null @@ -1,261 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml";> - -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -</head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.</p> - -<p class="list">c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.</p> - -<p class="list">d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.</p> - -<p>For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED 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. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> - -<p><b>7. GENERAL</b></p> - -<p>If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.</p> - -<p>If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.</p> - -<p>All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.</p> - -<p>Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.</p> - -<p>This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.</p> - -</body> - -</html> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/notice.html ---------------------------------------------------------------------- diff --git a/notice.html b/notice.html deleted file mode 100644 index c3d34c3..0000000 --- a/notice.html +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!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=ISO-8859-1" /> -<title>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 9, 2014</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also 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, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html";>http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html";>http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE";>http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0";>http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html";>http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html";>http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 915ae45..b5dda58 100644 --- a/pom.xml +++ b/pom.xml @@ -1,20 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (c) 2010, 2014 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 + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. --> -<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";> +<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.aether</groupId> + <parent> + <groupId>org.apache.maven</groupId> + <artifactId>maven-parent</artifactId> + <version>27</version> + </parent> + + <groupId>org.apache.maven.aether</groupId> <artifactId>aether-ant-tasks</artifactId> <version>1.1.0-SNAPSHOT</version> @@ -22,103 +37,35 @@ <description> Ant tasks handling Maven artifacts using Aether and Maven Aether Provider. </description> - <url>http://www.eclipse.org/aether/</url> + <url>http://maven.apache.org/aether-ant-tasks/</url> <inceptionYear>2010</inceptionYear> - <organization> - <name>The Eclipse Foundation</name> - <url>http://www.eclipse.org/</url> - </organization> - - <mailingLists> - <mailingList> - <name>Aether Developer List</name> - <subscribe>https://dev.eclipse.org/mailman/listinfo/aether-dev</subscribe> - <unsubscribe>https://dev.eclipse.org/mailman/listinfo/aether-dev</unsubscribe> - <post>aether-...@eclipse.org</post> - <archive>http://dev.eclipse.org/mhonarc/lists/aether-dev/</archive> - </mailingList> - <mailingList> - <name>Aether User List</name> - <subscribe>https://dev.eclipse.org/mailman/listinfo/aether-users</subscribe> - <unsubscribe>https://dev.eclipse.org/mailman/listinfo/aether-users</unsubscribe> - <post>aether-us...@eclipse.org</post> - <archive>http://dev.eclipse.org/mhonarc/lists/aether-users/</archive> - </mailingList> - <mailingList> - <name>Aether Commit Notification List</name> - <subscribe>https://dev.eclipse.org/mailman/listinfo/aether-commit</subscribe> - <unsubscribe>https://dev.eclipse.org/mailman/listinfo/aether-commit</unsubscribe> - <archive>http://dev.eclipse.org/mhonarc/lists/aether-commit/</archive> - </mailingList> - <mailingList> - <name>Aether CI Notification List</name> - <subscribe>https://dev.eclipse.org/mailman/listinfo/aether-build</subscribe> - <unsubscribe>https://dev.eclipse.org/mailman/listinfo/aether-build</unsubscribe> - <archive>http://dev.eclipse.org/mhonarc/lists/aether-build/</archive> - </mailingList> - </mailingLists> - <scm> - <connection>scm:git:git://git.eclipse.org/gitroot/aether/aether-ant.git</connection> - <developerConnection>scm:git:ssh://git.eclipse.org/gitroot/aether/aether-ant.git</developerConnection> - <url>http://git.eclipse.org/c/aether/aether-ant.git/</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-aether.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-aether.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf/maven-aether.git</url> + <tag>ant-tasks</tag> </scm> - - <issueManagement> - <system>bugzilla</system> - <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&bug_status=__open__&product=Aether</url> + <!--issueManagement> + <system>jira</system> + <url>https://issues.apache.org/jira/browse/</url> </issueManagement> - <ciManagement> - <system>Hudson</system> - <url>https://hudson.eclipse.org/aether/job/aether-ant/</url> - </ciManagement> - + <system>Jenkins</system> + <url>https://builds.apache.org/job/</url> + </ciManagement--> <distributionManagement> - <repository> - <id>sonatype-nexus-staging</id> - <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> - </repository> - <snapshotRepository> - <id>${sonatypeOssDistMgmtSnapshotsId}</id> - <url>${sonatypeOssDistMgmtSnapshotsUrl}</url> - </snapshotRepository> + <site> + <id>apache.website</id> + <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url> + </site> </distributionManagement> - <licenses> - <license> - <name>Eclipse Public License, Version 1.0</name> - <url>http://www.eclipse.org/legal/epl-v10.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <developers> - <developer> - <id>bbentmann</id> - <name>Benjamin Bentmann</name> - <roles> - <role>Project Lead</role> - </roles> - </developer> - <developer> - <id>jvanzyl</id> - <name>Jason Van Zyl</name> - <roles> - <role>Project Lead</role> - </roles> - </developer> - </developers> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> - <sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId> - <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl> <mavenVersion>3.1.0</mavenVersion> <aetherVersion>1.0.1.v20141111</aetherVersion> + <maven.site.path>aether-archives/aether-ant-tasksLATEST</maven.site.path> + <checkstyle.violation.ignore>LineLength,MagicNumber</checkstyle.violation.ignore> </properties> <dependencyManagement> @@ -136,7 +83,6 @@ </dependencies> </dependencyManagement> - <!-- NOTE: Remember to update the about.html to reflect the used 3rd party dependencies --> <dependencies> <dependency> <!-- NOTE: The target runtime is actually Ant 1.7+ but for compilation we need some newer APIs --> @@ -222,7 +168,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-annotations</artifactId> - <version>1.5.5</version> <scope>provided</scope> </dependency> <dependency> @@ -300,199 +245,20 @@ </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <!-- NOTE: Avoiding 2.4+ due to https://github.com/sonatype/m2eclipse-extras/issues/10 --> - <version>2.3.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <detectOfflineLinks>false</detectOfflineLinks> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.1</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <mavenExecutorId>forked-path</mavenExecutorId> - <useReleaseProfile>false</useReleaseProfile> - <goals>deploy assembly:attached</goals> - <arguments>-Psonatype-oss-release</arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.9</version> - <configuration> - <argLine>-Xmx128m</argLine> - <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> - <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}/surefire-tmp</java.io.tmpdir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.6</version> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java15</artifactId> - <version>1.0</version> - </signature> - </configuration> - <executions> - <execution> - <id>check-java-1.5-compat</id> - <phase>process-classes</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>approved-dependencies</id> - <phase>verify</phase> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <bannedDependencies> - <searchTransitive>true</searchTransitive> - <excludes> - <exclude>*:*</exclude> - </excludes> - <includes> - <include>org.eclipse.aether</include> - <include>org.eclipse.sisu</include> - <!-- CQ #5627 --> - <include>org.slf4j:slf4j-api:[1.6.2]</include> - <!-- CQ #5642 --> - <include>org.slf4j:slf4j-nop:[1.6.2]</include> - <!-- CQ #7347 --> - <include>org.slf4j:jcl-over-slf4j:[1.6.2]</include> - <!-- CQ #5643 --> - <include>org.apache.ant:ant:[1.8.2]</include> - <!-- CQ #5629 --> - <include>org.codehaus.plexus:plexus-component-annotations:[1.5.5]</include> - <!-- CQ #5630 --> - <include>org.codehaus.plexus:plexus-utils:[2.1]</include> - <!-- CQ #7208 --> - <include>org.codehaus.plexus:plexus-interpolation:[1.16]</include> - <!-- CQ #5645 --> - <include>org.sonatype.plexus:plexus-sec-dispatcher:[1.3]</include> - <!-- CQ #5646 --> - <include>org.sonatype.plexus:plexus-cipher:[1.7]</include> - <!-- CQ #7438 --> - <include>org.apache.maven:maven-model:[3.1.0]</include> - <!-- CQ #7439 --> - <include>org.apache.maven:maven-model-builder:[3.1.0]</include> - <!-- CQ #7440 --> - <include>org.apache.maven:maven-settings:[3.1.0]</include> - <!-- CQ #7441 --> - <include>org.apache.maven:maven-settings-builder:[3.1.0]</include> - <!-- CQ #7442 --> - <include>org.apache.maven:maven-repository-metadata:[3.1.0]</include> - <!-- CQ #7443 --> - <include>org.apache.maven:maven-aether-provider:[3.1.0]</include> - <!-- CQ #7685 --> - <include>org.apache.httpcomponents:httpclient:[4.2.6]</include> - <!-- CQ #7686 --> - <include>org.apache.httpcomponents:httpcore:[4.2.5]</include> - <!-- CQ #7346 --> - <include>commons-codec:commons-codec:[1.6]</include> - <!-- CQ #5653, 7538 --> - <include>org.apache.ant:ant-launcher:[1.8.2]:*:test</include> - <include>org.apache.ant:ant-testutil:[1.8.2]:*:test</include> - <include>junit:junit:[4.11]:*:test</include> - <include>org.hamcrest:hamcrest-core:[1.3]:*:test</include> - <include>org.hamcrest:hamcrest-library:[1.3]:*:test</include> - </includes> - </bannedDependencies> - </rules> - </configuration> - </execution> - </executions> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/**/*.txt</exclude> + <exclude>README.md</exclude> + </excludes> + </configuration> </plugin> <plugin> <artifactId>maven-shade-plugin</artifactId> - <version>1.4</version> + <version>2.4.3</version> <executions> <execution> <phase>package</phase> @@ -539,7 +305,6 @@ <shadedPattern>org.eclipse.aether.internal.ant.org.apache</shadedPattern> <excludes> <exclude>org.apache.tools.**</exclude> - <exclude>org.apache.maven.model.pom-*</exclude> </excludes> </relocation> <relocation> @@ -592,130 +357,5 @@ </plugins> </build> </profile> - <profile> - <id>sonatype-oss-release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <createSourcesJar>true</createSourcesJar> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.apache.resources</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> - <version>1.0.2</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>attach-source-release-distro</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs> - <descriptorRef>source-release</descriptorRef> - </descriptorRefs> - <tarLongFileFormat>gnu</tarLongFileFormat> - </configuration> - </execution> - <execution> - <id>default-cli</id> - <configuration> - <attach>false</attach> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>snapshot-sources</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>ossrh-staging-repo</id> - <repositories> - <repository> - <id>ossrh-staging</id> - <url>http://oss.sonatype.org/content/groups/staging/</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - </repository> - </repositories> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index 0e0f61d..a2df39b 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -1,14 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (c) 2013, 2014 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 + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. --> <assembly> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AetherUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AetherUtils.java b/src/main/java/org/eclipse/aether/internal/ant/AetherUtils.java index e76ba08..337c647 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AetherUtils.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AetherUtils.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.File; import org.apache.tools.ant.Project; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntLogger.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntLogger.java b/src/main/java/org/eclipse/aether/internal/ant/AntLogger.java index 033dfdc..0071142 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntLogger.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntLogger.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import org.apache.tools.ant.Project; import org.eclipse.aether.spi.log.Logger; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java index dc7ef72..0ea3a40 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.File; import java.util.Collections; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java b/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java index 76cc927..de05c98 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -101,13 +110,13 @@ import org.eclipse.aether.util.repository.DefaultProxySelector; public class AntRepoSys { - private static boolean OS_WINDOWS = Os.isFamily( "windows" ); + private static final boolean OS_WINDOWS = Os.isFamily( "windows" ); - private static final ModelBuilder modelBuilder = new DefaultModelBuilderFactory().newInstance(); + private static final ModelBuilder MODEL_BUILDER = new DefaultModelBuilderFactory().newInstance(); - private static final SettingsBuilder settingsBuilder = new DefaultSettingsBuilderFactory().newInstance(); + private static final SettingsBuilder SETTINGS_BUILDER = new DefaultSettingsBuilderFactory().newInstance(); - private static final SettingsDecrypter settingsDecrypter = new AntSettingsDecryptorFactory().newInstance(); + private static final SettingsDecrypter SETTINGS_DECRYPTER = new AntSettingsDecryptorFactory().newInstance(); private final Project project; @@ -158,7 +167,7 @@ public class AntRepoSys locator = MavenRepositorySystemUtils.newServiceLocator(); locator.setErrorHandler( new AntServiceLocatorErrorHandler( project ) ); locator.setServices( Logger.class, new AntLogger( project ) ); - locator.setServices( ModelBuilder.class, modelBuilder ); + locator.setServices( ModelBuilder.class, MODEL_BUILDER ); locator.addService( RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class ); locator.addService( TransporterFactory.class, FileTransporterFactory.class ); locator.addService( TransporterFactory.class, HttpTransporterFactory.class ); @@ -360,7 +369,7 @@ public class AntRepoSys try { - settings = settingsBuilder.build( request ).getEffectiveSettings(); + settings = SETTINGS_BUILDER.build( request ).getEffectiveSettings(); } catch ( SettingsBuildingException e ) { @@ -368,7 +377,7 @@ public class AntRepoSys } SettingsDecryptionResult result = - settingsDecrypter.decrypt( new DefaultSettingsDecryptionRequest( settings ) ); + SETTINGS_DECRYPTER.decrypt( new DefaultSettingsDecryptionRequest( settings ) ); settings.setServers( result.getServers() ); settings.setProxies( result.getProxies() ); } @@ -540,7 +549,7 @@ public class AntRepoSys request.setProfiles( SettingsUtils.convert( settings.getProfiles() ) ); request.setActiveProfileIds( settings.getActiveProfiles() ); request.setModelResolver( modelResolver ); - return modelBuilder.build( request ).getEffectiveModel(); + return MODEL_BUILDER.build( request ).getEffectiveModel(); } catch ( ModelBuildingException e ) { @@ -620,7 +629,7 @@ public class AntRepoSys if ( dependencies != null ) { - populateCollectRequest( collectRequest, task, session, dependencies, Collections.<Exclusion> emptyList() ); + populateCollectRequest( collectRequest, task, session, dependencies, Collections.<Exclusion>emptyList() ); } task.getProject().log( "Collecting dependencies", Project.MSG_VERBOSE ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntRepositoryListener.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntRepositoryListener.java b/src/main/java/org/eclipse/aether/internal/ant/AntRepositoryListener.java index 6ed9772..0842838 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntRepositoryListener.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntRepositoryListener.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.FileNotFoundException; import org.apache.tools.ant.Project; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntSecDispatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntSecDispatcher.java b/src/main/java/org/eclipse/aether/internal/ant/AntSecDispatcher.java index e480d77..0c5b3ec 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntSecDispatcher.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntSecDispatcher.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipherException; import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntServiceLocatorErrorHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntServiceLocatorErrorHandler.java b/src/main/java/org/eclipse/aether/internal/ant/AntServiceLocatorErrorHandler.java index 9715246..2b2ab8f 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntServiceLocatorErrorHandler.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntServiceLocatorErrorHandler.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import org.apache.tools.ant.Project; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.impl.DefaultServiceLocator; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java b/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java index 0195292..91a6c13 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.lang.reflect.Field; import org.apache.maven.settings.crypto.DefaultSettingsDecrypter; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/AntTransferListener.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntTransferListener.java b/src/main/java/org/eclipse/aether/internal/ant/AntTransferListener.java index 914cd1f..9ca576e 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/AntTransferListener.java +++ b/src/main/java/org/eclipse/aether/internal/ant/AntTransferListener.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/ConverterUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/ConverterUtils.java b/src/main/java/org/eclipse/aether/internal/ant/ConverterUtils.java index 79f994b..d50a454 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/ConverterUtils.java +++ b/src/main/java/org/eclipse/aether/internal/ant/ConverterUtils.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -209,7 +218,7 @@ class ConverterUtils results = remoteRepositoryManager.aggregateRepositories( session, - Collections.<org.eclipse.aether.repository.RemoteRepository> emptyList(), + Collections.<org.eclipse.aether.repository.RemoteRepository>emptyList(), results, true ); return results; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/Names.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/Names.java b/src/main/java/org/eclipse/aether/internal/ant/Names.java index 7d6e8c2..3111493 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/Names.java +++ b/src/main/java/org/eclipse/aether/internal/ant/Names.java @@ -1,15 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/** + */ public final class Names { http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/ProjectWorkspaceReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/ProjectWorkspaceReader.java b/src/main/java/org/eclipse/aether/internal/ant/ProjectWorkspaceReader.java index 1215f9e..d4179b2 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/ProjectWorkspaceReader.java +++ b/src/main/java/org/eclipse/aether/internal/ant/ProjectWorkspaceReader.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.File; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/SettingsUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/SettingsUtils.java b/src/main/java/org/eclipse/aether/internal/ant/SettingsUtils.java index 1d7314c..53d32db 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/SettingsUtils.java +++ b/src/main/java/org/eclipse/aether/internal/ant/SettingsUtils.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractDistTask.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractDistTask.java b/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractDistTask.java index 1c0eccb..5cd657f 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractDistTask.java +++ b/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractDistTask.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant.tasks; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import java.io.File; import java.util.HashMap; import java.util.Map; @@ -102,7 +111,7 @@ public abstract class AbstractDistTask Model model = getPom().getModel( this ); - if ( ! ( model.getGroupId().equals( gid ) && model.getArtifactId().equals( aid ) && model.getVersion().equals( version )) ) + if ( ! ( model.getGroupId().equals( gid ) && model.getArtifactId().equals( aid ) && model.getVersion().equals( version ) ) ) { throw new BuildException( "Artifact references different pom than it would be installed with: " + artifact.toString() ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/222122a4/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractResolvingTask.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractResolvingTask.java b/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractResolvingTask.java index 8590646..5375415 100644 --- a/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractResolvingTask.java +++ b/src/main/java/org/eclipse/aether/internal/ant/tasks/AbstractResolvingTask.java @@ -1,15 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 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.aether.internal.ant.tasks; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Reference; @@ -20,6 +29,8 @@ import org.eclipse.aether.internal.ant.types.LocalRepository; import org.eclipse.aether.internal.ant.types.RemoteRepositories; import org.eclipse.aether.internal.ant.types.RemoteRepository; +/** + */ public abstract class AbstractResolvingTask extends Task { @@ -93,4 +104,4 @@ public abstract class AbstractResolvingTask remoteRepositories ); } -} \ No newline at end of file +}
