You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/04/27 11:01:10 UTC
[shardingsphere] branch master updated: Update LICENSE for #25337 (#25367)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 80ab65234ce Update LICENSE for #25337 (#25367)
80ab65234ce is described below
commit 80ab65234ceb6f69a40ef2af93189e6b0e4d6acc
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Thu Apr 27 19:00:59 2023 +0800
Update LICENSE for #25337 (#25367)
---
distribution/proxy/src/main/release-docs/LICENSE | 10 +++++++++
.../licenses/LICENSE-bcprov-jdk15on.txt | 24 ----------------------
.../licenses/LICENSE-bouncy-castle.txt | 15 ++++++++++++++
3 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index 5ad2b39acbf..81697d47014 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -277,6 +277,13 @@ The text of each license is the standard Apache 2.0 license.
netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final-linux-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final-linux-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final-osx-aarch_64: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final-osx-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-boringssl-static 2.0.59.Final-windows-x86_64: https://github.com/netty/netty-tcnative, Apache 2.0
+ netty-tcnative-classes 2.0.59.Final: https://github.com/netty/netty-tcnative, Apache 2.0
netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.90.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
@@ -353,7 +360,10 @@ MIT licenses
The following components are provided under the MIT License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
+ bcpkix-jdk15on 1.70: https://www.bouncycastle.org, MIT
bcprov-jdk15on 1.70: https://www.bouncycastle.org, MIT
+ bctls-jdk15on 1.70: https://www.bouncycastle.org, MIT
+ bcutil-jdk15on 1.70: https://www.bouncycastle.org, MIT
checker-qual 3.5.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
jul-to-slf4j 1.7.36: https://www.slf4j.org, MIT
slf4j-api 1.7.36: https://www.slf4j.org, MIT
diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-bcprov-jdk15on.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-bcprov-jdk15on.txt
deleted file mode 100644
index d14347eced4..00000000000
--- a/distribution/proxy/src/main/release-docs/licenses/LICENSE-bcprov-jdk15on.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Bcprov-jdk15on License
----------------
-
-Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-MIT License:
-
-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.
diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-bouncy-castle.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-bouncy-castle.txt
new file mode 100644
index 00000000000..d9faf7181dd
--- /dev/null
+++ b/distribution/proxy/src/main/release-docs/licenses/LICENSE-bouncy-castle.txt
@@ -0,0 +1,15 @@
+Bouncy Castle License
+---------------
+
+Please note this should be read in the same way as the MIT license.
+
+Please also note this licensing model is made possible through funding from donations and the sale of support contracts.
+
+LICENSE
+Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+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.