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 718862a Upgrade hikari 11249 (#11262)
718862a is described below
commit 718862abd27bda69954987357203acb28bd20f60
Author: Dachuan J <[email protected]>
AuthorDate: Tue Jul 13 09:59:43 2021 +0800
Upgrade hikari 11249 (#11262)
* remove the HikariCP-java7, only use HikariCP for scaling and
proxy.(#11249)
* upgrade hikariCP in example.(#11249)
* fix missing HikariCP.jar when creating test docker images after upgrade
HikariCP(#11249)
* solve the sealed exception for upgrading Hikari from java7
---
examples/pom.xml | 4 ++--
.../shardingsphere-db-discovery-mgr/pom.xml | 6 ++++++
.../datasource/decorator/HikariJDBCParameterDecorator.java | 2 +-
shardingsphere-scaling/shardingsphere-scaling-core/pom.xml | 12 ++++++++++++
.../shardingsphere-scaling-mysql/pom.xml | 6 +++++-
.../shardingsphere-scaling-postgresql/pom.xml | 6 +++++-
.../shardingsphere-integration-agent-test-metrics/pom.xml | 6 ++++++
.../shardingsphere-integration-test-fixture/pom.xml | 6 ++++++
8 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index bd9aa47..3c9b074 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -46,7 +46,7 @@
<aspectjweaver.version>1.8.9</aspectjweaver.version>
<spring-framework.version>5.0.13.RELEASE</spring-framework.version>
<spring-boot.version>2.0.9.RELEASE</spring-boot.version>
- <hikari-cp.version>2.4.11</hikari-cp.version>
+ <hikari-cp.version>3.4.2</hikari-cp.version>
<mysql-connector-java.version>5.1.42</mysql-connector-java.version>
<postgresql.version>42.2.5.jre7</postgresql.version>
<h2.version>1.4.196</h2.version>
@@ -296,7 +296,7 @@
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
- <artifactId>HikariCP-java7</artifactId>
+ <artifactId>HikariCP</artifactId>
<version>${hikari-cp.version}</version>
</dependency>
<dependency>
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mgr/pom.xml
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mgr/pom.xml
index 36776a1..7d766b8 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mgr/pom.xml
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mgr/pom.xml
@@ -38,6 +38,12 @@
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-core</artifactId>
<version>${elasticjob.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecorator.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecorator.java
index 6c51081..93f46d9 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecorator.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/decorator/HikariJDBCParameterDecorator.java
@@ -54,7 +54,7 @@ public final class HikariJDBCParameterDecorator implements
JDBCParameterDecorato
private void addJDBCProperty(final HikariConfig config, final Map<String,
String> urlProps, final String key, final String value) {
if (urlProps.isEmpty() || !urlProps.containsKey(key)) {
- config.addDataSourceProperty(key, value);
+ config.getDataSourceProperties().setProperty(key, value);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
b/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
index 0504406..4b2718b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
@@ -63,6 +63,12 @@
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-core</artifactId>
<version>${elasticjob.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
@@ -73,6 +79,12 @@
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-lifecycle</artifactId>
<version>${elasticjob.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
index 1bca027..2135ee2 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
@@ -44,7 +44,11 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/pom.xml
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/pom.xml
index a5c7f56..4d9bd5e 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/pom.xml
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/pom.xml
@@ -34,7 +34,11 @@
<artifactId>shardingsphere-scaling-core</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
index 54502ec..643ef2f 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
@@ -64,6 +64,12 @@
<artifactId>commons-dbcp2</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>${hikari-cp.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
index 4fdd7af..8341695 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
@@ -96,6 +96,12 @@
<artifactId>commons-dbcp2</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>${hikari-cp.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<profiles>
