You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/03/16 16:54:47 UTC
[shardingsphere] branch master updated: Revise SQLServer dependency (#16139)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 056920d Revise SQLServer dependency (#16139)
056920d is described below
commit 056920d5348dde9529250b4e4fb45042e34fe887
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Mar 17 00:53:10 2022 +0800
Revise SQLServer dependency (#16139)
---
pom.xml | 2 +-
.../shardingsphere-database-datetime/pom.xml | 1 -
.../transaction/xa/jta/datasource/XADataSourceFactoryTest.java | 4 ++--
.../shardingsphere-integration-test-suite/pom.xml | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcaf110..ceb0dae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -505,7 +505,7 @@
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${mssql.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/pom.xml b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/pom.xml
index 2786a47..c81e49f 100644
--- a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/pom.xml
@@ -63,7 +63,6 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XADataSourceFactoryTest.java b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XADataSourceFacto [...]
index fec5273..d9be561 100644
--- a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XADataSourceFactoryTest.java
+++ b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XADataSourceFactoryTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.transaction.xa.jta.datasource;
-import com.microsoft.sqlserver.jdbc.SQLServerXADataSource;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.h2.jdbcx.JdbcDataSource;
@@ -31,6 +30,7 @@ import org.postgresql.xa.PGXADataSource;
import javax.sql.XADataSource;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@@ -62,6 +62,6 @@ public final class XADataSourceFactoryTest {
@Test
public void assertCreateMSXADataSource() {
XADataSource xaDataSource = XADataSourceFactory.build(DatabaseTypeRegistry.getActualDatabaseType("SQLServer"), dataSource);
- assertThat(xaDataSource, instanceOf(SQLServerXADataSource.class));
+ assertThat(xaDataSource.getClass().getName(), is("com.microsoft.sqlserver.jdbc.SQLServerXADataSource"));
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
index d058b65b..a844a2c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>