This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 7a5f020cd Resolve dependencies conflicts (#2353)
7a5f020cd is described below
commit 7a5f020cd941dae62f7c5b1433626f3404a8e26f
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 31 18:42:24 2023 +0800
Resolve dependencies conflicts (#2353)
* Resolve dependencies conflicts
* Resolve dependencies conflicts
* Revise javadoc
---
.../dataflow/props/DataflowJobProperties.java | 2 +-
examples/pom.xml | 14 +++++++----
pom.xml | 27 +++++++++++++++++++---
3 files changed, 34 insertions(+), 9 deletions(-)
diff --git
a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
index 9da5aaefe..ecca12688 100644
---
a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
+++
b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
@@ -23,7 +23,7 @@ package org.apache.shardingsphere.elasticjob.dataflow.props;
public final class DataflowJobProperties {
/**
- * Whether use stream mode to process dataflow job.
+ * Whether to use stream mode to process dataflow job.
*/
public static final String STREAM_PROCESS_KEY = "streaming.process";
}
diff --git a/examples/pom.xml b/examples/pom.xml
index b78cec61f..202e49640 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -38,13 +38,17 @@
<properties>
<revision>3.1.0-SNAPSHOT</revision>
<java.version>1.8</java.version>
+
<curator.version>5.1.0</curator.version>
<springframework.version>4.3.4.RELEASE</springframework.version>
- <slf4j.version>1.7.7</slf4j.version>
- <logback.version>1.2.0</logback.version>
- <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
+
+ <slf4j.version>1.7.36</slf4j.version>
+ <logback.version>1.2.12</logback.version>
+
+ <commons-dbcp2.version>2.10.0</commons-dbcp2.version>
<h2.version>2.2.224</h2.version>
- <mysql.version>8.0.28</mysql.version>
+ <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
</properties>
@@ -110,7 +114,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
+ <version>${mysql-connector-java}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index df518fb76..e7d3339cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,12 @@
<!-- 3rd party library versions -->
<shardingsphere.version>5.4.1</shardingsphere.version>
+
<guava.version>32.1.2-jre</guava.version>
+ <checker-qual.version>3.39.0</checker-qual.version>
+
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
+ <j2objc-annotations.version>1.3</j2objc-annotations.version>
+
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-exec.version>1.3</commons-exec.version>
@@ -82,7 +87,7 @@
<lombok.version>1.18.30</lombok.version>
- <mysql-connector-java.version>8.0.16</mysql-connector-java.version>
+ <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<h2.version>2.2.224</h2.version>
<junit.version>5.10.0</junit.version>
@@ -140,11 +145,27 @@
<version>${guava.version}</version>
<exclusions>
<exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checker-qual.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
