Update ElasticJob version to 3.0.0-RC1 (#86)
* Update ElasticJob version to 3.0.0-RC1
* Update commons-dbcp to commons-dbcp2
diff --git a/pom.xml b/pom.xml
index 018476a..edd434a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<properties>
<revision>3.0.0-RC1-SNAPSHOT</revision>
+ <elasticjob.version>3.0.0-RC1</elasticjob.version>
<java.version>1.8</java.version>
<springframework.version>4.3.24.RELEASE</springframework.version>
<spring-boot.version>1.5.21.RELEASE</spring-boot.version>
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
index 0584244..55a7cab 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-cloud-common</artifactId>
- <version>3.0.0-beta</version>
+ <version>${elasticjob.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/BeanConfiguration.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/BeanConfiguration.java
index 95e7571..0007138 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/BeanConfiguration.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/BeanConfiguration.java
@@ -49,13 +49,13 @@
@Bean
public StatisticRdbRepository rdbRepository() {
- Optional<TracingConfiguration> tracingConfiguration = traceConfiguration.getTracingConfiguration();
- return tracingConfiguration.map(each -> new StatisticRdbRepository((DataSource) each.getStorage(), true)).orElse(new StatisticRdbRepository(null, false));
+ Optional<TracingConfiguration<DataSource>> tracingConfiguration = traceConfiguration.getTracingConfiguration();
+ return tracingConfiguration.map(each -> new StatisticRdbRepository(each.getTracingStorageConfiguration().getStorage(), true)).orElse(new StatisticRdbRepository(null, false));
}
@Bean
public JobEventRdbSearch jobEventRdbSearch() {
- Optional<TracingConfiguration> tracingConfiguration = traceConfiguration.getTracingConfiguration();
- return tracingConfiguration.map(each -> new JobEventRdbSearch((DataSource) each.getStorage(), true)).orElse(new JobEventRdbSearch(null, false));
+ Optional<TracingConfiguration<DataSource>> tracingConfiguration = traceConfiguration.getTracingConfiguration();
+ return tracingConfiguration.map(each -> new JobEventRdbSearch(each.getTracingStorageConfiguration().getStorage(), true)).orElse(new JobEventRdbSearch(null, false));
}
}
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/EventTraceConfiguration.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/EventTraceConfiguration.java
index c0aabe2..a464b3d 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/EventTraceConfiguration.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/EventTraceConfiguration.java
@@ -19,7 +19,7 @@
import com.google.common.base.Strings;
import lombok.Setter;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -40,15 +40,14 @@
private String rdbPassword;
- public Optional<TracingConfiguration> getTracingConfiguration() {
-
+ public Optional<TracingConfiguration<DataSource>> getTracingConfiguration() {
if (!Strings.isNullOrEmpty(rdbDriver) && !Strings.isNullOrEmpty(rdbUrl) && !Strings.isNullOrEmpty(rdbUsername)) {
BasicDataSource dataSource = new BasicDataSource();
dataSource.setDriverClassName(rdbDriver);
dataSource.setUrl(rdbUrl);
dataSource.setUsername(rdbUsername);
dataSource.setPassword(rdbPassword);
- return Optional.of(new TracingConfiguration<DataSource>("RDB", dataSource));
+ return Optional.of(new TracingConfiguration<>("RDB", dataSource));
}
return Optional.empty();
}
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
index 12d7eee..cb61fc9 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-lite-lifecycle</artifactId>
- <version>3.0.0-beta</version>
+ <version>${elasticjob.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/DynamicDataSourceConfig.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/DynamicDataSourceConfig.java
index e4d89a9..fe718de 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/DynamicDataSourceConfig.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/DynamicDataSourceConfig.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.lite.ui.config;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/DataSourceFactory.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/DataSourceFactory.java
index 725b7ed..ee57943 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/DataSourceFactory.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/DataSourceFactory.java
@@ -19,7 +19,7 @@
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import javax.sql.DataSource;
