You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/09/29 20:50:30 UTC
[01/13] accumulo git commit: ACCUMULO-3996 Add in RAT exclusions
Repository: accumulo
Updated Branches:
refs/heads/master 0c4ae1596 -> 0c94837d6
ACCUMULO-3996 Add in RAT exclusions
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/faf40d40
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/faf40d40
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/faf40d40
Branch: refs/heads/master
Commit: faf40d405c7f811cf57d0caa2f2c0054577f01fa
Parents: 298f95f
Author: Josh Elser <jo...@gmail.com>
Authored: Sun Sep 13 01:25:55 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Sun Sep 13 01:25:55 2015 +0000
----------------------------------------------------------------------
assemble/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/faf40d40/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index cce6b2a..545236b 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -85,6 +85,20 @@
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>bin-LICENSE</exclude>
+ <exclude>bin-NOTICE</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
[05/13] accumulo git commit: ACCUMULO-3995 Run jdeb even though it's
a pom-only module.
Posted by ec...@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/master
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>
[09/13] accumulo git commit: ACCUMULO-4010 Add in CDDLv1.0 text to
LICENSE for binary tarball
Posted by ec...@apache.org.
ACCUMULO-4010 Add in CDDLv1.0 text to LICENSE for binary tarball
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24a99e67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24a99e67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24a99e67
Branch: refs/heads/master
Commit: 24a99e67b92d65a47ffe8b499870148426febd39
Parents: dd40246
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 24 15:00:02 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 28 13:08:14 2015 -0400
----------------------------------------------------------------------
assemble/bin-LICENSE | 328 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 328 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24a99e67/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index a7b4c81..da83b27 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -553,6 +553,334 @@ under the following MIT license:
The binary distribution of the product bundles javax.servlet-api, which is
available under the CDDL 1.0 license (http://servlet-spec.java.net).
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+ 1. Definitions.
+
+ 1.1. Contributor. means each individual or entity that creates or
+ contributes to the creation of Modifications.
+
+ 1.2. Contributor Version. means the combination of the Original Software,
+ prior Modifications used by a Contributor (if any), and the Modifications
+ made by that particular Contributor.
+
+ 1.3. Covered Software. means (a) the Original Software, or (b)
+ Modifications, or (c) the combination of files containing Original Software
+ with files containing Modifications, in each case including portions thereof.
+
+ 1.4. Executable. means the Covered Software in any form other than Source
+ Code.
+
+ 1.5. Initial Developer. means the individual or entity that first makes
+ Original Software available under this License.
+
+ 1.6. Larger Work. means a work which combines Covered Software or portions
+ thereof with code not governed by the terms of this License.
+
+ 1.7. License. means this document.
+
+ 1.8. Licensable. means having the right to grant, to the maximum extent
+ possible, whether at the time of the initial grant or subsequently
+ acquired, any and all of the rights conveyed herein.
+
+ 1.9. Modifications. means the Source Code and Executable form of any of the
+ following:
+
+ A. Any file that results from an addition to, deletion from or
+ modification of the contents of a file containing Original Software or
+ previous Modifications;
+
+ B. Any new file that contains any part of the Original Software or
+ previous Modification; or
+
+ C. Any new file that is contributed or otherwise made available under
+ the terms of this License.
+
+ 1.10. Original Software. means the Source Code and Executable form of
+ computer software code that is originally released under this License.
+
+ 1.11. Patent Claims. means any patent claim(s), now owned or hereafter
+ acquired, including without limitation, method, process, and apparatus
+ claims, in any patent Licensable by grantor.
+
+ 1.12. Source Code. means (a) the common form of computer software code in
+ which modifications are made and (b) associated documentation included in
+ or with such code.
+
+ 1.13. You. (or .Your.) means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License. For
+ legal entities, .You. includes any entity which controls, is controlled by,
+ or is under common control with You. For purposes of this definition,
+ .control. means (a) the power, direct or indirect, to cause the direction
+ or management of such entity, whether by contract or otherwise, or (b)
+ ownership of more than fifty percent (50%) of the outstanding shares or
+ beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to
+ third party intellectual property claims, the Initial Developer hereby
+ grants You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer, to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Software (or portions thereof), with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling of
+ Original Software, to make, have made, use, practice, sell, and offer
+ for sale, and/or otherwise dispose of the Original Software (or
+ portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+ the date Initial Developer first distributes or otherwise makes the
+ Original Software available to a third party under the terms of this
+ License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: (1) for code that You delete from the Original Software, or
+ (2) for infringements caused by: (i) the modification of the Original
+ Software, or (ii) the combination of the Original Software with other
+ software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to
+ third party intellectual property claims, each Contributor hereby grants
+ You a world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications created
+ by such Contributor (or portions thereof), either on an unmodified
+ basis, with other Modifications, as Covered Software and/or as part of
+ a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in
+ combination with its Contributor Version (or portions of such
+ combination), to make, use, sell, offer for sale, have made,
+ and/or otherwise dispose of: (1) Modifications made by that
+ Contributor (or portions thereof); and (2) the combination of
+ Modifications made by that Contributor with its Contributor Version
+ (or portions of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+ on the date Contributor first distributes or otherwise makes the
+ Modifications available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: (1) for any code that Contributor has deleted from the
+ Contributor Version; (2) for infringements caused by: (i) third party
+ modifications of Contributor Version, or (ii) the combination of
+ Modifications made by that Contributor with other software (except as
+ part of the Contributor Version) or other devices; or (3) under
+ Patent Claims infringed by Covered Software in the absence of
+ Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code. Any Covered Software that You
+ distribute or otherwise make available in Executable form must also be
+ made available in Source Code form and that Source Code form must be
+ distributed only under the terms of this License. You must include a
+ copy of this License with every copy of the Source Code form of the
+ Covered Software You distribute or otherwise make available. You must
+ inform recipients of any such Covered Software in Executable form as to
+ how they can obtain such Covered Software in Source Code form in a
+ reasonable manner on or through a medium customarily used for software
+ exchange.
+
+ 3.2. Modifications. The Modifications that You create or to which You
+ contribute are governed by the terms of this License. You represent that
+ You believe Your Modifications are Your original creation(s) and/or You
+ have sufficient rights to grant the rights conveyed by this License.
+
+ 3.3. Required Notices. You must include a notice in each of Your
+ Modifications that identifies You as the Contributor of the
+ Modification. You may not remove or alter any copyright, patent or
+ trademark notices contained within the Covered Software, or any notices
+ of licensing or any descriptive text giving attribution to any
+ Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms. You may not offer or impose any
+ terms on any Covered Software in Source Code form that alters or
+ restricts the applicable version of this License or the recipients.
+ rights hereunder. You may choose to offer, and to charge a fee for,
+ warranty, support, indemnity or liability obligations to one or more
+ recipients of Covered Software. However, you may do so only on Your own
+ behalf, and not on behalf of the Initial Developer or any Contributor.
+ You must make it absolutely clear that any such warranty, support,
+ indemnity or liability obligation is offered by You alone, and You
+ hereby agree to indemnify the Initial Developer and every Contributor
+ for any liability incurred by the Initial Developer or such Contributor
+ as a result of warranty, support, indemnity or liability terms You
+ offer.
+
+ 3.5. Distribution of Executable Versions. You may distribute the
+ Executable form of the Covered Software under the terms of this License
+ or under the terms of a license of Your choice, which may contain terms
+ different from this License, provided that You are in compliance with
+ the terms of this License and that the license for the Executable form
+ does not attempt to limit or alter the recipient.s rights in the Source
+ Code form from the rights set forth in this License. If You distribute
+ the Covered Software in Executable form under a different license, You
+ must make it absolutely clear that any terms which differ from this
+ License are offered by You alone, not by the Initial Developer or
+ Contributor. You hereby agree to indemnify the Initial Developer and
+ every Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of any such terms You offer.
+
+ 3.6. Larger Works. You may create a Larger Work by combining Covered
+ Software with other code not governed by the terms of this License and
+ distribute the Larger Work as a single product. In such a case, You must
+ make sure the requirements of this License are fulfilled for the Covered
+ Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions. Sun Microsystems, Inc. is the initial license
+ steward and may publish revised and/or new versions of this License from
+ time to time. Each version will be given a distinguishing version
+ number. Except as provided in Section 4.3, no one other than the license
+ steward has the right to modify this License.
+
+ 4.2. Effect of New Versions. You may always continue to use, distribute
+ or otherwise make the Covered Software available under the terms of the
+ version of the License under which You originally received the Covered
+ Software. If the Initial Developer includes a notice in the Original
+ Software prohibiting it from being distributed or otherwise made
+ available under any subsequent version of the License, You must
+ distribute and make the Covered Software available under the terms of
+ the version of the License under which You originally received the
+ Covered Software. Otherwise, You may also choose to use, distribute or
+ otherwise make the Covered Software available under the terms of any
+ subsequent version of the License published by the license steward.
+
+ 4.3. Modified Versions. When You are an Initial Developer and You want
+ to create a new license for Your Original Software, You may create and
+ use a modified version of this License if You: (a) rename the license
+ and remove any references to the name of the license steward (except to
+ note that the license differs from this License); and (b) otherwise
+ make it clear that the license contains terms which differ from this
+ License.
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+ ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
+ WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
+ (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+ NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
+ CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+ SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. Provisions
+ which, by their nature, must remain in effect beyond the termination of
+ this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory
+ judgment actions) against Initial Developer or a Contributor (the
+ Initial Developer or Contributor against whom You assert such
+ claim is referred to as .Participant.) alleging that the
+ Participant Software (meaning the Contributor Version where the
+ Participant is a Contributor or the Original Software where the
+ Participant is the Initial Developer) directly or indirectly
+ infringes any patent, then any and all rights granted directly or
+ indirectly to You by such Participant, the Initial Developer (if the
+ Initial Developer is not the Participant) and all Contributors
+ under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+ notice from Participant terminate prospectively and automatically at
+ the expiration of such 60 day notice period, unless if within such
+ 60 day period You withdraw Your claim with respect to the
+ Participant Software against such Participant either unilaterally or
+ pursuant to a written agreement with Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2 above, all
+ end user licenses that have been validly granted by You or any
+ distributor hereunder prior to termination (excluding licenses granted
+ to You by any distributor) shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+ ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+ SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+ WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+ STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+ DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+ POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+ TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
+ NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+ JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
+ YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a .commercial item,. as that term is defined in 48
+ C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
+ that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
+ computer software documentation. as such terms are used in 48 C.F.R. 12.212
+ (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+ through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+ Covered Software with only those rights set forth herein. This U.S.
+ Government Rights clause is in lieu of, and supersedes, any other FAR,
+ DFAR, or other clause or provision that addresses Government rights in
+ computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable, such
+ provision shall be reformed only to the extent necessary to make it
+ enforceable. This License shall be governed by the law of the jurisdiction
+ specified in a notice contained within the Original Software (except to the
+ extent applicable law, if any, provides otherwise), excluding such
+ jurisdiction.s conflict-of-law provisions. Any litigation relating to this
+ License shall be subject to the jurisdiction of the courts located in the
+ jurisdiction and venue specified in a notice contained within the Original
+ Software, with the losing party responsible for costs, including, without
+ limitation, court costs and reasonable attorneys. fees and expenses. The
+ application of the United Nations Convention on Contracts for the
+ International Sale of Goods is expressly excluded. Any law or regulation
+ which provides that the language of a contract shall be construed against
+ the drafter shall not apply to this License. You agree that You alone are
+ responsible for compliance with the United States export administration
+ regulations (and the export control laws and regulation of any other countries)
+ when You use, distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly, out of
+ its utilization of rights under this License and You agree to work with
+ Initial Developer and Contributors to distribute such responsibility on an
+ equitable basis. Nothing herein is intended or shall be deemed to
+ constitute any admission of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+ LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of the State
+ of California (excluding conflict-of-law provisions). Any litigation
+ relating to this License shall be subject to the jurisdiction of the
+ Federal Courts of the Northern District of California and the state courts
+ of the State of California, with venue lying in Santa Clara County,
+ California.
+
------
This product bundles software from the European Commission project OneLab
[04/13] accumulo git commit: ACCUMULO-3995 Bump jdeb from 0.10 to 1.4
for necessary config properties
Posted by ec...@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/master
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>
[03/13] accumulo git commit: ACCUMULO-3994 ACCUMULO-3995 Correct
licenses for RPMs and DEBs
Posted by ec...@apache.org.
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/master
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>
[02/13] accumulo git commit: ACCUMULO-3993 Fix the server's javadoc
jar to not list the javascript files.
Posted by ec...@apache.org.
ACCUMULO-3993 Fix the server's javadoc jar to not list the javascript files.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78157387
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78157387
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78157387
Branch: refs/heads/master
Commit: 78157387676de380b82afdc35fb85858b4a17735
Parents: faf40d4
Author: Josh Elser <el...@apache.org>
Authored: Sun Sep 13 22:30:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Sep 13 22:32:49 2015 -0400
----------------------------------------------------------------------
server/pom.xml | 29 ++++
server/src/main/javadoc/META-INF/LICENSE | 202 ++++++++++++++++++++++++++
server/src/main/javadoc/META-INF/NOTICE | 5 +
3 files changed, 236 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/78157387/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index e3b40f6..ed038db 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -145,6 +145,35 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-javadocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/META-INF/</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/78157387/server/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/src/main/javadoc/META-INF/LICENSE b/server/src/main/javadoc/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/server/src/main/javadoc/META-INF/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/78157387/server/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/src/main/javadoc/META-INF/NOTICE b/server/src/main/javadoc/META-INF/NOTICE
new file mode 100644
index 0000000..a50abde
--- /dev/null
+++ b/server/src/main/javadoc/META-INF/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/).
[12/13] accumulo git commit: ACCUMULO-4012 possible infinite loop
when the base transaction is removed before scanning it, merge 1.6 to 1.7
Posted by ec...@apache.org.
ACCUMULO-4012 possible infinite loop when the base transaction is removed before scanning it, merge 1.6 to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ecbc3c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ecbc3c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ecbc3c2
Branch: refs/heads/master
Commit: 1ecbc3c28702f0f60eb8a468cf38afc308d268a4
Parents: e0621df d301f4e
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Sep 29 14:48:50 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Sep 29 14:48:50 2015 -0400
----------------------------------------------------------------------
LICENSE | 3 -
assemble/bin-LICENSE | 334 ++++++++++++++++++-
.../java/org/apache/accumulo/fate/ZooStore.java | 26 +-
server/base/pom.xml | 29 ++
server/base/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/base/src/main/javadoc/META-INF/NOTICE | 5 +
server/monitor/pom.xml | 29 ++
.../monitor/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/monitor/src/main/javadoc/META-INF/NOTICE | 5 +
server/tserver/pom.xml | 29 ++
shell/.gitignore | 1 +
11 files changed, 853 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/assemble/bin-LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --cc fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 8115fd5,6f5ea70..4b4a83f
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@@ -16,7 -16,8 +16,8 @@@
*/
package org.apache.accumulo.fate;
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
+ import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/base/pom.xml
----------------------------------------------------------------------
diff --cc server/base/pom.xml
index bba0c74,45d15ea..3e6186d
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@@ -127,30 -118,34 +127,59 @@@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-javadocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/META-INF/</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
+ <profiles>
+ <profile>
+ <id>protobuf</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-protobuf</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <executable>${basedir}/src/main/scripts/generate-protobuf.sh</executable>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/tserver/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/shell/.gitignore
----------------------------------------------------------------------
diff --cc shell/.gitignore
index 56204d2,0000000..59a826f
mode 100644,000000..100644
--- a/shell/.gitignore
+++ b/shell/.gitignore
@@@ -1,25 -1,0 +1,26 @@@
+# 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.
+
+# Maven ignores
+/target/
+
+# IDE ignores
+/.settings/
+/.project
+/.classpath
+/.pydevproject
+/.idea
+/*.iml
++/bin/
[07/13] accumulo git commit: Merge tag '1.5.4' into 1.6
Posted by ec...@apache.org.
Merge tag '1.5.4' into 1.6
[maven-release-plugin] copy for tag 1.5.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a37c421a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a37c421a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a37c421a
Branch: refs/heads/master
Commit: a37c421aa5fea17c0389adcd4fc90915bbb3634a
Parents: 6c4df76 151db23
Author: Josh Elser <jo...@gmail.com>
Authored: Sat Sep 26 21:30:08 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Sat Sep 26 21:30:08 2015 +0000
----------------------------------------------------------------------
server/base/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++++++++++++
server/base/src/main/javadoc/META-INF/NOTICE | 5 +
server/tserver/pom.xml | 29 +++
3 files changed, 236 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a37c421a/server/base/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --cc server/base/src/main/javadoc/META-INF/LICENSE
index 0000000,0000000..d645695
new file mode 100644
--- /dev/null
+++ b/server/base/src/main/javadoc/META-INF/LICENSE
@@@ -1,0 -1,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/a37c421a/server/base/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --cc server/base/src/main/javadoc/META-INF/NOTICE
index 0000000,0000000..a50abde
new file mode 100644
--- /dev/null
+++ b/server/base/src/main/javadoc/META-INF/NOTICE
@@@ -1,0 -1,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/a37c421a/server/tserver/pom.xml
----------------------------------------------------------------------
diff --cc server/tserver/pom.xml
index 75bca9b,0000000..2eb229d
mode 100644,000000..100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@@ -1,126 -1,0 +1,155 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.6.4-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>accumulo-tserver</artifactId>
+ <name>Apache Accumulo Tablet Server</name>
+ <description>The tablet server for Apache Accumulo to host tablets of data tables.</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/*.walog</exclude>
+ <exclude>src/test/resources/walog-from-14/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>license-javadocs</id>
++ <goals>
++ <goal>copy-resources</goal>
++ </goals>
++ <phase>prepare-package</phase>
++ <configuration>
++ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
++ <resources>
++ <resource>
++ <directory>src/main/javadoc/META-INF/</directory>
++ <targetPath>META-INF/</targetPath>
++ <includes>
++ <include>LICENSE</include>
++ <include>NOTICE</include>
++ </includes>
++ <filtering>true</filtering>
++ </resource>
++ </resources>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
+ </build>
+</project>
[13/13] accumulo git commit: Merge branch '1.7'
Posted by ec...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c94837d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c94837d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c94837d
Branch: refs/heads/master
Commit: 0c94837d600daf13d2f8d14bdebfa1cccb902e01
Parents: 0c4ae15 1ecbc3c
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Sep 29 14:49:02 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Sep 29 14:49:02 2015 -0400
----------------------------------------------------------------------
LICENSE | 3 -
assemble/bin-LICENSE | 334 ++++++++++++++++++-
.../java/org/apache/accumulo/fate/ZooStore.java | 26 +-
server/base/pom.xml | 29 ++
server/base/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/base/src/main/javadoc/META-INF/NOTICE | 5 +
server/monitor/pom.xml | 29 ++
.../monitor/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/monitor/src/main/javadoc/META-INF/NOTICE | 5 +
server/tserver/pom.xml | 29 ++
shell/.gitignore | 1 +
11 files changed, 853 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/base/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/tserver/pom.xml
----------------------------------------------------------------------
[08/13] accumulo git commit: ACCUMULO-4010 Remove wrong path in
LICENSE
Posted by ec...@apache.org.
ACCUMULO-4010 Remove wrong path in LICENSE
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd402465
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd402465
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd402465
Branch: refs/heads/master
Commit: dd40246583db30349dbc417c3926b5b7010c327f
Parents: a37c421
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 24 14:01:41 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 28 13:08:14 2015 -0400
----------------------------------------------------------------------
LICENSE | 3 ---
assemble/bin-LICENSE | 6 ++----
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd402465/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ef1fee3..4f61cf2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -243,7 +243,4 @@ jquery.flot.resize.js
distributed under the MIT license (see above)
-For details, see
- server/src/main/resources/web/flot/
-
----
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dd402465/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index aab2be9..a7b4c81 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -284,7 +284,8 @@ OTHER DEALINGS IN THE SOFTWARE.
----
-This product bundles Flot,
+This product bundles Flot, For details, see
+ server/monitor/src/main/resources/web/flot/
Copyright (c) 2007-2009 IOLA and Ole Laursen
@@ -307,9 +308,6 @@ jquery.flot.resize.js
distributed under the MIT license (see above)
-For details, see
- server/src/main/resources/web/flot/
-
----
The binary distribution of this product bundles jline, which is available
[11/13] accumulo git commit: ACCUMULO-4012 possible infinite loop
when the base transaction is removed before scanning it
Posted by ec...@apache.org.
ACCUMULO-4012 possible infinite loop when the base transaction is removed before scanning it
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d301f4e2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d301f4e2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d301f4e2
Branch: refs/heads/master
Commit: d301f4e29361522dab8a8e036a22553d62daa0a6
Parents: 7f50f60
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Sep 29 14:41:30 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Sep 29 14:41:30 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/fate/ZooStore.java | 27 ++++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d301f4e2/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 72220f8..6f5ea70 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.fate;
import static com.google.common.base.Charsets.UTF_8;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -33,6 +34,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -40,6 +42,8 @@ import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.KeeperException.NodeExistsException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
//TODO use zoocache? - ACCUMULO-1297
//TODO handle zookeeper being down gracefully - ACCUMULO-1297
@@ -47,6 +51,7 @@ import org.apache.zookeeper.KeeperException.NodeExistsException;
public class ZooStore<T> implements TStore<T> {
+ private static final Logger log = LoggerFactory.getLogger(ZooStore.class);
private String path;
private IZooReaderWriter zk;
private String lastReserved = "";
@@ -194,6 +199,7 @@ public class ZooStore<T> implements TStore<T> {
}
}
+ @Override
public void reserve(long tid) {
synchronized (this) {
reservationsWaiting++;
@@ -249,26 +255,37 @@ public class ZooStore<T> implements TStore<T> {
}
}
+ private static final int RETRIES = 10;
+
@SuppressWarnings("unchecked")
@Override
public Repo<T> top(long tid) {
verifyReserved(tid);
- while (true) {
+ for (int i = 0; i < RETRIES; i++) {
+ String txpath = getTXPath(tid);
try {
- String txpath = getTXPath(tid);
- String top = findTop(txpath);
- if (top == null)
- return null;
+ String top;
+ try {
+ top = findTop(txpath);
+ if (top == null) {
+ return null;
+ }
+ } catch (KeeperException.NoNodeException ex) {
+ throw new RuntimeException(ex);
+ }
byte[] ser = zk.getData(txpath + "/" + top, null);
return (Repo<T>) deserialize(ser);
} catch (KeeperException.NoNodeException ex) {
+ log.debug("zookeeper error reading " + txpath + ": " + ex.toString(), ex);
+ sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
continue;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+ return null;
}
private String findTop(String txpath) throws KeeperException, InterruptedException {
[10/13] accumulo git commit: ACCUMULO-4010 Add plain L&N files for
javadoc jars.
Posted by ec...@apache.org.
ACCUMULO-4010 Add plain L&N files for javadoc jars.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f50f601
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f50f601
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f50f601
Branch: refs/heads/master
Commit: 7f50f6014bc92a70fe622ff890843372a941a839
Parents: 24a99e6
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 28 14:10:28 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 28 15:22:09 2015 -0400
----------------------------------------------------------------------
server/base/pom.xml | 29 +++
server/monitor/pom.xml | 29 +++
.../monitor/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++++++++++
server/monitor/src/main/javadoc/META-INF/NOTICE | 5 +
4 files changed, 265 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f50f601/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 51f326c..45d15ea 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -118,5 +118,34 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-javadocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/META-INF/</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f50f601/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index a597032..a99f34e 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -139,5 +139,34 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-javadocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/META-INF/</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f50f601/server/monitor/src/main/javadoc/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/LICENSE b/server/monitor/src/main/javadoc/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/server/monitor/src/main/javadoc/META-INF/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/7f50f601/server/monitor/src/main/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/javadoc/META-INF/NOTICE b/server/monitor/src/main/javadoc/META-INF/NOTICE
new file mode 100644
index 0000000..a50abde
--- /dev/null
+++ b/server/monitor/src/main/javadoc/META-INF/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/).
[06/13] accumulo git commit: [maven-release-plugin] prepare release
1.5.4
Posted by ec...@apache.org.
[maven-release-plugin] prepare release 1.5.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/151db23e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/151db23e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/151db23e
Branch: refs/heads/master
Commit: 151db23e7d95cf77c08023ee18b7e524f78286fc
Parents: 586c4ee
Author: Josh Elser <jo...@gmail.com>
Authored: Mon Sep 14 22:19:28 2015 +0000
Committer: Josh Elser <jo...@gmail.com>
Committed: Mon Sep 14 22:19:28 2015 +0000
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
examples/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 4 ++--
proxy/pom.xml | 2 +-
server/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index a51f231..e3eda13 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7304e4f..3a63675 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-core</artifactId>
<name>Apache Accumulo Core</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index a64b4a2..8d199cd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-examples</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index d083b0a..7a5f699 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-examples-simple</artifactId>
<name>Apache Accumulo Simple Examples</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 898a819..7848b57 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Apache Accumulo Fate</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index ecbdec6..230410f 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>Apache Accumulo MiniCluster</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index be775fd..65cdbf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
<packaging>pom</packaging>
<name>Apache Accumulo Project</name>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
@@ -88,7 +88,7 @@
<scm>
<connection>scm:git:git://git.apache.org/accumulo.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
- <tag>1.5.3</tag>
+ <tag>1.5.4</tag>
<url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index bed5f74..314cb4b 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Apache Accumulo Proxy</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index ed038db..7c49208 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-server</artifactId>
<name>Apache Accumulo Server</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 416bd51..e5e64f2 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-start</artifactId>
<name>Apache Accumulo Start</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 63f165c..d59943e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-test</artifactId>
<name>Apache Accumulo Testing</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/151db23e/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index a07a973..c75add0 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<artifactId>accumulo-trace</artifactId>
<name>Apache Accumulo Trace</name>