This is an automated email from the ASF dual-hosted git repository.
panjuan 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 f1267e7b538 Update master branch license (#21030)
f1267e7b538 is described below
commit f1267e7b538f28fedac0c5f4c2b099f996feeec6
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Sat Sep 17 10:37:46 2022 +0800
Update master branch license (#21030)
---
.../src/main/release-docs/LICENSE | 16 ++++++++-------
.../src/main/release-docs/licenses/LICENSE-jts.txt | 24 ++++++++++++++++++++++
.../licenses/LICENSE-opengauss-jdbc.txt | 3 +++
.../sql/parser/sql/common/util/SQLUtilTest.java | 6 +++---
4 files changed, 39 insertions(+), 10 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 a15fff83d33..f93ab420e1b 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -223,8 +223,8 @@ The text of each license is the standard Apache 2.0 license.
avatica-metrics 1.22.0: https://calcite.apache.org/avatica, Apache 2.0
auto-service-annotations 1.0:
https://github.com/google/auto/tree/master/service, Apache 2.0
caffeine 2.9.2: https://github.com/ben-manes/caffeine, Apache 2.0
- calcite-core 1.31.0: https://calcite.apache.org, Apache 2.0
- calcite-linq4j 1.31.0: https://calcite.apache.org, Apache 2.0
+ calcite-core 1.32.0: https://calcite.apache.org, Apache 2.0
+ calcite-linq4j 1.32.0: https://calcite.apache.org, Apache 2.0
commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0
commons-collections4 4.4: https://github.com/apache/commons-collections,
Apache 2.0
commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0
@@ -237,7 +237,6 @@ The text of each license is the standard Apache 2.0 license.
curator-recipes 5.1.0: https://github.com/apache/curator, Apache 2.0
cosid-core 1.14.4: https://github.com/Ahoo-Wang/CosId, Apache 2.0
error_prone_annotations 2.3.4: https://github.com/google/error-prone,
Apache 2.0
- esri-geometry-api 2.2.0: https://github.com/Esri/geometry-api-java, Apache
2.0
failsafe 2.4.1: https://github.com/jhalterman/failsafe, Apache 2.0
failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
@@ -257,7 +256,7 @@ The text of each license is the standard Apache 2.0 license.
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x,
Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache
2.0
jackson-annotations 2.10.0: http://github.com/FasterXML/jackson, Apache 2.0
- jackson-core 2.13.1: http://github.com/FasterXML/jackson, Apache 2.0
+ jackson-core 2.13.2: 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.13.2: http://github.com/FasterXML/jackson,
Apache 2.0
jcl-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0
@@ -265,6 +264,7 @@ The text of each license is the standard Apache 2.0 license.
jetcd-core 0.5.10: https://github.com/etcd-io/jetcd, Apache 2.0
json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
json-smart 2.4.7: https://www.minidev.net/, Apache 2.0
+ json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache
2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
@@ -279,7 +279,6 @@ The text of each license is the standard Apache 2.0 license.
netty-handler-proxy 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.80.Final: https://github.com/netty, Apache 2.0
- netty-tcnative-classes 2.0.54.Final:
https://github.com/netty/netty-tcnative, Apache 2.0
netty-transport 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.80.Final: https://github.com/netty,
Apache 2.0
netty-transport-native-epoll 4.1.80.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
@@ -287,6 +286,7 @@ The text of each license is the standard Apache 2.0 license.
netty-transport-native-unix-common 4.1.80.Final: https://github.com/netty,
Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.0.1:
https://github.com/googleapis/common-protos-java, Apache 2.0
+ proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
quartz 2.3.2: https://github.com/quartz-scheduler/quartz, Apache 2.0
sketches-core 0.9.0, Apache 2.0
snakeyaml 1.30: https://bitbucket.org/snakeyaml/snakeyaml, Apache 2.0
@@ -319,12 +319,14 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
antlr4-runtime 4.9.2: https://github.com/antlr/antlr4, BSD-3-Clause
asm 9.1: https://github.com/llbit/ow2-asm, BSD-3-Clause
- commons-compiler 3.1.6: https://github.com/janino-compiler/janino, New BSD
License
- janino 3.1.6: https://github.com/janino-compiler/janino, New BSD License
+ commons-compiler 3.1.8: https://github.com/janino-compiler/janino,
BSD-3-Clause
+ janino 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
opengauss-jdbc 3.0.0:
https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
protobuf-java 3.17.2:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
protobuf-java-util 3.17.2:
https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
+ jts-io-common 1.19.0: https://github.com/locationtech/jts, EDL 1.0
+ jts-core 1.19.0: https://github.com/locationtech/jts, EDL 1.0
========================================================================
CDDL licenses
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jts.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jts.txt
new file mode 100644
index 00000000000..ff1769bdde1
--- /dev/null
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-jts.txt
@@ -0,0 +1,24 @@
+JTS License
+---------------
+
+# JTS Topology Suite Licensing
+
+May 30th, 2017
+
+## Project Licenses
+
+The Eclipse Foundation makes available all content in this project
("Content"). Unless otherwise indicated below, the Content is provided to you
under the terms and conditions of either the [Eclipse Public License
2.0](https://www.eclipse.org/legal/epl-v20.html) ("EPL") or the [Eclipse
Distribution License 1.0](http://www.eclipse.org/org/documents/edl-v10.php) (a
BSD Style License). For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the
Content is being redistributed by another party ("Redistributor") and different
terms and conditions may apply to your use of any object code in the Content.
Check the Redistributor's license that was provided with the Content. If no
such license exists, contact the Redistributor. Unless otherwise indicated
below, the terms and conditions of the EPL still apply to any source code in
the Content and such source [...]
+
+## Third Party Content
+
+The Content includes items that have been sourced from third parties as set
out below. If you did not receive this Content directly from the Eclipse
Foundation, the following is provided for informational purposes only, and you
should look to the Redistributor's license for terms and conditions of use.
+
+### GeoTools
+
+JTS includes some code from the GeoTools project. This code has been licensed
to the JTS project under the OSGeo BSD License [2] by the GeoTools PSC [3,4].
+
+[2] https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
+[3] https://github.com/geotools/geotools/wiki/JTS-ORA-Contribution
+[4] https://github.com/geotools/geotools/wiki/JTS-Shapefile-Contribution
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-opengauss-jdbc.txt
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-opengauss-jdbc.txt
index 5d3a0018c70..5b45537c072 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-opengauss-jdbc.txt
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-opengauss-jdbc.txt
@@ -1,3 +1,6 @@
+opengauss-jdbc License
+---------------
+
Copyright (c) 1997, PostgreSQL Global Development Group
All rights reserved.
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SQLUtilTest.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SQLUtilTest.java
index ed548259933..9b9db90cab9 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SQLUtilTest.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/SQLUtilTest.java
@@ -149,7 +149,7 @@ public final class SQLUtilTest {
assertThat(SQLUtil.convertLikePatternToRegex("SHOW DATABASES LIKE
'sharding_\\%db'"), is("SHOW DATABASES LIKE 'sharding.%db'"));
assertThat(SQLUtil.convertLikePatternToRegex("SHOW DATABASES LIKE
'sharding\\_%db'"), is("SHOW DATABASES LIKE 'sharding_.*db'"));
}
-
+
@Test
public void assertIsReadOnly() {
assertFalse(SQLUtil.isReadOnly(new SQLServerRevertStatement()));
@@ -160,13 +160,13 @@ public final class SQLUtilTest {
assertTrue(SQLUtil.isReadOnly(new MySQLSelectStatement()));
assertTrue(SQLUtil.isReadOnly(new MySQLShowMasterStatusStatement()));
}
-
+
@Test
public void assertTrimSemiColon() {
assertThat(SQLUtil.trimSemicolon("SHOW DATABASES;"), is("SHOW
DATABASES"));
assertThat(SQLUtil.trimSemicolon("SHOW DATABASES"), is("SHOW
DATABASES"));
}
-
+
@Test
public void assertTrimComment() {
assertThat(SQLUtil.trimComment("/* This is a comment */ SHOW
DATABASES"), is("SHOW DATABASES"));
