You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/09/14 23:47:45 UTC
[1/3] accumulo git commit: ACCUMULO-3994 ACCUMULO-3995 Correct
licenses for RPMs and DEBs
Repository: accumulo
Updated Branches:
refs/heads/1.5 781573876 -> 586c4ee19
ACCUMULO-3994 ACCUMULO-3995 Correct licenses for RPMs and DEBs
The "binary" package should have the same license as the binary
tarball. The "test" and "native" package should have a plain
LICENSE with no subcomponents and a NOTICE with just the copyright
statement for the ASF.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b5a1c2e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b5a1c2e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6b5a1c2e
Branch: refs/heads/1.5
Commit: 6b5a1c2e3164772f610893982d7a952f244f56bb
Parents: 7815738
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 14 13:17:36 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 14 13:17:36 2015 -0400
----------------------------------------------------------------------
assemble/accumulo-only-LICENSE | 202 ++++++++++++++++++++++++++++++++++++
assemble/accumulo-only-NOTICE | 5 +
assemble/pom.xml | 67 +++++++++++-
3 files changed, 270 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5a1c2e/assemble/accumulo-only-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/accumulo-only-LICENSE b/assemble/accumulo-only-LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/assemble/accumulo-only-LICENSE
@@ -0,0 +1,202 @@
+
+ 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/accumulo/blob/6b5a1c2e/assemble/accumulo-only-NOTICE
----------------------------------------------------------------------
diff --git a/assemble/accumulo-only-NOTICE b/assemble/accumulo-only-NOTICE
new file mode 100644
index 0000000..a50abde
--- /dev/null
+++ b/assemble/accumulo-only-NOTICE
@@ -0,0 +1,5 @@
+Apache Accumulo
+Copyright 2011-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5a1c2e/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 545236b..75de6da 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -92,6 +92,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <!-- for test and native rpm/deb packagings -->
+ <exclude>accumulo-only-LICENSE</exclude>
+ <exclude>accumulo-only-NOTICE</exclude>
<exclude>bin-LICENSE</exclude>
<exclude>bin-NOTICE</exclude>
</excludes>
@@ -236,10 +239,12 @@
<location>${accumulo-top}/CHANGES</location>
</source>
<source>
- <location>${accumulo-top}/LICENSE</location>
+ <location>${accumulo-top}/assemble/bin-LICENSE</location>
+ <destination>LICENSE</destination>
</source>
<source>
- <location>${accumulo-top}/NOTICE</location>
+ <location>${accumulo-top}/assemble/bin-NOTICE</location>
+ <destination>NOTICE</destination>
</source>
<source>
<location>${accumulo-top}/README</location>
@@ -380,6 +385,14 @@
<include>libNativeMap-Linux-amd64-64.so</include>
</includes>
</source>
+ <source>
+ <location>${accumulo-top}/assemble/accumulo-only-LICENSE</location>
+ <destination>LICENSE</destination>
+ </source>
+ <source>
+ <location>${accumulo-top}/assemble/accumulo-only-NOTICE</location>
+ <destination>NOTICE</destination>
+ </source>
</sources>
</mapping>
</mappings>
@@ -406,6 +419,14 @@
<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
<sources>
<source>
+ <location>${accumulo-top}/assemble/accumulo-only-LICENSE</location>
+ <destination>LICENSE</destination>
+ </source>
+ <source>
+ <location>${accumulo-top}/assemble/accumulo-only-NOTICE</location>
+ <destination>NOTICE</destination>
+ </source>
+ <source>
<location>${accumulo-top}/test</location>
<excludes>
<exclude>src/**</exclude>
@@ -461,7 +482,8 @@
<excludes>**/.svn/**,native/**</excludes>
</data>
<data>
- <src>${accumulo-top}/NOTICE</src>
+ <src>${accumulo-top}/assemble/bin-NOTICE</src>
+ <dst>NOTICE</dst>
<type>file</type>
<mapper>
<type>perm</type>
@@ -485,7 +507,8 @@
</mapper>
</data>
<data>
- <src>${accumulo-top}/LICENSE</src>
+ <src>${accumulo-top}/assemble/bin-LICENSE</src>
+ <dst>LICENSE</dst>
<type>file</type>
<mapper>
<type>perm</type>
@@ -592,6 +615,24 @@
<classifier>native</classifier>
<dataSet>
<data>
+ <src>${accumulo-top}/assemble/accumulo-only-NOTICE</src>
+ <dst>NOTICE</dst>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo/server/src/main/c++</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>${accumulo-top}/assemble/accumulo-only-LICENSE</src>
+ <dst>LICENSE</dst>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo/server/src/main/c++</prefix>
+ </mapper>
+ </data>
+ <data>
<src>${accumulo-top}/server/src/main/c++</src>
<type>directory</type>
<mapper>
@@ -632,6 +673,24 @@
<classifier>test</classifier>
<dataSet>
<data>
+ <src>${accumulo-top}/assemble/accumulo-only-NOTICE</src>
+ <dst>NOTICE</dst>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo/test</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>${accumulo-top}/assemble/accumulo-only-LICENSE</src>
+ <dst>LICENSE</dst>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo/test</prefix>
+ </mapper>
+ </data>
+ <data>
<src>${accumulo-top}/test</src>
<type>directory</type>
<mapper>
[3/3] accumulo git commit: ACCUMULO-3995 Run jdeb even though it's a
pom-only module.
Posted by el...@apache.org.
ACCUMULO-3995 Run jdeb even though it's a pom-only module.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/586c4ee1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/586c4ee1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/586c4ee1
Branch: refs/heads/1.5
Commit: 586c4ee199a2d53fd989b6a2815b3566b0562ad3
Parents: c364acd
Author: Josh Elser <jo...@gmail.com>
Authored: Mon Sep 14 19:31:04 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Mon Sep 14 20:26:33 2015 +0000
----------------------------------------------------------------------
assemble/pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/586c4ee1/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 331a314..a51f231 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -471,6 +471,7 @@
<classifier>bin</classifier>
<controlDir>assemble/deb/accumulo</controlDir>
<installDir>/usr/lib/accumulo</installDir>
+ <skipPOMs>false</skipPOMs>
<dataSet>
<data>
<src>${accumulo-top}/lib</src>
@@ -613,6 +614,7 @@
<controlDir>assemble/deb/accumulo-native</controlDir>
<installDir>/usr/lib/accumulo</installDir>
<classifier>native</classifier>
+ <skipPOMs>false</skipPOMs>
<dataSet>
<data>
<src>${accumulo-top}/assemble/accumulo-only-NOTICE</src>
@@ -671,6 +673,7 @@
<controlDir>assemble/deb/accumulo-test</controlDir>
<installDir>/usr/lib/accumulo</installDir>
<classifier>test</classifier>
+ <skipPOMs>false</skipPOMs>
<dataSet>
<data>
<src>${accumulo-top}/assemble/accumulo-only-NOTICE</src>
[2/3] accumulo git commit: ACCUMULO-3995 Bump jdeb from 0.10 to 1.4
for necessary config properties
Posted by el...@apache.org.
ACCUMULO-3995 Bump jdeb from 0.10 to 1.4 for necessary config properties
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c364acd1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c364acd1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c364acd1
Branch: refs/heads/1.5
Commit: c364acd18d8f0faf36f9b9067ea238f93ead3973
Parents: 6b5a1c2
Author: Josh Elser <jo...@gmail.com>
Authored: Mon Sep 14 17:54:30 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Mon Sep 14 17:54:30 2015 +0000
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c364acd1/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 75de6da..331a314 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -457,7 +457,7 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>0.10</version>
+ <version>1.4</version>
<inherited>false</inherited>
<executions>
<execution>