This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 3a7fb7105 Upgrade dependencies version (#2273)
3a7fb7105 is described below
commit 3a7fb7105fb17d25f0e9df6d0b49d53a8131a149
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Oct 13 18:39:36 2023 +0800
Upgrade dependencies version (#2273)
* Upgrade dependencies version
---
.../statistics/rdb/StatisticRdbRepository.java | 10 +++----
.../src/main/release-docs/LICENSE | 24 ++++++++--------
.../elasticjob/infra/yaml/YamlEngine.java | 5 +---
examples/pom.xml | 2 +-
pom.xml | 32 +++++++++++-----------
5 files changed, 35 insertions(+), 38 deletions(-)
diff --git
a/elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepository.java
b/elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepository.java
index c08c583c3..5b696181f 100755
---
a/elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepository.java
+++
b/elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepository.java
@@ -81,8 +81,8 @@ public class StatisticRdbRepository {
private void createTaskResultTable(final Connection conn, final
StatisticInterval statisticInterval) throws SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_TASK_RESULT_STATISTICS +
"_" + statisticInterval + "` ("
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
- + "`success_count` INT(11),"
- + "`failed_count` INT(11),"
+ + "`success_count` INT,"
+ + "`failed_count` INT,"
+ "`statistics_time` TIMESTAMP NOT NULL,"
+ "`creation_time` TIMESTAMP NOT NULL,"
+ "PRIMARY KEY (`id`));";
@@ -103,7 +103,7 @@ public class StatisticRdbRepository {
private void createTaskRunningTable(final Connection conn) throws
SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_TASK_RUNNING_STATISTICS +
"` ("
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
- + "`running_count` INT(11),"
+ + "`running_count` INT,"
+ "`statistics_time` TIMESTAMP NOT NULL,"
+ "`creation_time` TIMESTAMP NOT NULL,"
+ "PRIMARY KEY (`id`));";
@@ -124,7 +124,7 @@ public class StatisticRdbRepository {
private void createJobRunningTable(final Connection conn) throws
SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_JOB_RUNNING_STATISTICS + "`
("
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
- + "`running_count` INT(11),"
+ + "`running_count` INT,"
+ "`statistics_time` TIMESTAMP NOT NULL,"
+ "`creation_time` TIMESTAMP NOT NULL,"
+ "PRIMARY KEY (`id`));";
@@ -145,7 +145,7 @@ public class StatisticRdbRepository {
private void createJobRegisterTable(final Connection conn) throws
SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_JOB_REGISTER_STATISTICS +
"` ("
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
- + "`registered_count` INT(11),"
+ + "`registered_count` INT,"
+ "`statistics_time` TIMESTAMP NOT NULL,"
+ "`creation_time` TIMESTAMP NOT NULL,"
+ "PRIMARY KEY (`id`));";
diff --git
a/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs/LICENSE
b/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs/LICENSE
index a32daa018..c3bf5bae6 100644
---
a/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs/LICENSE
+++
b/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs/LICENSE
@@ -220,7 +220,7 @@ The text of each license is the standard Apache 2.0 license.
commons-dbcp2 2.11.1: https://github.com/apache/commons-dbcp, Apache 2.0
commons-exec 1.3: http://commons.apache.org/proper/commons-exec, Apache 2.0
commons-lang 2.6: https://github.com/apache/commons-lang, Apache 2.0
- commons-lang3 3.4: https://github.com/apache/commons-lang, Apache 2.0
+ commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0
commons-logging 1.2: https://github.com/apache/commons-logging, Apache 2.0
commons-pool2 2.8.1: https://github.com/apache/commons-pool, Apache 2.0
curator-client 5.5.0: https://github.com/apache/curator, Apache 2.0
@@ -230,7 +230,7 @@ The text of each license is the standard Apache 2.0 license.
failureaccess 1.0.1:https://github.com/google/guava, Apache 2.0
fenzo-core 1.0.1: https://github.com/Netflix/Fenzo, Apache 2.0
gson 2.10.1: https://github.com/google/gson, Apache 2.0
- guava 30.0-jre: https://github.com/google/guava, Apache 2.0
+ guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0
HikariCP-java7 2.4.13: https://github.com/brettwooldridge/HikariCP, Apache
2.0
httpclient 4.5.14: https://github.com/apache/httpcomponents-client, Apache
2.0
httpcore 4.4.16: https://github.com/apache/httpcomponents-core, Apache 2.0
@@ -241,17 +241,17 @@ The text of each license is the standard Apache 2.0
license.
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
log4j-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0
mesos 1.11.0: http://mesos.apache.org/, Apache 2.0
- netty-buffer 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-codec 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-codec-http 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-common 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-handler 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-resolver 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-transport 4.1.97.Final: https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.97.Final: https://github.com/netty,
Apache 2.0
- netty-transport-native-unix-common 4.1.97.Final: https://github.com/netty,
Apache 2.0
+ netty-buffer 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.99.Final: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.99.Final: https://github.com/netty,
Apache 2.0
+ netty-transport-native-unix-common 4.1.99.Final: https://github.com/netty,
Apache 2.0
quartz 2.3.2: https://github.com/quartz-scheduler/quartz, Apache 2.0
- snakeyaml 2.0: https://bitbucket.org/snakeyaml/snakeyaml/src, Apache 2.0
+ snakeyaml 2.2: https://bitbucket.org/snakeyaml/snakeyaml/src, Apache 2.0
zookeeper 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
zookeeper-jute 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
diff --git
a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
index 8bfc91791..f5760d8c2 100644
---
a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
+++
b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
@@ -23,9 +23,6 @@ import
org.apache.shardingsphere.elasticjob.infra.yaml.representer.ElasticJobYam
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
-
-import java.util.Collections;
/**
* YAML engine.
@@ -53,7 +50,7 @@ public final class YamlEngine {
*/
public static <T> T unmarshal(final String yamlContent, final Class<T>
classType) {
LoaderOptions loaderOptions = new LoaderOptions();
- loaderOptions.setTagInspector(new
TrustedPrefixesTagInspector(Collections.singletonList("org.apache.shardingsphere.elasticjob")));
+ loaderOptions.setTagInspector(tagInspector ->
tagInspector.getClassName().startsWith("org.apache.shardingsphere.elasticjob"));
return new Yaml(loaderOptions).loadAs(yamlContent, classType);
}
}
diff --git a/examples/pom.xml b/examples/pom.xml
index f29315490..da24a0c1d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -45,7 +45,7 @@
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.2.0</logback.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
- <h2.version>1.4.184</h2.version>
+ <h2.version>2.2.224</h2.version>
<mysql.version>8.0.28</mysql.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
diff --git a/pom.xml b/pom.xml
index 9bf61bc11..e85f5b5cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locale>zh_CN</project.build.locale>
- <guava.version>30.0-jre</guava.version>
- <commons-lang3.version>3.4</commons-lang3.version>
+ <guava.version>32.1.2-jre</guava.version>
+ <commons-lang3.version>3.12.0</commons-lang3.version>
<quartz.version>2.3.2</quartz.version>
<zookeeper.version>3.9.0</zookeeper.version>
<curator.version>5.5.0</curator.version>
@@ -59,19 +59,19 @@
<commons-exec.version>1.3</commons-exec.version>
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
- <snakeyaml.version>2.0</snakeyaml.version>
+ <snakeyaml.version>2.2</snakeyaml.version>
<gson.version>2.10.1</gson.version>
- <netty.version>4.1.97.Final</netty.version>
+ <netty.version>4.1.99.Final</netty.version>
<mesos.version>1.11.0</mesos.version>
<fenzo.version>1.0.1</fenzo.version>
<commons-dbcp2.version>2.10.0</commons-dbcp2.version>
<commons-pool2.version>2.11.1</commons-pool2.version>
- <hikaricp.version>3.4.2</hikaricp.version>
+ <hikari-cp.version>4.0.3</hikari-cp.version>
<mail.version>1.6.0</mail.version>
<mysql-connector-java.version>8.0.16</mysql-connector-java.version>
- <h2.version>1.4.184</h2.version>
+ <h2.version>2.2.224</h2.version>
<junit.version>5.10.0</junit.version>
<hamcrest.version>2.2</hamcrest.version>
<bytebuddy.version>1.14.8</bytebuddy.version>
@@ -79,28 +79,28 @@
<awaitility.version>4.2.0</awaitility.version>
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
- <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
- <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
+ <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+ <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>2.18.1</maven-surefire-report-plugin.version>
- <maven-site-plugin.version>3.4</maven-site-plugin.version>
+ <maven-site-plugin.version>4.0.0-M6</maven-site-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-plugin-plugin.version>3.4</maven-plugin-plugin.version>
- <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
-
<maven-project-info-reports-plugin.version>2.8</maven-project-info-reports-plugin.version>
- <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
+ <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
+
<maven-project-info-reports-plugin.version>3.4.2</maven-project-info-reports-plugin.version>
+ <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
- <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
+ <maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
- <maven-pmd-plugin.version>3.5</maven-pmd-plugin.version>
+ <maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
<jdepend-maven-plugin.version>2.0</jdepend-maven-plugin.version>
<taglist-maven-plugin.version>2.4</taglist-maven-plugin.version>
- <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+ <maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
</properties>
@@ -253,7 +253,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>${hikaricp.version}</version>
+ <version>${hikari-cp.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
