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 a90951bc391 Bump MySQL Connector/J from 5.1.47 to 5.1.49 (#25547)
a90951bc391 is described below
commit a90951bc391ac1dd7d80ca44bae1a28fb770e70a
Author: 吴伟杰 <[email protected]>
AuthorDate: Wed May 10 14:01:16 2023 +0800
Bump MySQL Connector/J from 5.1.47 to 5.1.49 (#25547)
---
docs/blog/content/material/proxyIntroduce.cn.md | 2 +-
.../document/content/quick-start/shardingsphere-proxy-quick-start.cn.md | 2 +-
.../document/content/quick-start/shardingsphere-proxy-quick-start.en.md | 2 +-
.../content/user-manual/shardingsphere-proxy/migration/build.cn.md | 2 +-
.../content/user-manual/shardingsphere-proxy/migration/build.en.md | 2 +-
.../document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md | 2 +-
.../document/content/user-manual/shardingsphere-proxy/startup/bin.en.md | 2 +-
examples/pom.xml | 2 +-
pom.xml | 2 +-
.../plugins/logging/file/src/test/resources/docker/proxy/Dockerfile | 2 +-
.../metrics/prometheus/src/test/resources/docker/proxy/Dockerfile | 2 +-
.../plugins/tracing/jaeger/src/test/resources/docker/proxy/Dockerfile | 2 +-
.../plugins/tracing/zipkin/src/test/resources/docker/proxy/Dockerfile | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/blog/content/material/proxyIntroduce.cn.md
b/docs/blog/content/material/proxyIntroduce.cn.md
index a2f79894d58..66d39bd93a5 100644
--- a/docs/blog/content/material/proxyIntroduce.cn.md
+++ b/docs/blog/content/material/proxyIntroduce.cn.md
@@ -96,7 +96,7 @@ ShardingSphere-Proxy 的启动方式有三种：二进制包、Docker、Helm，
### 1. 将 MySQL 的 JDBC 驱动复制到 ext-lib 包
-下载驱动
[mysql-connector-java-5.1.47.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)
放入 ext-lib 包。因为初始目录中并没有 ext-lib，需要自行创建。
+下载驱动
[mysql-connector-java-5.1.49.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)
放入 ext-lib 包。因为初始目录中并没有 ext-lib，需要自行创建。
### 2. 修改 conf/server.yaml 配置文件
diff --git
a/docs/document/content/quick-start/shardingsphere-proxy-quick-start.cn.md
b/docs/document/content/quick-start/shardingsphere-proxy-quick-start.cn.md
index 6b10cb002d8..5da01a42144 100644
--- a/docs/document/content/quick-start/shardingsphere-proxy-quick-start.cn.md
+++ b/docs/document/content/quick-start/shardingsphere-proxy-quick-start.cn.md
@@ -42,7 +42,7 @@ ShardingSphere-Proxy 对系统库/表（如 information_schema、pg_catalog）
如果后端连接 PostgreSQL 或 openGauss 数据库，不需要引入额外依赖。
-如果后端连接 MySQL 数据库，请下载
[mysql-connector-java-5.1.47.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)，并将其放入
`%SHARDINGSPHERE_PROXY_HOME%/ext-lib` 目录。
+如果后端连接 MySQL 数据库，请下载
[mysql-connector-java-5.1.49.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)，并将其放入
`%SHARDINGSPHERE_PROXY_HOME%/ext-lib` 目录。
4. 启动服务
diff --git
a/docs/document/content/quick-start/shardingsphere-proxy-quick-start.en.md
b/docs/document/content/quick-start/shardingsphere-proxy-quick-start.en.md
index 4a2ce69b1c8..b99cca09a95 100644
--- a/docs/document/content/quick-start/shardingsphere-proxy-quick-start.en.md
+++ b/docs/document/content/quick-start/shardingsphere-proxy-quick-start.en.md
@@ -42,7 +42,7 @@ Please refer to [Configuration
Manual](/en/user-manual/shardingsphere-proxy/yaml
If the backend database is PostgreSQL or openGauss, no additional dependencies
are required.
-If the backend database is MySQL, please download
[mysql-connector-java-5.1.47.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar)
or
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)
and put it into the `%SHARDINGSPHERE_PROXY_HOME%/ext-lib` directory.
+If the backend database is MySQL, please download
[mysql-connector-java-5.1.49.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar)
or
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)
and put it into the `%SHARDINGSPHERE_PROXY_HOME%/ext-lib` directory.
4. Start server.
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
index 864ce1de49c..f6ec949c744 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
@@ -43,7 +43,7 @@ proxy 已包含 PostgreSQL JDBC 驱动。
| 数据库 | JDBC 驱动
| 参考
|
|-----------|---------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
-| MySQL | [mysql-connector-java-5.1.47.jar](
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
) | [Connector/J Versions](
https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-versions.html ) |
+| MySQL | [mysql-connector-java-5.1.49.jar](
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
) | [Connector/J Versions](
https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-versions.html ) |
| openGauss | [opengauss-jdbc-3.0.0.jar](
https://repo1.maven.org/maven2/org/opengauss/opengauss-jdbc/3.0.0/opengauss-jdbc-3.0.0.jar
) |
|
如果是异构迁移，源端支持范围更广的数据库。JDBC 驱动处理方式同上。
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
index 8bb3b46e8d4..6cbf89bd96d 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
@@ -43,7 +43,7 @@ If the backend is connected to the following databases,
download the correspondi
| Database | JDBC Driver
|
Reference
|
|-----------|---------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
-| MySQL | [mysql-connector-java-5.1.47.jar](
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
) | [Connector/J Versions](
https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-versions.html ) |
+| MySQL | [mysql-connector-java-5.1.49.jar](
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
) | [Connector/J Versions](
https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-versions.html ) |
| openGauss | [opengauss-jdbc-3.0.0.jar](
https://repo1.maven.org/maven2/org/opengauss/opengauss-jdbc/3.0.0/opengauss-jdbc-3.0.0.jar
) |
|
If you are migrating to a heterogeneous database, then you could use more
types of database. Introduce JDBC driver as above too.
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md
index 3fcb9ea9258..c71f92e1917 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md
@@ -34,7 +34,7 @@ ShardingSphere-Proxy 支持配置多个逻辑数据源，每个以 `config-` 前
如果后端连接 PostgreSQL 或 openGauss 数据库，不需要引入额外依赖。
-如果后端连接 MySQL 数据库，请下载
[mysql-connector-java-5.1.47.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)，并将其放入
`ext-lib` 目录。
+如果后端连接 MySQL 数据库，请下载
[mysql-connector-java-5.1.49.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar)
或者
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar)，并将其放入
`ext-lib` 目录。
5. （可选）引入集群模式所需依赖
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.en.md
index a0ba596c0c9..f9bbd68e495 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/bin.en.md
@@ -35,7 +35,7 @@ ShardingSphere-Proxy supports multiple logical data sources.
Each YAML configura
If the backend is connected to a PostgreSQL or openGauss database, no
additional dependencies need to be introduced.
-If the backend is connected to a MySQL database, please download
[mysql-connector-java-5.1.47.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar)
or
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar),
and put it into the `ext-lib` directory.
+If the backend is connected to a MySQL database, please download
[mysql-connector-java-5.1.49.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar)
or
[mysql-connector-java-8.0.11.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.11/mysql-connector-java-8.0.11.jar),
and put it into the `ext-lib` directory.
5. Introduce dependencies required by the cluster mode (Optional)
diff --git a/examples/pom.xml b/examples/pom.xml
index 2723f098e1d..f982bc51087 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -43,7 +43,7 @@
<spring-framework.version>5.2.15.RELEASE</spring-framework.version>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<hikari-cp.version>3.4.2</hikari-cp.version>
- <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
+ <mysql-connector-java.version>5.1.49</mysql-connector-java.version>
<postgresql.version>42.4.1</postgresql.version>
<h2.version>2.1.214</h2.version>
<slf4j.version>1.7.7</slf4j.version>
diff --git a/pom.xml b/pom.xml
index ea585e99971..4647d22af54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
<postgresql.version>42.4.1</postgresql.version>
<opengauss.version>3.1.0-og</opengauss.version>
- <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
+ <mysql-connector-java.version>5.1.49</mysql-connector-java.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
<h2.version>2.1.214</h2.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/resources/docker/proxy/Dockerfile
b/test/e2e/agent/plugins/logging/file/src/test/resources/docker/proxy/Dockerfile
index 0e34682b6e9..f1616f83ed1 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/resources/docker/proxy/Dockerfile
+++
b/test/e2e/agent/plugins/logging/file/src/test/resources/docker/proxy/Dockerfile
@@ -22,5 +22,5 @@ ENV WAIT_VERSION 2.7.2
ADD ${APP_NAME}.tar.gz /opt
ADD
https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait
/wait
-RUN chmod +x /wait && mv /opt/${APP_NAME} /opt/shardingsphere-proxy && wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
-P /opt/shardingsphere-proxy/lib
+RUN chmod +x /wait && mv /opt/${APP_NAME} /opt/shardingsphere-proxy && wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
-P /opt/shardingsphere-proxy/lib
ENTRYPOINT /wait && /opt/shardingsphere-proxy/bin/start.sh -g && tail -f
/opt/shardingsphere-proxy/logs/stdout.log
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/docker/proxy/Dockerfile
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/docker/proxy/Dockerfile
index 6ccdd7420bb..f7e91a48d9b 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/docker/proxy/Dockerfile
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/docker/proxy/Dockerfile
@@ -24,5 +24,5 @@ ADD ${APP_NAME}.tar.gz /opt
ADD
https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait
/wait
RUN chmod +x /wait
RUN mv /opt/${APP_NAME} /opt/shardingsphere-proxy
-RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
-P /opt/shardingsphere-proxy/lib
+RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
-P /opt/shardingsphere-proxy/lib
ENTRYPOINT /wait && /opt/shardingsphere-proxy/bin/start.sh -g && tail -f
/opt/shardingsphere-proxy/logs/stdout.log
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/docker/proxy/Dockerfile
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/docker/proxy/Dockerfile
index 6ccdd7420bb..f7e91a48d9b 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/docker/proxy/Dockerfile
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/docker/proxy/Dockerfile
@@ -24,5 +24,5 @@ ADD ${APP_NAME}.tar.gz /opt
ADD
https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait
/wait
RUN chmod +x /wait
RUN mv /opt/${APP_NAME} /opt/shardingsphere-proxy
-RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
-P /opt/shardingsphere-proxy/lib
+RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
-P /opt/shardingsphere-proxy/lib
ENTRYPOINT /wait && /opt/shardingsphere-proxy/bin/start.sh -g && tail -f
/opt/shardingsphere-proxy/logs/stdout.log
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/docker/proxy/Dockerfile
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/docker/proxy/Dockerfile
index 6ccdd7420bb..f7e91a48d9b 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/docker/proxy/Dockerfile
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/docker/proxy/Dockerfile
@@ -24,5 +24,5 @@ ADD ${APP_NAME}.tar.gz /opt
ADD
https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait
/wait
RUN chmod +x /wait
RUN mv /opt/${APP_NAME} /opt/shardingsphere-proxy
-RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar
-P /opt/shardingsphere-proxy/lib
+RUN wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.49/mysql-connector-java-5.1.49.jar
-P /opt/shardingsphere-proxy/lib
ENTRYPOINT /wait && /opt/shardingsphere-proxy/bin/start.sh -g && tail -f
/opt/shardingsphere-proxy/logs/stdout.log
