You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2017/12/13 22:01:21 UTC
zookeeper git commit: ZOOKEEPER-2952: Upgrade third party libs: netty, slf4j
Repository: zookeeper
Updated Branches:
refs/heads/master 9e30b9bf8 -> aa8b60670
ZOOKEEPER-2952: Upgrade third party libs: netty, slf4j
https://issues.apache.org/jira/browse/ZOOKEEPER-2952
Author: Andor Molnar <an...@cloudera.com>
Reviewers: phunt@apache.org
Closes #429 from anmolnar/ZOOKEEPER-2952 and squashes the following commits:
b488bf4b [Andor Molnar] ZOOKEEPER-2952. Updated slf4j license
949ada4a [Andor Molnar] ZOOKEEPER-2952. Upgrade third party libs: netty, slf4j
Change-Id: I7cce9cdbefab6c560a582c4dae7b4e00c73b1529
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/aa8b6067
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/aa8b6067
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/aa8b6067
Branch: refs/heads/master
Commit: aa8b60670875e509dc22f338aebcc023c166d880
Parents: 9e30b9b
Author: Andor Molnar <an...@cloudera.com>
Authored: Wed Dec 13 14:00:08 2017 -0800
Committer: Patrick Hunt <ph...@apache.org>
Committed: Wed Dec 13 14:00:08 2017 -0800
----------------------------------------------------------------------
build.xml | 4 ++--
src/java/lib/slf4j-1.7.25.LICENSE.txt | 22 ++++++++++++++++++++++
src/java/lib/slf4j-1.7.5.LICENSE.txt | 20 --------------------
3 files changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/aa8b6067/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e61f7d7..37e709a 100644
--- a/build.xml
+++ b/build.xml
@@ -198,7 +198,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<!-- ====================================================== -->
<!-- Dependency versions -->
<!-- ====================================================== -->
- <property name="slf4j.version" value="1.7.5"/>
+ <property name="slf4j.version" value="1.7.25"/>
<property name="commons-cli.version" value="1.2"/>
<property name="wagon-http.version" value="2.4"/>
@@ -208,7 +208,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<property name="audience-annotations.version" value="0.5.0" />
- <property name="netty.version" value="3.10.5.Final"/>
+ <property name="netty.version" value="3.10.6.Final"/>
<property name="junit.version" value="4.12"/>
<property name="mockito.version" value="1.8.2"/>
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/aa8b6067/src/java/lib/slf4j-1.7.25.LICENSE.txt
----------------------------------------------------------------------
diff --git a/src/java/lib/slf4j-1.7.25.LICENSE.txt b/src/java/lib/slf4j-1.7.25.LICENSE.txt
new file mode 100644
index 0000000..a502dd9
--- /dev/null
+++ b/src/java/lib/slf4j-1.7.25.LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+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.
+
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/aa8b6067/src/java/lib/slf4j-1.7.5.LICENSE.txt
----------------------------------------------------------------------
diff --git a/src/java/lib/slf4j-1.7.5.LICENSE.txt b/src/java/lib/slf4j-1.7.5.LICENSE.txt
deleted file mode 100644
index 0789256..0000000
--- a/src/java/lib/slf4j-1.7.5.LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch All rights reserved.
-
-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.