merlimat closed pull request #2040: Fix license in binary distribution
URL: https://github.com/apache/incubator-pulsar/pull/2040
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/all/licenses/LICENSE-JLine.txt b/all/licenses/LICENSE-JLine.txt
deleted file mode 100644
index 9a34d43f5a..0000000000
--- a/all/licenses/LICENSE-JLine.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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 JLine 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.
diff --git a/all/licenses/LICENSE-xz.txt b/all/licenses/LICENSE-xz.txt
new file mode 100644
index 0000000000..ee50e15277
--- /dev/null
+++ b/all/licenses/LICENSE-xz.txt
@@ -0,0 +1 @@
+This Java implementation of XZ has been put into the public domain, thus you
can do whatever you want with it. All the files in the package have been
written by Lasse Collin, but some files are heavily based on public domain code
written by Igor Pavlov.
diff --git a/all/src/assemble/LICENSE.bin.txt b/all/src/assemble/LICENSE.bin.txt
index 35e92e7ff6..763f62c7a5 100644
--- a/all/src/assemble/LICENSE.bin.txt
+++ b/all/src/assemble/LICENSE.bin.txt
@@ -323,11 +323,11 @@ The Apache Software License, Version 2.0
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.8.4.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.8.4.jar
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.8.4.jar
- - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.9.0.jar
+ - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.8.4.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.3.3.jar
- * Proto Google Common Protos --
com.google.api.grpc-proto-google-common-protos-0.1.9.jar
+ * Proto Google Common Protos --
com.google.api.grpc-proto-google-common-protos-1.0.0.jar
* Gson -- com.google.code.gson-gson-2.8.2.jar
- * Guava -- com.google.guava-guava-20.0.jar
+ * Guava -- com.google.guava-guava-21.0.jar
* Netty Reactive Streams --
com.typesafe.netty-netty-reactive-streams-2.0.0.jar
* Swagger Annotations -- com.wordnik-swagger-annotations-1.5.3-M1.jar
* Swagger
@@ -353,10 +353,7 @@ The Apache Software License, Version 2.0
- org.apache.commons-commons-lang3-3.4.jar
* Netty
- io.netty-netty-3.10.1.Final.jar
- - io.netty-netty-all-4.1.21.Final.jar
- - io.netty-netty-codec-http2-4.1.12.Final.jar
- - io.netty-netty-codec-socks-4.1.12.Final.jar
- - io.netty-netty-handler-proxy-4.1.12.Final.jar
+ - io.netty-netty-all-4.1.22.Final.jar
- io.netty-netty-tcnative-boringssl-static-2.0.7.Final.jar
* Prometheus client
- io.prometheus-simpleclient-0.0.23.jar
@@ -420,10 +417,9 @@ The Apache Software License, Version 2.0
* HttpClient
- org.apache.httpcomponents-httpclient-4.5.5.jar
- org.apache.httpcomponents-httpcore-4.4.9.jar
- * Google Instrumentation API -
com.google.instrumentation-instrumentation-api-0.4.3.jar
- * Google Error Prone Annotations -
com.google.errorprone-error_prone_annotations-2.0.19.jar
+ * Google Error Prone Annotations -
com.google.errorprone-error_prone_annotations-2.1.2.jar
* OkHttp - com.squareup.okhttp-okhttp-2.5.0.jar
- * Okio - com.squareup.okio-okio-1.6.0.jar
+ * Okio - com.squareup.okio-okio-1.13.0.jar
* Javassist -- org.javassist-javassist-3.21.0-GA.jar
* Amazon AWS SDK
- com.amazonaws-aws-java-sdk-core-1.11.297.jar
@@ -469,10 +465,9 @@ BSD 3-clause "New" or "Revised" License
* EA Agent Loader
- com.ea.agentloader-ea-agent-loader-1.0.2.jar --
licenses/LICENSE-EA-Agent-Loader.txt
* Google auth library
- - com.google.auth-google-auth-library-credentials-0.4.0.jar --
licenses/LICENSE-google-auth-library.txt
- * JLine -- jline-jline-0.9.94.jar -- licenses/LICENSE.JLine.txt
+ - com.google.auth-google-auth-library-credentials-0.9.0.jar --
licenses/LICENSE-google-auth-library.txt
* LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt
- * JSR305 -- com.google.code.findbugs-jsr305-3.0.0.jar --
licenses/LICENSE-JSR305.txt
+ * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar --
licenses/LICENSE-JSR305.txt
BSD 2-Clause License
* HdrHistogram -- org.hdrhistogram-HdrHistogram-2.1.9.jar --
licenses/LICENSE-HdrHistogram.txt
@@ -491,7 +486,7 @@ MIT License
Protocol Buffers License
* Protocol Buffers
- com.google.protobuf-protobuf-java-3.5.1.jar --
licenses/LICENSE-protobuf.txt
- - com.google.protobuf-protobuf-java-util-3.3.1.jar --
licenses/LICENSE-protobuf.txt
+ - com.google.protobuf-protobuf-java-util-3.5.1.jar --
licenses/LICENSE-protobuf.txt
- com.google.protobuf.nano-protobuf-javanano-3.0.0-alpha-5.jar --
licenses/LICENSE-protobuf.txt
CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
@@ -524,6 +519,10 @@ Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt
- org.aspectj-aspectjrt-1.9.1.jar
- org.aspectj-aspectjweaver-1.9.1.jar
+Public Domain
+ * XZ for Java -- licenses/LICENSE-xz.txt
+ - org.tukaani-xz-1.5.jar
+
Public Domain (CC0) -- licenses/LICENSE-CC0.txt
* Reactive Streams -- org.reactivestreams-reactive-streams-1.0.0.jar
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
