From ddf6fb8ef2290256f8b8a945028aa7a4d003c28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 14 Sep 2021 11:50:19 +0200 Subject: [PATCH 1/5] Upgraded dependencies with CVEs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- dependencies.gradle | 8 ++++---- pom.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c3159aef1b2..587ac4deb44 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -25,13 +25,13 @@ depVersions = [ arquillianCubeDocker: "1.18.2", arquillianJunit: "1.6.0.Final", bcFips: "1.0.2", - bouncycastle: "1.56", + bouncycastle: "1.69", commonsCli: "1.4", commonsCodec: "1.14", commonsCollections4: "4.1", commonsCompress: "1.19", commonsConfiguration: "1.10", - commonsIO: "2.4", + commonsIO: "2.7", commonsLang2: "2.6", commonsLang3: "3.6", commonsBeanutils: "1.9.3", @@ -50,7 +50,7 @@ depVersions = [ jackson: "2.11.1", jcommander: "1.78", jctools: "2.1.2", - jetty: "9.4.31.v20200723", + jetty: "9.4.43.v20210629", jmh: "1.19", jmock: "2.8.2", jna: "3.2.7", @@ -58,7 +58,7 @@ depVersions = [ junit: "4.12", junitFoundation: "11.0.0", kerby: "1.1.1", - log4j: "1.2.17", + log4j: "1.2.27", lombok: "1.18.20", lz4: "1.3.0", mockito: "3.0.0", diff --git a/pom.xml b/pom.xml index 81e3d01280c..8ab4a55c3ad 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 1.19 2.6 3.6 - 2.4 + 2.7 1.0.2 5.1.0 3.2.5 @@ -138,7 +138,7 @@ 2.1.10 2.11.0 1.78 - 9.4.33.v20201020 + 9.4.43.v20210629 1.19 2.8.2 3.2.7 @@ -160,7 +160,7 @@ 0.9.11 6.22.1.1 3.0.1 - 1.7.25 + 1.7.32 1.19 3.1.8 1.3.2 From 9540ad48144aafe8997879f5c3eaa163115c0a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 14 Sep 2021 12:35:15 +0200 Subject: [PATCH 2/5] Added upgrades in licenses file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- .../src/main/resources/LICENSE-all.bin.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 96dda44d6b0..1229ccf65a7 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.4.jar [8] +- lib/commons-io-commons-io-2.7.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.63.Final.jar [11] @@ -248,12 +248,12 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.6.2.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.6.2.jar [21] - lib/org.apache.zookeeper-zookeeper-3.6.2-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar [22] - lib/org.rocksdb-rocksdbjni-6.22.1.1.jar [23] - lib/com.beust-jcommander-1.78.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] From 4c17764b63ab6bc3f91990a22a74256253eae8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 14 Sep 2021 16:21:42 +0200 Subject: [PATCH 3/5] Updating license files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- .../src/main/resources/LICENSE-all.bin.txt | 2 +- .../src/main/resources/LICENSE-bkctl.bin.txt | 2 +- .../src/main/resources/LICENSE-server.bin.txt | 16 ++++++++-------- .../src/main/resources/NOTICE-all.bin.txt | 14 +++++++------- .../src/main/resources/NOTICE-server.bin.txt | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 1229ccf65a7..478e7796026 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -322,7 +322,7 @@ Apache Software License, Version 2. [19] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-collections.git;a=tag;h=a3a5ad [20] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.6.2 -[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.33.v20201020 +[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.43.v20210629 [23] Source available at https://github.com/facebook/rocksdb/tree/v6.22.1 [24] Source available at https://github.com/cbeust/jcommander/tree/1.78 [25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 4ace15ed40d..a5adb5be6a6 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.4.jar [8] +- lib/commons-io-commons-io-2.7.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.63.Final.jar [11] diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index c6f1db28998..ac857bae622 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -214,7 +214,7 @@ Apache Software License, Version 2. - lib/commons-cli-commons-cli-1.2.jar [5] - lib/commons-codec-commons-codec-1.6.jar [6] - lib/commons-configuration-commons-configuration-1.10.jar [7] -- lib/commons-io-commons-io-2.4.jar [8] +- lib/commons-io-commons-io-2.7.jar [8] - lib/commons-lang-commons-lang-2.6.jar [9] - lib/commons-logging-commons-logging-1.1.1.jar [10] - lib/io.netty-netty-buffer-4.1.63.Final.jar [11] @@ -248,12 +248,12 @@ Apache Software License, Version 2. - lib/org.apache.zookeeper-zookeeper-3.6.2.jar [21] - lib/org.apache.zookeeper-zookeeper-jute-3.6.2.jar [21] - lib/org.apache.zookeeper-zookeeper-3.6.2-tests.jar [21] -- lib/org.eclipse.jetty-jetty-http-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-io-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-security-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-server-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-servlet-9.4.33.v20201020.jar [22] -- lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar [22] +- lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar [22] - lib/org.rocksdb-rocksdbjni-6.22.1.1.jar [23] - lib/com.beust-jcommander-1.78.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] @@ -320,7 +320,7 @@ Apache Software License, Version 2. [19] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-collections.git;a=tag;h=a3a5ad [20] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6 [21] Source available at https://github.com/apache/zookeeper/tree/release-3.6.2 -[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.33.v20201020 +[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.43.v20210629 [23] Source available at https://github.com/facebook/rocksdb/tree/v6.16.4 [24] Source available at https://github.com/cbeust/jcommander/tree/1.78 [25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3 diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index cefcd83b616..a9c9db146ee 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -78,12 +78,12 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-io-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-security-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-server-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar +- lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629jar +- lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar ============================================================== Jetty Web Container @@ -105,7 +105,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 962bd11d783..37ed211c97a 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -61,12 +61,12 @@ SoundCloud Ltd. (http://soundcloud.com/). This product includes software developed as part of the Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). ------------------------------------------------------------------------------------ -- lib/org.eclipse.jetty-jetty-http-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-io-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-security-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-server-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-servlet-9.4.33.v20201020.jar -- lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar +- lib/org.eclipse.jetty-jetty-http-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-io-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-security-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar ============================================================== Jetty Web Container @@ -88,7 +88,7 @@ Jetty is dual licensed under both Jetty may be distributed under either license. -lib/org.eclipse.jetty-jetty-util-9.4.33.v20201020.jar bundles UnixCrypt +lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar bundles UnixCrypt The UnixCrypt.java code implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, From da224ac56110aeb52789b05655606feaf99aa697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Wed, 15 Sep 2021 19:32:58 +0200 Subject: [PATCH 4/5] Fixing license check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-dist/all/build.gradle | 2 +- bookkeeper-dist/bkctl/build.gradle | 2 +- bookkeeper-dist/server/build.gradle | 2 +- bookkeeper-dist/src/assemble/bin-all.xml | 2 +- bookkeeper-dist/src/assemble/bin-server.xml | 2 +- bookkeeper-dist/src/assemble/bkctl.xml | 2 +- bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 9 +++++---- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 8 ++++---- .../src/main/resources/LICENSE-server.bin.txt | 9 +++++---- bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt | 1 + bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt | 1 + 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/bookkeeper-dist/all/build.gradle b/bookkeeper-dist/all/build.gradle index 9252105ef4f..54f44d3ba98 100644 --- a/bookkeeper-dist/all/build.gradle +++ b/bookkeeper-dist/all/build.gradle @@ -71,7 +71,7 @@ def depLicences = [ "scala-library-2.11.7/LICENSE.md", "scala-parser-combinators_2.11-1.0.4/LICENSE.md", "scala-reflect-2.11.8/LICENSE.md", - "slf4j-1.7.25/LICENSE.txt", + "slf4j-1.7.32/LICENSE.txt", ] distributions { diff --git a/bookkeeper-dist/bkctl/build.gradle b/bookkeeper-dist/bkctl/build.gradle index 23605ca5269..d31e3de29bb 100644 --- a/bookkeeper-dist/bkctl/build.gradle +++ b/bookkeeper-dist/bkctl/build.gradle @@ -40,7 +40,7 @@ def depLicences = [ "bouncycastle-1.0.2/LICENSE.html", "protobuf-3.14.0/LICENSE", "protobuf-3.12.0/LICENSE", - "slf4j-1.7.25/LICENSE.txt", + "slf4j-1.7.32/LICENSE.txt", ] distributions { diff --git a/bookkeeper-dist/server/build.gradle b/bookkeeper-dist/server/build.gradle index 6b32e3d689b..ccdbb7f0d09 100644 --- a/bookkeeper-dist/server/build.gradle +++ b/bookkeeper-dist/server/build.gradle @@ -64,7 +64,7 @@ def depLicences = [ "bouncycastle-1.0.2/LICENSE.html", "protobuf-3.14.0/LICENSE", "protobuf-3.12.0/LICENSE", - "slf4j-1.7.25/LICENSE.txt", + "slf4j-1.7.32/LICENSE.txt", ] distributions { main { diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml index af03d6d3b32..24a242fbc13 100644 --- a/bookkeeper-dist/src/assemble/bin-all.xml +++ b/bookkeeper-dist/src/assemble/bin-all.xml @@ -66,7 +66,7 @@ scala-library-2.11.7/LICENSE.md scala-parser-combinators_2.11-1.0.4/LICENSE.md scala-reflect-2.11.8/LICENSE.md - slf4j-1.7.25/LICENSE.txt + slf4j-1.7.32/LICENSE.txt 644 diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml index 3e39afbd5b6..7157f39e607 100644 --- a/bookkeeper-dist/src/assemble/bin-server.xml +++ b/bookkeeper-dist/src/assemble/bin-server.xml @@ -56,7 +56,7 @@ bouncycastle-1.0.2/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE - slf4j-1.7.25/LICENSE.txt + slf4j-1.7.32/LICENSE.txt 644 diff --git a/bookkeeper-dist/src/assemble/bkctl.xml b/bookkeeper-dist/src/assemble/bkctl.xml index 5e67dd3f142..73fffc59710 100644 --- a/bookkeeper-dist/src/assemble/bkctl.xml +++ b/bookkeeper-dist/src/assemble/bkctl.xml @@ -70,7 +70,7 @@ bouncycastle-1.0.2/LICENSE.html protobuf-3.14.0/LICENSE protobuf-3.12.0/LICENSE - slf4j-1.7.25/LICENSE.txt + slf4j-1.7.32/LICENSE.txt 644 diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index 478e7796026..07a35fec94f 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt @@ -254,6 +254,7 @@ Apache Software License, Version 2. - lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.43.v20210629.jar [22] - lib/org.rocksdb-rocksdbjni-6.22.1.1.jar [23] - lib/com.beust-jcommander-1.78.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] @@ -634,12 +635,12 @@ Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar Source available at https://github.com/javaee/servlet-spec/tree/4.0.0 ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a -MIT license. For details, see deps/slf4j-1.7.25/LICENSE.txt. +MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt. Bundled as - - lib/org.slf4j-slf4j-api-1.7.25.jar - - lib/org.slf4j-slf4j-log4j12-1.7.25.jar -Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.25 + - lib/org.slf4j-slf4j-api-1.7.32.jar + - lib/org.slf4j-slf4j-log4j12-1.7.32.jar +Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32 ------------------------------------------------------------------------------------ This product bundles the Google Auth Library, which is available under a "3-clause BSD" license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index a5adb5be6a6..93bba0c0c8b 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -561,12 +561,12 @@ Source available at https://github.com/protocolbuffers/protobuf/tree/v3.12.0 For details, see deps/protobuf-3.12.0/LICENSE. ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a -MIT license. For details, see deps/slf4j-1.7.25/LICENSE.txt. +MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt. Bundled as - - lib/org.slf4j-slf4j-api-1.7.25.jar - - lib/org.slf4j-slf4j-log4j12-1.7.25.jar -Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.25 + - lib/org.slf4j-slf4j-api-1.7.32.jar + - lib/org.slf4j-slf4j-log4j12-1.7.32.jar +Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32 ------------------------------------------------------------------------------------ This product bundles the Google Auth Library, which is available under a "3-clause BSD" license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt index ac857bae622..3ae4dcd59c6 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt @@ -254,6 +254,7 @@ Apache Software License, Version 2. - lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar [22] - lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar [22] +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.43.v20210629.jar [22] - lib/org.rocksdb-rocksdbjni-6.22.1.1.jar [23] - lib/com.beust-jcommander-1.78.jar [24] - lib/com.yahoo.datasketches-memory-0.8.3.jar [25] @@ -626,12 +627,12 @@ Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar Source available at https://github.com/javaee/servlet-spec/tree/4.0.0 ------------------------------------------------------------------------------------ This product bundles Simple Logging Facade for Java, which is available under a -MIT license. For details, see deps/slf4j-1.7.25/LICENSE.txt. +MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt. Bundled as - - lib/org.slf4j-slf4j-api-1.7.25.jar - - lib/org.slf4j-slf4j-log4j12-1.7.25.jar -Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.25 + - lib/org.slf4j-slf4j-api-1.7.32.jar + - lib/org.slf4j-slf4j-log4j12-1.7.32.jar +Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32 ------------------------------------------------------------------------------------ This product bundles the Google Auth Library, which is available under a "3-clause BSD" license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt index a9c9db146ee..043c37160da 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt @@ -84,6 +84,7 @@ Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). - lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar - lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar - lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.43.v20210629.jar ============================================================== Jetty Web Container diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt index 37ed211c97a..0ede3b73e75 100644 --- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt +++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt @@ -67,6 +67,7 @@ Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/). - lib/org.eclipse.jetty-jetty-server-9.4.43.v20210629.jar - lib/org.eclipse.jetty-jetty-servlet-9.4.43.v20210629.jar - lib/org.eclipse.jetty-jetty-util-9.4.43.v20210629.jar +- lib/org.eclipse.jetty-jetty-util-ajax-9.4.43.v20210629.jar ============================================================== Jetty Web Container From 6cbebcce2608e0aa9f96d8366d3daae0a5c73033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Thu, 16 Sep 2021 11:28:30 +0200 Subject: [PATCH 5/5] Renamed slf4j license dir. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- .../resources/deps/{slf4j-1.7.25 => slf4j-1.7.32}/LICENSE.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bookkeeper-dist/src/main/resources/deps/{slf4j-1.7.25 => slf4j-1.7.32}/LICENSE.txt (100%) diff --git a/bookkeeper-dist/src/main/resources/deps/slf4j-1.7.25/LICENSE.txt b/bookkeeper-dist/src/main/resources/deps/slf4j-1.7.32/LICENSE.txt similarity index 100% rename from bookkeeper-dist/src/main/resources/deps/slf4j-1.7.25/LICENSE.txt rename to bookkeeper-dist/src/main/resources/deps/slf4j-1.7.32/LICENSE.txt