This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 6858dc8 Update detailed licenses in shardingsphere-proxy-distribution
(#16546)
6858dc8 is described below
commit 6858dc83321c13309c9f2bda10394f1e931a062d
Author: 吴伟杰 <wuwei...@apache.org>
AuthorDate: Fri Apr 1 18:25:17 2022 +0800
Update detailed licenses in shardingsphere-proxy-distribution (#16546)
* Correct license of jcl-over-slf4j
* Remove licenses/LICENSE-jcl-over-slf4j.txt
* Update licenses
* Update license of antlr4-runtime
---
.../src/main/release-docs/LICENSE | 2 +-
.../licenses/LICENSE-antlr4-runtime.txt | 26 ++++++++++++++
.../licenses/LICENSE-jcl-over-slf4j.txt | 24 -------------
.../release-docs/licenses/LICENSE-perfmark.txt | 9 +++++
.../main/release-docs/licenses/LICENSE-slf4j.txt | 40 +++++++++++-----------
5 files changed, 56 insertions(+), 45 deletions(-)
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
index c09754b..7fe9b80 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -256,6 +256,7 @@ The text of each license is the standard Apache 2.0 license.
jackson-core 2.10.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-databind 2.10.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-dataformat-yaml 2.10.0: http://github.com/FasterXML/jackson,
Apache 2.0
+ jcl-over-slf4j 1.7.7: https://github.com/qos-ch/slf4j, Apache 2.0
jetcd-common 0.5.0: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-core 0.5.0: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-resolver 0.5.0: https://github.com/etcd-io/jetcd, Apache 2.0
@@ -352,5 +353,4 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
animal-sniffer-annotations 1.18:
https://github.com/mojohaus/animal-sniffer, MIT
bcprov-jdk15on 1.70: https://www.bouncycastle.org, MIT
checker-qual 3.5.0:
https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
- jcl-over-slf4j 1.7.7: https://www.slf4j.org, MIT
slf4j 1.7.7: https://www.slf4j.org , MIT
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-antlr4-runtime.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-antlr4-runtime.txt
index 77bc706..e4c39aa 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-antlr4-runtime.txt
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-antlr4-runtime.txt
@@ -27,3 +27,29 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====
+
+MIT License for codepointat.js from https://git.io/codepointat
+MIT License for fromcodepoint.js from https://git.io/vDW1m
+
+Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+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/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jcl-over-slf4j.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jcl-over-slf4j.txt
deleted file mode 100644
index 075d57e..0000000
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jcl-over-slf4j.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-jcl-over-slf4j License
----------------
-
-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.
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-perfmark.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-perfmark.txt
index 949b355..619fafb 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-perfmark.txt
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-perfmark.txt
@@ -32,3 +32,12 @@ Components, which can be obtained at:
*
traceviewer/src/main/resources/io/perfmark/traceviewer/third_party/polymer/LICENSE
(New BSD License)
* HOMEPAGE:
* https://github.com/Polymer/polymer
+
+
+This product contains a modified portion of 'ASM', an open source
+Java Bytecode library, which can be obtained at:
+
+ * LICENSE:
+ * agent/src/main/resources/io/perfmark/agent/third_party/asm/LICENSE (BSD
style License)
+ * HOMEPAGE:
+ * https://asm.ow2.io/
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-slf4j.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-slf4j.txt
index ee59090..afba443 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-slf4j.txt
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-slf4j.txt
@@ -1,24 +1,24 @@
SLF4J License
---------------
-Copyright (c) 2004-2017 QOS.ch
- All rights reserved.
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
+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.
+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.
