This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 0517b4af7 Remove useless dependencies (#2362)
0517b4af7 is described below
commit 0517b4af7428a632e418ec630ceaf9b89e2a546e
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Nov 1 21:38:19 2023 +0800
Remove useless dependencies (#2362)
* Remove commons-pool2
* Remove useless dependencies
---
.../usage/tracing/spring-namespace.cn.md | 4 ++--
.../usage/tracing/spring-namespace.en.md | 4 ++--
ecosystem/tracing/rdb/pom.xml | 5 -----
.../config/RDBTracingStorageConfigurationTest.java | 24 ++++++++--------------
.../listener/RDBTracingListenerFactoryTest.java | 7 +++----
.../rdb/listener/RDBTracingListenerTest.java | 10 ++++-----
.../repository/RDBJobEventRepositoryTest.java | 10 ++++-----
.../resources/META-INF/application-context.xml | 4 ++--
pom.xml | 13 ------------
spring/namespace/pom.xml | 5 -----
.../src/test/resources/META-INF/job/base.xml | 4 ++--
11 files changed, 29 insertions(+), 61 deletions(-)
diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.cn.md
b/docs/content/user-manual/usage/tracing/spring-namespace.cn.md
index bb5c497ef..c45b5008a 100644
--- a/docs/content/user-manual/usage/tracing/spring-namespace.cn.md
+++ b/docs/content/user-manual/usage/tracing/spring-namespace.cn.md
@@ -35,9 +35,9 @@ chapter = true
<bean id="myJob" class="xxx.MyJob" />
<!-- 配置数据源 -->
- <bean id="tracingDataSource"
class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+ <bean id="tracingDataSource" class="com.zaxxer.hikari.HikariDataSource"
destroy-method="close">
<property name="driverClassName" value="${driver.class.name}" />
- <property name="url" value="${url}" />
+ <property name="jdbcUrl" value="${url}" />
<property name="username" value="${username}" />
<property name="password" value="${password}" />
</bean>
diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.en.md
b/docs/content/user-manual/usage/tracing/spring-namespace.en.md
index d5f68f07f..c58c53193 100644
--- a/docs/content/user-manual/usage/tracing/spring-namespace.en.md
+++ b/docs/content/user-manual/usage/tracing/spring-namespace.en.md
@@ -33,9 +33,9 @@ chapter = true
<bean id="myJob" class="xxx.MyJob" />
<!-- Configure DataSource -->
- <bean id="tracingDataSource"
class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+ <bean id="tracingDataSource" class="com.zaxxer.hikari.HikariDataSource"
destroy-method="close">
<property name="driverClassName" value="${driver.class.name}" />
- <property name="url" value="${url}" />
+ <property name="jdbcUrl" value="${url}" />
<property name="username" value="${username}" />
<property name="password" value="${password}" />
</bean>
diff --git a/ecosystem/tracing/rdb/pom.xml b/ecosystem/tracing/rdb/pom.xml
index 1bf77c6f3..2dcc16378 100644
--- a/ecosystem/tracing/rdb/pom.xml
+++ b/ecosystem/tracing/rdb/pom.xml
@@ -40,11 +40,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
index 2ba5f8381..b733454f9 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
@@ -18,17 +18,13 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.config;
import com.zaxxer.hikari.HikariDataSource;
-import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.jupiter.api.Test;
+import javax.sql.DataSource;
import java.sql.SQLException;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -119,29 +115,25 @@ class RDBTracingStorageConfigurationTest {
targetDataSourceConfig.getProps().put("password", "root");
assertThat(originalDataSourceConfig.hashCode(),
not(targetDataSourceConfig.hashCode()));
originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
- targetDataSourceConfig = new
RDBTracingStorageConfiguration(BasicDataSource.class.getName());
+ targetDataSourceConfig = new
RDBTracingStorageConfiguration(DataSource.class.getName());
assertThat(originalDataSourceConfig.hashCode(),
not(targetDataSourceConfig.hashCode()));
}
- @SuppressWarnings("unchecked")
@Test
void assertGetDataSourceConfigurationWithConnectionInitSqls() {
- BasicDataSource actualDataSource = new BasicDataSource();
+ HikariDataSource actualDataSource = new HikariDataSource();
actualDataSource.setDriverClassName("org.h2.Driver");
-
actualDataSource.setUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
+
actualDataSource.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
- actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
+ actualDataSource.setConnectionInitSql("set names utf8mb4;set names
utf8;");
RDBTracingStorageConfiguration actual =
RDBTracingStorageConfiguration.getDataSourceConfiguration(actualDataSource);
- assertThat(actual.getDataSourceClassName(),
is(BasicDataSource.class.getName()));
+ assertThat(actual.getDataSourceClassName(),
is(HikariDataSource.class.getName()));
assertThat(actual.getProps().get("driverClassName").toString(),
is("org.h2.Driver"));
- assertThat(actual.getProps().get("url").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
+ assertThat(actual.getProps().get("jdbcUrl").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
assertThat(actual.getProps().get("username").toString(), is("root"));
assertThat(actual.getProps().get("password").toString(), is("root"));
assertNull(actual.getProps().get("loginTimeout"));
- assertThat(actual.getProps().get("connectionInitSqls"),
instanceOf(List.class));
- List<String> actualConnectionInitSql = (List<String>)
actual.getProps().get("connectionInitSqls");
- assertThat(actualConnectionInitSql, hasItem("set names utf8mb4;"));
- assertThat(actualConnectionInitSql, hasItem("set names utf8;"));
+ assertThat(actual.getProps().get("connectionInitSql"), is("set names
utf8mb4;set names utf8;"));
}
}
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java
index 78a146908..eaa8bac8a 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java
@@ -17,12 +17,11 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
-import org.apache.commons.dbcp2.BasicDataSource;
+import com.zaxxer.hikari.HikariDataSource;
import
org.apache.shardingsphere.elasticjob.spi.tracing.exception.TracingConfigurationException;
import org.junit.jupiter.api.Test;
import javax.sql.DataSource;
-
import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -35,9 +34,9 @@ class RDBTracingListenerFactoryTest {
@Test
void assertCreateTracingListenerSuccess() throws
TracingConfigurationException {
- BasicDataSource dataSource = new BasicDataSource();
+ HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(org.h2.Driver.class.getName());
- dataSource.setUrl("jdbc:h2:mem:job_event_storage");
+ dataSource.setJdbcUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
assertThat(new RDBTracingListenerFactory().create(dataSource),
instanceOf(RDBTracingListener.class));
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
index 1f146704b..a21fff4f4 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus;
+import com.zaxxer.hikari.HikariDataSource;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus;
+import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType;
import
org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent;
import
org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State;
@@ -50,9 +50,9 @@ class RDBTracingListenerTest {
@BeforeEach
void setUp() throws SQLException {
- BasicDataSource dataSource = new BasicDataSource();
+ HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(org.h2.Driver.class.getName());
- dataSource.setUrl("jdbc:h2:mem:job_event_storage");
+ dataSource.setJdbcUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
RDBTracingListener tracingListener = new
RDBTracingListener(dataSource);
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
index 9afa7b6f9..ee239ece6 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository;
-import org.apache.commons.dbcp2.BasicDataSource;
+import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType;
import
org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent;
@@ -39,20 +39,20 @@ class RDBJobEventRepositoryTest {
private RDBJobEventRepository repository;
- private BasicDataSource dataSource;
+ private HikariDataSource dataSource;
@BeforeEach
void setup() throws SQLException {
- dataSource = new BasicDataSource();
+ dataSource = new HikariDataSource();
dataSource.setDriverClassName(org.h2.Driver.class.getName());
- dataSource.setUrl("jdbc:h2:mem:job_event_storage");
+ dataSource.setJdbcUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
repository = RDBJobEventRepository.getInstance(dataSource);
}
@AfterEach
- void teardown() throws SQLException {
+ void tearDown() {
dataSource.close();
}
diff --git
a/examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
b/examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
index 4706d4fda..94acf6655 100644
---
a/examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
+++
b/examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
@@ -36,9 +36,9 @@
<elasticjob:snapshot id="jobSnapshot" registry-center-ref="regCenter"
dump-port="9999" />
- <bean id="elasticJobTracingDataSource"
class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+ <bean id="elasticJobTracingDataSource"
class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="${event.rdb.driver}" />
- <property name="url" value="${event.rdb.url}" />
+ <property name="jdbcUrl" value="${event.rdb.url}" />
<property name="username" value="${event.rdb.username}" />
<property name="password" value="${event.rdb.password}" />
</bean>
diff --git a/pom.xml b/pom.xml
index 8ef6e35f3..13f3c9057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,8 +91,6 @@
<h2.version>2.2.224</h2.version>
<hikari-cp.version>4.0.3</hikari-cp.version>
- <commons-dbcp2.version>2.10.0</commons-dbcp2.version>
- <commons-pool2.version>2.11.1</commons-pool2.version>
<!-- Compile plugin versions -->
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
@@ -359,17 +357,6 @@
<artifactId>HikariCP</artifactId>
<version>${hikari-cp.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/spring/namespace/pom.xml b/spring/namespace/pom.xml
index 48ba28d34..62d842f23 100644
--- a/spring/namespace/pom.xml
+++ b/spring/namespace/pom.xml
@@ -80,11 +80,6 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
diff --git a/spring/namespace/src/test/resources/META-INF/job/base.xml
b/spring/namespace/src/test/resources/META-INF/job/base.xml
index b2b83c450..9162e848b 100644
--- a/spring/namespace/src/test/resources/META-INF/job/base.xml
+++ b/spring/namespace/src/test/resources/META-INF/job/base.xml
@@ -32,9 +32,9 @@
<elasticjob:zookeeper id="regCenter"
server-lists="${regCenter.serverLists}" namespace="${regCenter.namespace}"
base-sleep-time-milliseconds="${regCenter.baseSleepTimeMilliseconds}"
max-sleep-time-milliseconds="${regCenter.maxSleepTimeMilliseconds}"
max-retries="${regCenter.maxRetries}" />
- <bean id="elasticJobTracingDataSource"
class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+ <bean id="elasticJobTracingDataSource"
class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
<property name="driverClassName" value="org.h2.Driver" />
- <property name="url" value="jdbc:h2:mem:job_event_storage" />
+ <property name="jdbcUrl" value="jdbc:h2:mem:job_event_storage" />
<property name="username" value="sa" />
<property name="password" value="" />
</bean>
