Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<classifier>all</classifier>
<version>0.9.4</version>
<version>0.9.5</version>
</dependency>
</dependencies>
```
Expand All @@ -43,7 +43,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
```yaml
services:
clickhouse-server:
image: clickhouse/clickhouse-server:25.10.3.100
image: clickhouse/clickhouse-server:25.12.1.649
environment:
CLICKHOUSE_SKIP_USER_SETUP: "1"
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ the possible Maven dependencies are as follows,
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<classifier>all</classifier>
<version>0.9.4</version>
<version>0.9.5</version>
</dependency>
</dependencies>
```
Expand All @@ -43,7 +43,7 @@ Write a Docker Compose file to start ClickHouse.
```yaml
services:
clickhouse-server:
image: clickhouse/clickhouse-server:25.10.3.100
image: clickhouse/clickhouse-server:25.12.1.649
environment:
CLICKHOUSE_SKIP_USER_SETUP: "1"
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ShardingSphere 对 Firebird JDBC Driver 的支持位于可选模块中。
<dependency>
<groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird</artifactId>
<version>5.0.6.java8</version>
<version>5.0.10.java8</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
通过第三方工具在 Firebird 内创建业务库。

包括 DBeaver Community 在内的第三方工具无法为 Firebird 创建 databases,
下以 Maven 模块 `org.firebirdsql.jdbc:jaybird:5.0.6.java8` 的 Java API 为例,
下以 Maven 模块 `org.firebirdsql.jdbc:jaybird:5.0.10.java8` 的 Java API 为例,

```java
import org.firebirdsql.management.FBManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ the possible Maven dependencies are as follows,
<dependency>
<groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird</artifactId>
<version>5.0.6.java8</version>
<version>5.0.10.java8</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
Create some business databases in Firebird through third-party tools.

Third-party tools including DBeaver Community cannot create databases for Firebird.
Below is the Java API of the Maven module `org.firebirdsql.jdbc:jaybird:5.0.6.java8` as an example.
Below is the Java API of the Maven module `org.firebirdsql.jdbc:jaybird:5.0.10.java8` as an example.

```java
import org.firebirdsql.management.FBManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2493,12 +2493,6 @@
},
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
},
{
"condition": {
"typeReached": "org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.JDBCBackendDataSource"
},
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
},
{
"condition": {
"typeReached": "org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"
Expand Down
50 changes: 43 additions & 7 deletions mvnw

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 48 additions & 8 deletions mvnw.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<logback.version>1.2.13</logback.version>
<commons-logging.version>1.2</commons-logging.version>

<lombok.version>1.18.38</lombok.version>
<lombok.version>1.18.42</lombok.version>
<jsr305.version>3.0.2</jsr305.version>
<immutables.version>2.10.1</immutables.version>

Expand All @@ -124,11 +124,11 @@
<h2.version>2.2.224</h2.version>
<opengauss.version>3.1.0-og</opengauss.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
<clickhouse-jdbc.version>0.9.4</clickhouse-jdbc.version>
<clickhouse-jdbc.version>0.9.5</clickhouse-jdbc.version>
<hive-jdbc.version>4.0.1</hive-jdbc.version>
<hive-server2-jdbc-driver-thin.version>1.8.2</hive-server2-jdbc-driver-thin.version>
<presto.version>0.296</presto.version>
<jaybird.version>5.0.6.java8</jaybird.version>
<jaybird.version>5.0.10.java8</jaybird.version>

<hikari-cp.version>4.0.3</hikari-cp.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ dataSources:
ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_0?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_0?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_1?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_1?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
ds_2:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_2?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_2?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql

rules:
- !SHARDING
Expand Down
Loading