This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch branch-4.6
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.6 by this push:
new 1f0d45b Fix NOTICE and LICENSE
1f0d45b is described below
commit 1f0d45b74c9d929e8c55e5b069199d87105d5b89
Author: Sijie Guo <[email protected]>
AuthorDate: Sat Dec 9 16:34:32 2017 +0800
Fix NOTICE and LICENSE
Descriptions of the changes in this PR:
- combine the NOTICE, LICENSE files into one for both src and binary
distribution.
- make a few dependencies as `provided`
Author: Sijie Guo <[email protected]>
Reviewers: Jia Zhai <None>
This closes #820 from sijie/fix_notice_license
(cherry picked from commit 5dd324f65fbec5fab2d43a0d14bdf53adb32f9b3)
Signed-off-by: Jia Zhai <[email protected]>
---
NOTICE | 2 +-
bookkeeper-common/pom.xml | 12 +++++++-----
bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt | 17 +++++++++++------
.../src/main/resources/NOTICE-server.bin.txt | 4 +---
.../twitter-finagle-provider/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/NOTICE b/NOTICE
index 1b92c60..1102436 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011-2015 The Apache Software Foundation
+Copyright 2011-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml
index c61279e..79f55e0 100644
--- a/bookkeeper-common/pom.xml
+++ b/bookkeeper-common/pom.xml
@@ -39,6 +39,13 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${google.code.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${google.errorprone.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -46,11 +53,6 @@
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>2.1.2</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
index fe1c18b..ba657cc 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
@@ -17,7 +17,6 @@ under the License.
This project includes:
Apache Log4j under The Apache Software License, Version 2.0
Caffeine under The Apache Software License, Version 2.0
- Commons BeanUtils Core under The Apache Software License, Version 2.0
Commons CLI under The Apache Software License, Version 2.0
Commons Codec under The Apache Software License, Version 2.0
Commons Collections under The Apache Software License, Version 2.0
@@ -25,20 +24,26 @@ This project includes:
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
- Commons Beanutils under Apache License, Version 2.0
- Commons Digester under The Apache Software License, Version 2.0
Dropwizard Metrics under The Apache Software License, Version 2.0
Guava under The Apache Software License, Version 2.0
Jackson under The Apache Software License, Version 2.0
Java Native Access under The Apache Software License, Version 2.0
+ Java Servlet API under Common Development and Distribution License 1.0
+ Javax.inject under The Apache Software License, Version 2.0
Jetty under The Apache Software License, Version 2.0
+ JSR305 Annotations for Findbugs under The Apache Software License, Version
2.0
+ ParaNamer under New BSD License
Prometheus under The Apache Software License, Version 2.0
- Protocol Buffer Java API under New BSD license
- Scala under New BSD license
+ Protocol Buffer Java API under New BSD License
+ Scala under New BSD License
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
The Netty Project under The Apache Software License, Version 2.0
Twitter Finagle under The Apache Software License, Version 2.0
+ Twitter JSR166e under Creative Commons Zero v1.0 Universal
+ Twitter LibThrift under The Apache Software License, Version 2.0
+ Twitter Server under The Apache Software License, Version 2.0
+ Twitter Scrooge under The Apache Software License, Version 2.0
Twitter Util under The Apache Software License, Version 2.0
Vertx under The Apache Software License, Version 2.0
- ZooKeeper under Apache License, Version 2.0
+ ZooKeeper under The Apache Software License, Version 2.0
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
index 7c3654e..73e7fdb 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
@@ -16,7 +16,6 @@ under the License.
This project includes:
Apache Log4j under The Apache Software License, Version 2.0
- Commons BeanUtils Core under The Apache Software License, Version 2.0
Commons CLI under The Apache Software License, Version 2.0
Commons Codec under The Apache Software License, Version 2.0
Commons Collections under The Apache Software License, Version 2.0
@@ -24,11 +23,10 @@ This project includes:
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
- Commons Beanutils under Apache License, Version 2.0
- Commons Digester under The Apache Software License, Version 2.0
Guava under The Apache Software License, Version 2.0
Jackson under The Apache Software License, Version 2.0
Java Native Access under The Apache Software License, Version 2.0
+ Java Servlet API under Common Development and Distribution License 1.0
Jetty under The Apache Software License, Version 2.0
Prometheus under The Apache Software License, Version 2.0
Protocol Buffer Java API under New BSD license
diff --git a/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
b/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
index 9c69997..67987e2 100644
--- a/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
+++ b/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
- <artifactId>finagle-core_2.10</artifactId>
+ <artifactId>finagle-core_2.11</artifactId>
<version>6.34.0</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index d2d6c15..e173f71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
<commons-configuration.version>1.10</commons-configuration.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
<google.code.version>3.0.2</google.code.version>
+ <google.errorprone.version>2.1.2</google.errorprone.version>
<guava.version>20.0</guava.version>
<hamcrest.version>1.3</hamcrest.version>
<jmh.version>1.19</jmh.version>
@@ -112,7 +113,6 @@
<netty-boringssl.version>2.0.3.Final</netty-boringssl.version>
<slf4j.version>1.7.25</slf4j.version>
<zookeeper.version>3.5.3-beta</zookeeper.version>
- <findbugs-jsr305.version>3.0.0</findbugs-jsr305.version>
<!-- plugin dependencies -->
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
