From 3a7fb7105fb17d25f0e9df6d0b49d53a8131a149 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Fri, 13 Oct 2023 18:39:36 +0800 Subject: [PATCH] Upgrade dependencies version (#2273) * Upgrade dependencies version --- .../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 c08c583c35..5b696181f9 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 @@ private void createTaskResultTableIfNeeded(final Connection conn) throws SQLExce 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 @@ private void createTaskRunningTableIfNeeded(final Connection conn) throws SQLExc 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 @@ private void createJobRunningTableIfNeeded(final Connection conn) throws SQLExce 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 @@ private void createJobRegisterTableIfNeeded(final Connection conn) throws SQLExc 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 a32daa0182..c3bf5bae68 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 8bfc91791f..f5760d8c22 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.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 static String marshal(final Object value) { */ public static T unmarshal(final String yamlContent, final Class 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 f29315490c..da24a0c1d5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -45,7 +45,7 @@ 1.7.7 1.2.0 2.9.0 - 1.4.184 + 2.2.224 8.0.28 3.3 1.2.5 diff --git a/pom.xml b/pom.xml index 9bf61bc11d..e85f5b5ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ UTF-8 zh_CN - 30.0-jre - 3.4 + 32.1.2-jre + 3.12.0 2.3.2 3.9.0 5.5.0 @@ -59,19 +59,19 @@ 1.3 4.5.14 4.4.16 - 2.0 + 2.2 2.10.1 - 4.1.97.Final + 4.1.99.Final 1.11.0 1.0.1 2.10.0 2.11.1 - 3.4.2 + 4.0.3 1.6.0 8.0.16 - 1.4.184 + 2.2.224 5.10.0 2.2 1.14.8 @@ -79,28 +79,28 @@ 4.2.0 0.15 - 3.8.0 - 2.7 + 3.11.0 + 3.3.1 3.3.0 3.1.2 2.18.1 - 3.4 + 4.0.0-M6 1.0.0 3.4 - 3.1.0 - 2.8 - 3.3.0 + 3.2.1 + 3.4.2 + 3.5.0 3.2.1 - 2.5 + 3.3.0 4.3.0 2.7 0.8.10 3.0.2 3.1.0 - 3.5 + 3.20.0 2.0 2.4 - 3.1.0 + 3.5.0 1.10 @@ -253,7 +253,7 @@ com.zaxxer HikariCP - ${hikaricp.version} + ${hikari-cp.version} com.sun.mail