[shardingsphere] branch master updated: Change hikari scope from provided to test in infra-common module (#15911)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 8c7f4ec  Change hikari scope from provided to test in infra-common 
module (#15911)
8c7f4ec is described below

commit 8c7f4ec547df5c20bc25b32aeba1a74a2e26908e
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Mar 9 12:45:04 2022 +0800

    Change hikari scope from provided to test in infra-common module (#15911)
    
    * Change hikari scope from provided to test in infra-common module
    
    * Change hikari scope from provided to test in infra-common module
---
 shardingsphere-infra/shardingsphere-infra-common/pom.xml         | 9 ++++-----
 .../schema/impl/DataSourceGeneratedSchemaConfiguration.java      | 3 +--
 .../infra/autogen/version/ShardingSphereVersion.java             | 3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/shardingsphere-infra/shardingsphere-infra-common/pom.xml 
b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
index 8aeac9c..c4af4f2 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
@@ -60,6 +60,10 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-mysql-client</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>com.h2database</groupId>
@@ -69,16 +73,11 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-mysql-client</artifactId>
-        </dependency>
     </dependencies>
     
     <build>
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/schema/impl/DataSourceGeneratedSchemaConfiguration.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/schema/impl/DataSourceGeneratedSchemaConfiguration.java
index 802e2e0..c1805d4 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/schema/impl/DataSourceGeneratedSchemaConfiguration.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/schema/impl/DataSourceGeneratedSchemaConfiguration.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.infra.config.schema.impl;
 
-import com.zaxxer.hikari.HikariDataSource;
 import lombok.Getter;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;
 import org.apache.shardingsphere.infra.config.schema.SchemaConfiguration;
@@ -50,6 +49,6 @@ public final class DataSourceGeneratedSchemaConfiguration 
implements SchemaConfi
     
     private Map<String, DataSourceProperties> 
createDataSourcePropertiesMap(final Map<String, DataSourceConfiguration> 
dataSources) {
         return 
dataSources.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
-            entry -> 
DataSourcePropertiesCreator.create(HikariDataSource.class.getName(), 
entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
+            entry -> 
DataSourcePropertiesCreator.create("com.zaxxer.hikari.HikariDataSource", 
entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
     }
 }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/templates/org/apache/shardingsphere/infra/autogen/version/ShardingSphereVersion.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/templates/org/apache/shardingsphere/infra/autogen/version/ShardingSphereVersion.java
index 8ea772e..4d9e5c8 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/templates/org/apache/shardingsphere/infra/autogen/version/ShardingSphereVersion.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/templates/org/apache/shardingsphere/infra/autogen/version/ShardingSphereVersion.java
@@ -21,7 +21,8 @@ import java.io.IOException;
 import java.util.Properties;
 
 /**
- * Build info of ShardingSphere. Values prefixed with `BUILD` will be empty if 
building from source codes without .git directory.
+ * Build info of ShardingSphere. 
+ * Values prefixed with `BUILD` will be empty if building from source codes 
without .git directory.
  */
 public final class ShardingSphereVersion {