Skip to content

Commit 3a7fb71

Browse files
terrymanuterrymanu
authored
Upgrade dependencies version (#2273)
* Upgrade dependencies version
1 parent 16dd2fc commit 3a7fb71

File tree

5 files changed

+35
-38
lines changed
  • elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb
  • elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs
  • elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml
  • examples
  • pom.xml

5 files changed

+35
-38
lines changed

‎elasticjob-cloud/elasticjob-cloud-common/src/main/java/org/apache/shardingsphere/elasticjob/cloud/statistics/rdb/StatisticRdbRepository.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ private void createTaskResultTableIfNeeded(final Connection conn) throws SQLExce
8181
private void createTaskResultTable(final Connection conn, final StatisticInterval statisticInterval) throws SQLException {
8282
String dbSchema = "CREATE TABLE `" + TABLE_TASK_RESULT_STATISTICS + "_" + statisticInterval + "` ("
8383
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
84-
+ "`success_count` INT(11),"
85-
+ "`failed_count` INT(11),"
84+
+ "`success_count` INT,"
85+
+ "`failed_count` INT,"
8686
+ "`statistics_time` TIMESTAMP NOT NULL,"
8787
+ "`creation_time` TIMESTAMP NOT NULL,"
8888
+ "PRIMARY KEY (`id`));";
@@ -103,7 +103,7 @@ private void createTaskRunningTableIfNeeded(final Connection conn) throws SQLExc
103103
private void createTaskRunningTable(final Connection conn) throws SQLException {
104104
String dbSchema = "CREATE TABLE `" + TABLE_TASK_RUNNING_STATISTICS + "` ("
105105
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
106-
+ "`running_count` INT(11),"
106+
+ "`running_count` INT,"
107107
+ "`statistics_time` TIMESTAMP NOT NULL,"
108108
+ "`creation_time` TIMESTAMP NOT NULL,"
109109
+ "PRIMARY KEY (`id`));";
@@ -124,7 +124,7 @@ private void createJobRunningTableIfNeeded(final Connection conn) throws SQLExce
124124
private void createJobRunningTable(final Connection conn) throws SQLException {
125125
String dbSchema = "CREATE TABLE `" + TABLE_JOB_RUNNING_STATISTICS + "` ("
126126
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
127-
+ "`running_count` INT(11),"
127+
+ "`running_count` INT,"
128128
+ "`statistics_time` TIMESTAMP NOT NULL,"
129129
+ "`creation_time` TIMESTAMP NOT NULL,"
130130
+ "PRIMARY KEY (`id`));";
@@ -145,7 +145,7 @@ private void createJobRegisterTableIfNeeded(final Connection conn) throws SQLExc
145145
private void createJobRegisterTable(final Connection conn) throws SQLException {
146146
String dbSchema = "CREATE TABLE `" + TABLE_JOB_REGISTER_STATISTICS + "` ("
147147
+ "`id` BIGINT NOT NULL AUTO_INCREMENT, "
148-
+ "`registered_count` INT(11),"
148+
+ "`registered_count` INT,"
149149
+ "`statistics_time` TIMESTAMP NOT NULL,"
150150
+ "`creation_time` TIMESTAMP NOT NULL,"
151151
+ "PRIMARY KEY (`id`));";

‎elasticjob-distribution/elasticjob-cloud-scheduler-distribution/src/main/release-docs/LICENSE

+12-12
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ The text of each license is the standard Apache 2.0 license.
220220
commons-dbcp2 2.11.1: https://github.com/apache/commons-dbcp, Apache 2.0
221221
commons-exec 1.3: http://commons.apache.org/proper/commons-exec, Apache 2.0
222222
commons-lang 2.6: https://github.com/apache/commons-lang, Apache 2.0
223-
commons-lang3 3.4: https://github.com/apache/commons-lang, Apache 2.0
223+
commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0
224224
commons-logging 1.2: https://github.com/apache/commons-logging, Apache 2.0
225225
commons-pool2 2.8.1: https://github.com/apache/commons-pool, Apache 2.0
226226
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.
230230
failureaccess 1.0.1:https://github.com/google/guava, Apache 2.0
231231
fenzo-core 1.0.1: https://github.com/Netflix/Fenzo, Apache 2.0
232232
gson 2.10.1: https://github.com/google/gson, Apache 2.0
233-
guava 30.0-jre: https://github.com/google/guava, Apache 2.0
233+
guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0
234234
HikariCP-java7 2.4.13: https://github.com/brettwooldridge/HikariCP, Apache 2.0
235235
httpclient 4.5.14: https://github.com/apache/httpcomponents-client, Apache 2.0
236236
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.
241241
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
242242
log4j-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0
243243
mesos 1.11.0: http://mesos.apache.org/, Apache 2.0
244-
netty-buffer 4.1.97.Final: https://github.com/netty, Apache 2.0
245-
netty-codec 4.1.97.Final: https://github.com/netty, Apache 2.0
246-
netty-codec-http 4.1.97.Final: https://github.com/netty, Apache 2.0
247-
netty-common 4.1.97.Final: https://github.com/netty, Apache 2.0
248-
netty-handler 4.1.97.Final: https://github.com/netty, Apache 2.0
249-
netty-resolver 4.1.97.Final: https://github.com/netty, Apache 2.0
250-
netty-transport 4.1.97.Final: https://github.com/netty, Apache 2.0
251-
netty-transport-native-epoll 4.1.97.Final: https://github.com/netty, Apache 2.0
252-
netty-transport-native-unix-common 4.1.97.Final: https://github.com/netty, Apache 2.0
244+
netty-buffer 4.1.99.Final: https://github.com/netty, Apache 2.0
245+
netty-codec 4.1.99.Final: https://github.com/netty, Apache 2.0
246+
netty-codec-http 4.1.99.Final: https://github.com/netty, Apache 2.0
247+
netty-common 4.1.99.Final: https://github.com/netty, Apache 2.0
248+
netty-handler 4.1.99.Final: https://github.com/netty, Apache 2.0
249+
netty-resolver 4.1.99.Final: https://github.com/netty, Apache 2.0
250+
netty-transport 4.1.99.Final: https://github.com/netty, Apache 2.0
251+
netty-transport-native-epoll 4.1.99.Final: https://github.com/netty, Apache 2.0
252+
netty-transport-native-unix-common 4.1.99.Final: https://github.com/netty, Apache 2.0
253253
quartz 2.3.2: https://github.com/quartz-scheduler/quartz, Apache 2.0
254-
snakeyaml 2.0: https://bitbucket.org/snakeyaml/snakeyaml/src, Apache 2.0
254+
snakeyaml 2.2: https://bitbucket.org/snakeyaml/snakeyaml/src, Apache 2.0
255255
zookeeper 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
256256
zookeeper-jute 3.9.0: https://github.com/apache/zookeeper, Apache 2.0
257257

‎elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import org.yaml.snakeyaml.DumperOptions;
2424
import org.yaml.snakeyaml.LoaderOptions;
2525
import org.yaml.snakeyaml.Yaml;
26-
import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
27-
28-
import java.util.Collections;
2926

3027
/**
3128
* YAML engine.
@@ -53,7 +50,7 @@ public static String marshal(final Object value) {
5350
*/
5451
public static <T> T unmarshal(final String yamlContent, final Class<T> classType) {
5552
LoaderOptions loaderOptions = new LoaderOptions();
56-
loaderOptions.setTagInspector(new TrustedPrefixesTagInspector(Collections.singletonList("org.apache.shardingsphere.elasticjob")));
53+
loaderOptions.setTagInspector(tagInspector -> tagInspector.getClassName().startsWith("org.apache.shardingsphere.elasticjob"));
5754
return new Yaml(loaderOptions).loadAs(yamlContent, classType);
5855
}
5956
}

‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<slf4j.version>1.7.7</slf4j.version>
4646
<logback.version>1.2.0</logback.version>
4747
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
48-
<h2.version>1.4.184</h2.version>
48+
<h2.version>2.2.224</h2.version>
4949
<mysql.version>8.0.28</mysql.version>
5050
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
5151
<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>

‎pom.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4747
<project.build.locale>zh_CN</project.build.locale>
4848

49-
<guava.version>30.0-jre</guava.version>
50-
<commons-lang3.version>3.4</commons-lang3.version>
49+
<guava.version>32.1.2-jre</guava.version>
50+
<commons-lang3.version>3.12.0</commons-lang3.version>
5151
<quartz.version>2.3.2</quartz.version>
5252
<zookeeper.version>3.9.0</zookeeper.version>
5353
<curator.version>5.5.0</curator.version>
@@ -59,48 +59,48 @@
5959
<commons-exec.version>1.3</commons-exec.version>
6060
<httpclient.version>4.5.14</httpclient.version>
6161
<httpcore.version>4.4.16</httpcore.version>
62-
<snakeyaml.version>2.0</snakeyaml.version>
62+
<snakeyaml.version>2.2</snakeyaml.version>
6363
<gson.version>2.10.1</gson.version>
64-
<netty.version>4.1.97.Final</netty.version>
64+
<netty.version>4.1.99.Final</netty.version>
6565
<mesos.version>1.11.0</mesos.version>
6666
<fenzo.version>1.0.1</fenzo.version>
6767

6868
<commons-dbcp2.version>2.10.0</commons-dbcp2.version>
6969
<commons-pool2.version>2.11.1</commons-pool2.version>
70-
<hikaricp.version>3.4.2</hikaricp.version>
70+
<hikari-cp.version>4.0.3</hikari-cp.version>
7171
<mail.version>1.6.0</mail.version>
7272

7373
<mysql-connector-java.version>8.0.16</mysql-connector-java.version>
74-
<h2.version>1.4.184</h2.version>
74+
<h2.version>2.2.224</h2.version>
7575
<junit.version>5.10.0</junit.version>
7676
<hamcrest.version>2.2</hamcrest.version>
7777
<bytebuddy.version>1.14.8</bytebuddy.version>
7878
<mockito.version>4.11.0</mockito.version>
7979
<awaitility.version>4.2.0</awaitility.version>
8080

8181
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
82-
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
83-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
82+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
83+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
8484
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
8585
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
8686
<maven-surefire-report-plugin.version>2.18.1</maven-surefire-report-plugin.version>
87-
<maven-site-plugin.version>3.4</maven-site-plugin.version>
87+
<maven-site-plugin.version>4.0.0-M6</maven-site-plugin.version>
8888
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
8989
<maven-plugin-plugin.version>3.4</maven-plugin-plugin.version>
90-
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
91-
<maven-project-info-reports-plugin.version>2.8</maven-project-info-reports-plugin.version>
92-
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
90+
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
91+
<maven-project-info-reports-plugin.version>3.4.2</maven-project-info-reports-plugin.version>
92+
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
9393
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
94-
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
94+
<maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
9595
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
9696
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
9797
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
9898
<findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
9999
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
100-
<maven-pmd-plugin.version>3.5</maven-pmd-plugin.version>
100+
<maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
101101
<jdepend-maven-plugin.version>2.0</jdepend-maven-plugin.version>
102102
<taglist-maven-plugin.version>2.4</taglist-maven-plugin.version>
103-
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
103+
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
104104
<checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
105105
</properties>
106106

@@ -253,7 +253,7 @@
253253
<dependency>
254254
<groupId>com.zaxxer</groupId>
255255
<artifactId>HikariCP</artifactId>
256-
<version>${hikaricp.version}</version>
256+
<version>${hikari-cp.version}</version>
257257
</dependency>
258258
<dependency>
259259
<groupId>com.sun.mail</groupId>

0 commit comments

Comments
 (0)