On 1 July 2013 21:29, <[email protected]> wrote: > Updated Branches: > refs/heads/master 1a6bc6276 -> b4dc8931f > > > Some updates to start working on a proper LICENCE/NOTICE > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b4dc8931 > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b4dc8931 > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b4dc8931 > > Branch: refs/heads/master > Commit: b4dc8931f2cc7b56302df78c03a7db57211cd3a7 > Parents: 1a6bc62 > Author: Daniel Kulp <[email protected]> > Authored: Mon Jul 1 16:28:28 2013 -0400 > Committer: Daniel Kulp <[email protected]> > Committed: Mon Jul 1 16:28:28 2013 -0400 > > ---------------------------------------------------------------------- > apache-maven/LICENSE.txt | 202 ------------------- > apache-maven/NOTICE.txt | 27 --- > apache-maven/pom.xml | 2 +- > .../main/appended-resources/META-INF/LICENSE.vm | 38 ++++ > apache-maven/src/main/assembly/bin.xml | 10 +- > 5 files changed, 47 insertions(+), 232 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/maven/blob/b4dc8931/apache-maven/LICENSE.txt > ---------------------------------------------------------------------- > diff --git a/apache-maven/LICENSE.txt b/apache-maven/LICENSE.txt > deleted file mode 100644 > index d645695..0000000 > --- a/apache-maven/LICENSE.txt > +++ /dev/null > @@ -1,202 +0,0 @@ > - > - Apache License > - Version 2.0, January 2004 > - http://www.apache.org/licenses/ > - > - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION > - > - 1. Definitions. > - > - "License" shall mean the terms and conditions for use, reproduction, > - and distribution as defined by Sections 1 through 9 of this document. > - > - "Licensor" shall mean the copyright owner or entity authorized by > - the copyright owner that is granting the License. > - > - "Legal Entity" shall mean the union of the acting entity and all > - other entities that control, are controlled by, or are under common > - control with that entity. For the purposes of this definition, > - "control" means (i) the power, direct or indirect, to cause the > - direction or management of such entity, whether by contract or > - otherwise, or (ii) ownership of fifty percent (50%) or more of the > - outstanding shares, or (iii) beneficial ownership of such entity. > - > - "You" (or "Your") shall mean an individual or Legal Entity > - exercising permissions granted by this License. > - > - "Source" form shall mean the preferred form for making modifications, > - including but not limited to software source code, documentation > - source, and configuration files. > - > - "Object" form shall mean any form resulting from mechanical > - transformation or translation of a Source form, including but > - not limited to compiled object code, generated documentation, > - and conversions to other media types. > - > - "Work" shall mean the work of authorship, whether in Source or > - Object form, made available under the License, as indicated by a > - copyright notice that is included in or attached to the work > - (an example is provided in the Appendix below). > - > - "Derivative Works" shall mean any work, whether in Source or Object > - form, that is based on (or derived from) the Work and for which the > - editorial revisions, annotations, elaborations, or other modifications > - represent, as a whole, an original work of authorship. For the purposes > - of this License, Derivative Works shall not include works that remain > - separable from, or merely link (or bind by name) to the interfaces of, > - the Work and Derivative Works thereof. > - > - "Contribution" shall mean any work of authorship, including > - the original version of the Work and any modifications or additions > - to that Work or Derivative Works thereof, that is intentionally > - submitted to Licensor for inclusion in the Work by the copyright owner > - or by an individual or Legal Entity authorized to submit on behalf of > - the copyright owner. For the purposes of this definition, "submitted" > - means any form of electronic, verbal, or written communication sent > - to the Licensor or its representatives, including but not limited to > - communication on electronic mailing lists, source code control systems, > - and issue tracking systems that are managed by, or on behalf of, the > - Licensor for the purpose of discussing and improving the Work, but > - excluding communication that is conspicuously marked or otherwise > - designated in writing by the copyright owner as "Not a Contribution." > - > - "Contributor" shall mean Licensor and any individual or Legal Entity > - on behalf of whom a Contribution has been received by Licensor and > - subsequently incorporated within the Work. > - > - 2. Grant of Copyright License. Subject to the terms and conditions of > - this License, each Contributor hereby grants to You a perpetual, > - worldwide, non-exclusive, no-charge, royalty-free, irrevocable > - copyright license to reproduce, prepare Derivative Works of, > - publicly display, publicly perform, sublicense, and distribute the > - Work and such Derivative Works in Source or Object form. > - > - 3. Grant of Patent License. Subject to the terms and conditions of > - this License, each Contributor hereby grants to You a perpetual, > - worldwide, non-exclusive, no-charge, royalty-free, irrevocable > - (except as stated in this section) patent license to make, have made, > - use, offer to sell, sell, import, and otherwise transfer the Work, > - where such license applies only to those patent claims licensable > - by such Contributor that are necessarily infringed by their > - Contribution(s) alone or by combination of their Contribution(s) > - with the Work to which such Contribution(s) was submitted. If You > - institute patent litigation against any entity (including a > - cross-claim or counterclaim in a lawsuit) alleging that the Work > - or a Contribution incorporated within the Work constitutes direct > - or contributory patent infringement, then any patent licenses > - granted to You under this License for that Work shall terminate > - as of the date such litigation is filed. > - > - 4. Redistribution. You may reproduce and distribute copies of the > - Work or Derivative Works thereof in any medium, with or without > - modifications, and in Source or Object form, provided that You > - meet the following conditions: > - > - (a) You must give any other recipients of the Work or > - Derivative Works a copy of this License; and > - > - (b) You must cause any modified files to carry prominent notices > - stating that You changed the files; and > - > - (c) You must retain, in the Source form of any Derivative Works > - that You distribute, all copyright, patent, trademark, and > - attribution notices from the Source form of the Work, > - excluding those notices that do not pertain to any part of > - the Derivative Works; and > - > - (d) If the Work includes a "NOTICE" text file as part of its > - distribution, then any Derivative Works that You distribute must > - include a readable copy of the attribution notices contained > - within such NOTICE file, excluding those notices that do not > - pertain to any part of the Derivative Works, in at least one > - of the following places: within a NOTICE text file distributed > - as part of the Derivative Works; within the Source form or > - documentation, if provided along with the Derivative Works; or, > - within a display generated by the Derivative Works, if and > - wherever such third-party notices normally appear. The contents > - of the NOTICE file are for informational purposes only and > - do not modify the License. You may add Your own attribution > - notices within Derivative Works that You distribute, alongside > - or as an addendum to the NOTICE text from the Work, provided > - that such additional attribution notices cannot be construed > - as modifying the License. > - > - You may add Your own copyright statement to Your modifications and > - may provide additional or different license terms and conditions > - for use, reproduction, or distribution of Your modifications, or > - for any such Derivative Works as a whole, provided Your use, > - reproduction, and distribution of the Work otherwise complies with > - the conditions stated in this License. > - > - 5. Submission of Contributions. Unless You explicitly state otherwise, > - any Contribution intentionally submitted for inclusion in the Work > - by You to the Licensor shall be under the terms and conditions of > - this License, without any additional terms or conditions. > - Notwithstanding the above, nothing herein shall supersede or modify > - the terms of any separate license agreement you may have executed > - with Licensor regarding such Contributions. > - > - 6. Trademarks. This License does not grant permission to use the trade > - names, trademarks, service marks, or product names of the Licensor, > - except as required for reasonable and customary use in describing the > - origin of the Work and reproducing the content of the NOTICE file. > - > - 7. Disclaimer of Warranty. Unless required by applicable law or > - agreed to in writing, Licensor provides the Work (and each > - Contributor provides its Contributions) on an "AS IS" BASIS, > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > - implied, including, without limitation, any warranties or conditions > - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A > - PARTICULAR PURPOSE. You are solely responsible for determining the > - appropriateness of using or redistributing the Work and assume any > - risks associated with Your exercise of permissions under this License. > - > - 8. Limitation of Liability. In no event and under no legal theory, > - whether in tort (including negligence), contract, or otherwise, > - unless required by applicable law (such as deliberate and grossly > - negligent acts) or agreed to in writing, shall any Contributor be > - liable to You for damages, including any direct, indirect, special, > - incidental, or consequential damages of any character arising as a > - result of this License or out of the use or inability to use the > - Work (including but not limited to damages for loss of goodwill, > - work stoppage, computer failure or malfunction, or any and all > - other commercial damages or losses), even if such Contributor > - has been advised of the possibility of such damages. > - > - 9. Accepting Warranty or Additional Liability. While redistributing > - the Work or Derivative Works thereof, You may choose to offer, > - and charge a fee for, acceptance of support, warranty, indemnity, > - or other liability obligations and/or rights consistent with this > - License. However, in accepting such obligations, You may act only > - on Your own behalf and on Your sole responsibility, not on behalf > - of any other Contributor, and only if You agree to indemnify, > - defend, and hold each Contributor harmless for any liability > - incurred by, or claims asserted against, such Contributor by reason > - of your accepting any such warranty or additional liability. > - > - END OF TERMS AND CONDITIONS > - > - APPENDIX: How to apply the Apache License to your work. > - > - To apply the Apache License to your work, attach the following > - boilerplate notice, with the fields enclosed by brackets "[]" > - replaced with your own identifying information. (Don't include > - the brackets!) The text should be enclosed in the appropriate > - comment syntax for the file format. We also recommend that a > - file or class name and description of purpose be included on the > - same "printed page" as the copyright notice for easier > - identification within third-party archives. > - > - Copyright [yyyy] [name of copyright owner] > - > - Licensed under the Apache License, Version 2.0 (the "License"); > - you may not use this file except in compliance with the License. > - You may obtain a copy of the License at > - > - http://www.apache.org/licenses/LICENSE-2.0 > - > - Unless required by applicable law or agreed to in writing, software > - distributed under the License is distributed on an "AS IS" BASIS, > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > - See the License for the specific language governing permissions and > - limitations under the License. > > http://git-wip-us.apache.org/repos/asf/maven/blob/b4dc8931/apache-maven/NOTICE.txt > ---------------------------------------------------------------------- > diff --git a/apache-maven/NOTICE.txt b/apache-maven/NOTICE.txt > deleted file mode 100644 > index e911104..0000000 > --- a/apache-maven/NOTICE.txt > +++ /dev/null > @@ -1,27 +0,0 @@ > - ========================================================================= > - == NOTICE file corresponding to the section 4 d of == > - == the Apache License, Version 2.0, == > - == in this case for the Apache Maven distribution. == > - ========================================================================= > - > -Apache Maven > -Copyright 2001-2013 The Apache Software Foundation > - > -This product includes software developed by > -The Apache Software Foundation (http://www.apache.org/). > - > -This product includes software (Aether, Sisu) developed by > -The Eclipse Foundation (http://eclipse.org/). > - > -This product includes software (Plexus and Classworlds) developed by > -The Codehaus Foundation (http://www.codehaus.org/). > - > -This product includes software (Spice, Plexus Cipher and Plexus Security > -Dispatcher) developed by > -Sonatype Inc. (http://www.sonatype.org/). > - > -This product includes software (NekoHTML) developed by > -SourceForge (http://www.sourceforge.net/). > - > -This product includes software (Guice) developed by > -Google Code (http://code.google.com/). > > http://git-wip-us.apache.org/repos/asf/maven/blob/b4dc8931/apache-maven/pom.xml > ---------------------------------------------------------------------- > diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml > index 7e3dea8..d2d7d6f 100644 > --- a/apache-maven/pom.xml > +++ b/apache-maven/pom.xml > @@ -27,7 +27,7 @@ > <artifactId>apache-maven</artifactId> > <packaging>pom</packaging> > > - <name>Maven Distribution</name> > + <name>Apache Maven Distribution</name> > <description>The Maven distribution, source and binary, in zip and tar.gz > formats.
s/The Maven/The Apache Maven/ </description> > > <properties> > > http://git-wip-us.apache.org/repos/asf/maven/blob/b4dc8931/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm > ---------------------------------------------------------------------- > diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm > b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm > new file mode 100644 > index 0000000..2506a19 > --- /dev/null > +++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm > @@ -0,0 +1,38 @@ > +## > +## 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. > +## > +## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $ > +## > + > +Apache Maven includes a number of components and libraries with separate > +copyright notices and license terms. Your use of those components are > +subject to the terms and conditions of the following licenses. > + > +#set ( $apacheTxt = "The Apache Software License, Version 2.0" ) > + > +#foreach ( $project in $projects ) > +#foreach ( $license in $project.licenses) > +#if ( ! ($apacheTxt == $license.name) ) > + > +$project.name #if ($project.url)($project.url)#end $project.artifact > + License: $license.name #if ($license.url) ($license.url)#end > + > +#end > +#end > +#end > + > > http://git-wip-us.apache.org/repos/asf/maven/blob/b4dc8931/apache-maven/src/main/assembly/bin.xml > ---------------------------------------------------------------------- > diff --git a/apache-maven/src/main/assembly/bin.xml > b/apache-maven/src/main/assembly/bin.xml > index 4603a82..cec673d 100644 > --- a/apache-maven/src/main/assembly/bin.xml > +++ b/apache-maven/src/main/assembly/bin.xml > @@ -45,8 +45,14 @@ under the License. > <fileSet> > <includes> > <include>README*</include> > - <include>LICENSE*</include> > - <include>NOTICE*</include> > + </includes> > + </fileSet> > + <fileSet> > + <directory>target/maven-shared-archive-resources/META-INF</directory> > + <outputDirectory>/</outputDirectory> > + <includes> > + <include>LICENSE</include> > + <include>NOTICE</include> > </includes> > </fileSet> > <fileSet> > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
