Repository: hbase Updated Branches: refs/heads/branch-1.2 64511ec89 -> 52352c835
http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index fa0e701..12476ad 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -27,13 +27,26 @@ <relativePath>..</relativePath> </parent> <artifactId>hbase-shaded</artifactId> - <name>HBase - Shaded</name> + <name>Apache HBase - Shaded</name> <description>Module of HBase with most deps shaded.</description> <packaging>pom</packaging> + <properties> + <!-- Don't make a test-jar --> + <maven.test.skip>true</maven.test.skip> + <license.bundles.dependencies>true</license.bundles.dependencies> + </properties> <modules> <module>hbase-shaded-client</module> <module>hbase-shaded-server</module> </modules> + <dependencies> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-resource-bundle</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -50,6 +63,36 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> + <!-- licensing info from our dependencies --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <id>default</id> + <configuration> + <properties> + <copyright-end-year>${build.year}</copyright-end-year> + <debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info> + <bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies> + <bundled-jquery>${license.bundles.jquery}</bundled-jquery> + <bundled-logo>${license.bundles.logo}</bundled-logo> + <bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap> + </properties> + <resourceBundles> + <resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + <supplementalModelArtifacts> + <supplementalModelArtifact>${project.groupId}:hbase-resource-bundle:${project.version}</supplementalModelArtifact> + </supplementalModelArtifacts> + <supplementalModels> + <supplementalModel>supplemental-models.xml</supplementalModel> + </supplementalModels> + </configuration> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -63,7 +106,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> <executions> <execution> <phase>package</phase> @@ -79,6 +121,7 @@ <include>*:*</include> </includes> <excludes> + <exclude>org.apache.hbase:hbase-resource-bundle</exclude> <exclude>org.slf4j:*</exclude> <exclude>com.google.code.findbugs:*</exclude> <exclude>com.github.stephenc.findbugs:*</exclude> @@ -113,6 +156,22 @@ </excludes> </relocation> </relocations> + <transformers> + <!-- Need to filter out some extraneous license files. + Don't use the ApacheLicenseRT because it just removes all + META-INF/LICENSE(.txt)? files, including ours. --> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resources> + <resource>LICENSE.txt</resource> + <resource>ASL2.0</resource> + </resources> + </transformer> + <!-- Where notices exist, just concat them --> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> + <addHeader>false</addHeader> + <projectName>${project.name}</projectName> + </transformer> + </transformers> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-shell/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 2a681be..75feddc 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -27,7 +27,7 @@ <relativePath>..</relativePath> </parent> <artifactId>hbase-shell</artifactId> - <name>HBase - Shell</name> + <name>Apache HBase - Shell</name> <description>Shell for HBase</description> <build> <!-- Makes sure the resources get added before they are processed http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-testing-util/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index ab8dd46..ae9becd 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -27,7 +27,7 @@ <relativePath>..</relativePath> </parent> <artifactId>hbase-testing-util</artifactId> - <name>HBase - Testing Util</name> + <name>Apache HBase - Testing Util</name> <description>HBase Testing Utilities.</description> <build> <plugins> http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index a57f266..938e7ba 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -27,7 +27,7 @@ <relativePath>..</relativePath> </parent> <artifactId>hbase-thrift</artifactId> - <name>HBase - Thrift</name> + <name>Apache HBase - Thrift</name> <description>HBase Thrift Server</description> <build> @@ -42,6 +42,17 @@ </includes> </resource> </resources> + <testResources> + <testResource> + <directory>src/test/resources/META-INF/</directory> + <targetPath>META-INF/</targetPath> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-thrift/src/main/appended-resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/appended-resources/META-INF/LICENSE b/hbase-thrift/src/main/appended-resources/META-INF/LICENSE new file mode 100644 index 0000000..c948609 --- /dev/null +++ b/hbase-thrift/src/main/appended-resources/META-INF/LICENSE @@ -0,0 +1,25 @@ +---- +This project bundles a copy of the JQuery minified javascript library version +1.8.3 under the terms of the MIT license. + + Copyright 2012 jQuery Foundation and other contributors + http://jquery.com/ + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-thrift/src/main/appended-resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/appended-resources/META-INF/NOTICE b/hbase-thrift/src/main/appended-resources/META-INF/NOTICE new file mode 100644 index 0000000..2c0f622 --- /dev/null +++ b/hbase-thrift/src/main/appended-resources/META-INF/NOTICE @@ -0,0 +1,14 @@ +-- +This product includes portions of the Bootstrap project v3.0.0 + +Copyright 2013 Twitter, Inc. + +Licensed under the Apache License v2.0 + +This product uses the Glyphicons Halflings icon set. + +http://glyphicons.com/ + +Copyright Jan KovaÅÃk + +Licensed under the Apache License v2.0 as a part of the Bootstrap project. http://git-wip-us.apache.org/repos/asf/hbase/blob/52352c83/hbase-thrift/src/test/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/resources/META-INF/LICENSE b/hbase-thrift/src/test/resources/META-INF/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/hbase-thrift/src/test/resources/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/hbase/blob/52352c83/hbase-thrift/src/test/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/test/resources/META-INF/NOTICE b/hbase-thrift/src/test/resources/META-INF/NOTICE new file mode 100644 index 0000000..861c736 --- /dev/null +++ b/hbase-thrift/src/test/resources/META-INF/NOTICE @@ -0,0 +1,5 @@ +${project.name} +Copyright ${project.inceptionYear}-${build.year} 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/hbase/blob/52352c83/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9c1c5ce..b7bada8 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <artifactId>hbase</artifactId> <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> - <name>HBase</name> + <name>Apache HBase</name> <description> Apache HBase is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. @@ -48,7 +48,9 @@ of commodity hardware. </description> <url>http://hbase.apache.org</url> + <inceptionYear>2007</inceptionYear> <modules> + <module>hbase-resource-bundle</module> <module>hbase-server</module> <module>hbase-thrift</module> <module>hbase-rest</module> @@ -452,6 +454,16 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <configuration> <!--You need this profile. It'll sign your artifacts. @@ -553,6 +565,11 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <version>3.0.0</version> <!--NOTE: Findbugs 3.0.0 requires jdk7--> @@ -669,7 +686,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <versionRange>[1.4,)</versionRange> + <versionRange>[1.5,)</versionRange> <goals> <goal>process</goal> </goals> @@ -678,6 +695,22 @@ <ignore /> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <versionRange>[1.3,)</versionRange> + <goals> + <goal>create-timestamp</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnConfiguration>true</runOnConfiguration> + <runOnIncremental>true</runOnIncremental> + </execute> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> @@ -697,10 +730,8 @@ <exclude>**/8e8ab58dcf39412da19833fcd8f687ac</exclude> <exclude>**/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c</exclude> <exclude>**/0000000000000016310</exclude> - <exclude>**/.git/**</exclude> <exclude>**/.idea/**</exclude> <exclude>**/*.iml</exclude> - <exclude>**/target/**</exclude> <exclude>**/CHANGES.txt</exclude> <exclude>**/generated/**</exclude> <exclude>**/gen-*/**</exclude> @@ -708,10 +739,10 @@ <exclude>conf/regionservers</exclude> <exclude>**/*.avpr</exclude> <exclude>**/*.svg</exclude> - <!-- MIT: https://github.com/twbs/bootstrap/blob/master/LICENSE --> + <!-- non-standard notice file from jruby included by reference --> + <exclude>**/src/main/resources/META-INF/LEGAL</exclude> + <!-- MIT: https://github.com/asciidoctor/asciidoctor/blob/master/LICENSE.adoc --> <exclude>**/src/main/asciidoc/hbase.css</exclude> - <exclude>**/bootstrap-theme.css</exclude> - <exclude>**/bootstrap-theme.min.css</exclude> <!-- MIT http://jquery.org/license --> <exclude>**/jquery.min.js</exclude> <!-- vector graphics --> @@ -719,9 +750,9 @@ <!-- apache doxia generated --> <exclude>**/control</exclude> <exclude>**/conffile</exclude> + <!-- auto-gen docs --> <exclude>docs/*</exclude> <exclude>logs/*</exclude> - <!-- auto-gen docs --> <!-- exclude source control files --> <exclude>.git/**</exclude> <exclude>.svn/**</exclude> @@ -1084,6 +1115,22 @@ </configuration> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create-timestamp</goal> + </goals> + </execution> + </executions> + <configuration> + <timestampFormat>yyyy</timestampFormat> + <timestampPropertyName>build.year</timestampPropertyName> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>2.5.3</version> @@ -1093,6 +1140,17 @@ </plugins> </build> <properties> + <!-- override on command line to have generated LICENSE files include + diagnostic info for verifying notice requirements --> + <license.debug.print.included>false</license.debug.print.included> + <!-- When a particular module bundles its depenendencies, should be true --> + <license.bundles.dependencies>false</license.bundles.dependencies> + <!-- modules that include a the logo in their source tree should set true --> + <license.bundles.logo>false</license.bundles.logo> + <!-- modules that include bootstrap in their source tree should set true --> + <license.bundles.bootstrap>false</license.bundles.bootstrap> + <!-- modules that include jquery in their source tree should set true --> + <license.bundles.jquery>false</license.bundles.jquery> <tar.name>${project.build.finalName}.tar.gz</tar.name> <maven.build.timestamp.format> yyyy-MM-dd'T'HH:mm
