Skip to content

Commit

Permalink
Fix license in binary distribution (apache#2040)
Browse files Browse the repository at this point in the history
*Motivation*

versions were upgraded on some dependencies, but the license file is not updated.

*Changes*

- fix the versions
- drop the dependencies that don't exist
- add the license for xz-java (public domain)
  • Loading branch information
sijie authored and merlimat committed Jun 28, 2018
1 parent c80dfb6 commit 7c30702
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 43 deletions.
29 changes: 0 additions & 29 deletions all/licenses/LICENSE-JLine.txt

This file was deleted.

1 change: 1 addition & 0 deletions all/licenses/LICENSE-xz.txt
Original file line number Diff line number Diff line change
@@ -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.
27 changes: 13 additions & 14 deletions all/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 7c30702

Please sign in to comment.