You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by el...@apache.org on 2018/09/28 12:17:48 UTC
[incubator-ratis-thirdparty] branch master updated: RATIS-330.
Ensure licensing on ratis-thirdparty is kosher. Contributed by Josh Elser.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new c2f302d RATIS-330. Ensure licensing on ratis-thirdparty is kosher. Contributed by Josh Elser.
c2f302d is described below
commit c2f302d283fcca7257ca6f7f7466617863326fb0
Author: Márton Elek <el...@apache.org>
AuthorDate: Fri Sep 28 08:16:26 2018 -0400
RATIS-330. Ensure licensing on ratis-thirdparty is kosher. Contributed by Josh Elser.
---
DISCLAIMER | 7 +
LICENSE | 202 +++++++++++++++++++++++++++
NOTICE | 3 +
dev-support/make_rc.sh | 115 +++++++++++++++
pom.xml | 26 +---
src/main/appended-resources/META-INF/LICENSE | 53 +++++++
src/main/appended-resources/META-INF/NOTICE | 23 +++
7 files changed, 410 insertions(+), 19 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..132b1e0
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,7 @@
+Apache Ratis is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required
+of all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in
+a manner consistent with other successful ASF projects. While incubation status
+is not necessarily a reflection of the completeness or stability of the code,
+it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..a417abb
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Apache Ratis Thirdparty
+
+Copyright 2018 The Apache Software Foundation
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
new file mode 100755
index 0000000..ff3900e
--- /dev/null
+++ b/dev-support/make_rc.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# 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.
+
+
+# Script that assembles all you need to make an RC. Creates a source tarball
+# and instruct you how to deploy the jar to central.
+#
+# To finish, check what was build. If good copy to dist.apache.org and
+# close the maven repos. Call a vote.
+#
+# Presumes your settings.xml all set up so can sign artifacts published to mvn, etc.
+
+set -e
+
+# Set mvn and mvnopts
+mvn=mvn
+if [ "$MAVEN" != "" ]; then
+ mvn="${MAVEN}"
+fi
+mvnopts="-Xmx1g"
+if [ "$MAVEN_OPTS" != "" ]; then
+ mvnopts="${MAVEN_OPTS}"
+fi
+
+mvnGet() {
+ ${mvn} -q -Dexec.executable="echo" -Dexec.args="\${${1}}" --non-recursive \
+ org.codehaus.mojo:exec-maven-plugin:1.6.0:exec 2>/dev/null
+}
+
+mvnFun() {
+ set -x
+ MAVEN_OPTS="${mvnopts}" ${mvn} -Dmaven.repo.local=${repodir} $@
+ set +x
+}
+
+# Check project name
+projectname=$(mvnGet project.name)
+if [ "${projectname}" = "Apache Ratis Thirdparty" ]; then
+ echo
+ echo "Prepare release artifacts for $projectname"
+ echo
+else
+ echo "Unexpected project name \"${projectname}\"."
+ echo
+ echo "Please run this script ($0) under the root directory of Apache Ratis Thirdparty."
+ exit 1;
+fi
+
+# Set projectdir and archivedir
+projectdir=$(pwd)
+echo "Project dir: ${projectdir}"
+archivedir="${projectdir}/../`basename ${projectdir}`.`date -u +"%Y%m%d-%H%M%S"`"
+echo "Archive dir: ${archivedir}"
+if [ -d "${archivedir}" ]; then
+ echo "${archivedir} already exists"
+ exit 1;
+fi
+
+# Set repodir
+repodir="${projectdir}/../`basename ${projectdir}`.repository"
+mkdir "${repodir}"
+echo "Repo dir: ${repodir}"
+repodir=`cd ${repodir} > /dev/null; pwd`
+
+mkdir "${archivedir}"
+archivedir=`cd ${archivedir} > /dev/null; pwd`
+artifactid=$(mvnGet project.artifactId)
+version=$(mvnGet project.version)
+
+# Make sure to clean up all state before building the src-tarball
+mvnRun clean
+
+# Generate source tar.gz into archive
+git archive --format=tar.gz --output="${archivedir}/${artifactid}-${version}-src.tar.gz" --prefix="${artifactid}-${version}/" HEAD
+
+# Build and install Ratis-Thirdparty for the eventual mvn-deploy
+# No "bin tarball"
+mvnFun install -DskipTests -Papache-release
+
+echo
+echo "Generated artifacts successfully."
+ls -l ${archivedir}
+echo
+echo "Check the content of ${archivedir}."
+echo "If good, sign and push to dist.apache.org"
+echo " cd ${archivedir}"
+echo ' for i in *.tar.gz; do echo $i; gpg --print-mds $i > $i.mds ; done'
+echo ' for i in *.tar.gz; do echo $i; gpg --print-md SHA512 $i > $i.sha ; done'
+echo ' for i in *.tar.gz; do echo $i; gpg --armor --output $i.asc --detach-sig $i ; done'
+echo " rsync -av ${archivedir}/*.gz ${archivedir}/*.mds ${archivedir}/*.asc ~/repos/dist-dev/${artifactid}-VERSION/"
+echo
+echo "Check the content deployed to maven."
+echo "If good, close the repo and record links of temporary staging repo"
+echo " MAVEN_OPTS=\"${mvnopts}\" ${mvn} deploy -DskipTests -Papache-release -Dmaven.repo.local=${repodir}"
+echo
+echo "If all good tag the RC"
+echo
+echo "Finally, you may want to remove archive dir and repo dir"
+echo " rm -rf ${archivedir}"
+echo " rm -rf ${repodir}"
diff --git a/pom.xml b/pom.xml
index b432f42..5dc69f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,9 +35,9 @@
</license>
</licenses>
<scm>
- <connection>scm:git:git://git.apache.org/incubator-ratis.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ratis.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-ratis.git</url>
+ <connection>scm:git:git://git.apache.org/incubator-ratis-thirdparty.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ratis-thirdparty.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-ratis-thirdparty.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
@@ -76,7 +76,6 @@
<!--Version of protobuf to be shaded -->
<shaded.protobuf.version>3.5.0</shaded.protobuf.version>
- <shaded.protobuf-javanano.version>3.1.0</shaded.protobuf-javanano.version>
<!--Version of grpc to be shaded -->
<shaded.grpc.version>1.14.0</shaded.grpc.version>
<!--Version of Netty to be shaded -->
@@ -93,11 +92,6 @@
<version>${shaded.protobuf.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf.nano</groupId>
- <artifactId>protobuf-javanano</artifactId>
- <version>${shaded.protobuf-javanano.version}</version>
- </dependency>
- <dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${shaded.grpc.version}</version>
@@ -400,12 +394,8 @@
<shadedPattern>${ratis.thirdparty.shaded.prefix}.com.google.gson</shadedPattern>
</relocation>
<relocation>
- <pattern>afu.plume</pattern>
- <shadedPattern>${ratis.thirdparty.shaded.prefix}.afu.plume</shadedPattern>
- </relocation>
- <relocation>
- <pattern>afu.org.checkerframework</pattern>
- <shadedPattern>${ratis.thirdparty.shaded.prefix}.afu.org.checkerframework</shadedPattern>
+ <pattern>afu</pattern>
+ <shadedPattern>${ratis.thirdparty.shaded.prefix}.afu</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
@@ -439,10 +429,8 @@
</artifactSet>
<!-- Pick up any LICENSE/NOTICE files from our dependencies -->
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
+ <!-- There are transformers for LICENSE and NOTICE, but none of our dependencies have proper upstream
+ L&N files, so we can just manage it ourselves with less pain and more correctness. -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
</configuration>
diff --git a/src/main/appended-resources/META-INF/LICENSE b/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..4dc2ba7
--- /dev/null
+++ b/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,53 @@
+
+---
+
+This product also contains Protocol Buffers which has the following 3-clause BSD license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+This product also contains annotations from the Checker Framework
+which are licensed under the MIT License:
+
+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.
diff --git a/src/main/appended-resources/META-INF/NOTICE b/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..9cd2f8f
--- /dev/null
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,23 @@
+---
+
+This product bundles protobuf-java which includes the following:
+
+Copyright 2008 Google Inc.
+
+---
+
+This product bundles gRPC which includes the following text:
+
+Copyright 2014 The gRPC Authors
+
+---
+
+This product bundles netty-all which includes the following text:
+
+Copyright 2014 The Netty Project
+
+---
+
+This product bundles Gson which includes the following text:
+
+Copyright 2008 Google Inc.