ソースを参照

ZOOKEEPER-2952: Upgrade third party libs: netty, slf4j

https://issues.apache.org/jira/browse/ZOOKEEPER-2952

Author: Andor Molnar <andor@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
Andor Molnar 7 年 前
コミット
aa8b606708
3 ファイル変更24 行追加22 行削除
  1. 2 2
      build.xml
  2. 22 0
      src/java/lib/slf4j-1.7.25.LICENSE.txt
  3. 0 20
      src/java/lib/slf4j-1.7.5.LICENSE.txt

+ 2 - 2
build.xml

@@ -198,7 +198,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <!-- ====================================================== -->
     <!-- ====================================================== -->
     <!-- Dependency versions                                    -->
     <!-- 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="commons-cli.version" value="1.2"/>
 
 
     <property name="wagon-http.version" value="2.4"/>
     <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="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="junit.version" value="4.12"/>
     <property name="mockito.version" value="1.8.2"/>
     <property name="mockito.version" value="1.8.2"/>

+ 22 - 0
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.
+

+ 0 - 20
src/java/lib/slf4j-1.7.5.LICENSE.txt

@@ -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.