You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2017/12/09 08:34:43 UTC
[GitHub] jiazhai closed pull request #820: Fix NOTICE and LICENSE
jiazhai closed pull request #820: Fix NOTICE and LICENSE
URL: https://github.com/apache/bookkeeper/pull/820
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/NOTICE b/NOTICE
index 1b92c606c..1102436af 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 b1c624e6b..cf29785cb 100644
--- a/bookkeeper-common/pom.xml
+++ b/bookkeeper-common/pom.xml
@@ -40,6 +40,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>
@@ -47,11 +54,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 fe1c18b45..ba657ccd7 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 7c3654e09..73e7fdb47 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 857a69c66..d89bfc411 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 7f1d2c373..ccb5a9272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,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>
@@ -113,7 +114,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>
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services