You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/29 08:19:12 UTC
[shardingsphere-elasticjob-lite] branch master updated: update some
version (#864)
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-lite.git
The following commit(s) were added to refs/heads/master by this push:
new dce5e80 update some version (#864)
dce5e80 is described below
commit dce5e801e20662614fbbc8a6ca81fbc6228baf8a
Author: Mark-WJQ <37...@qq.com>
AuthorDate: Mon Jun 29 16:18:01 2020 +0800
update some version (#864)
* updae some version
* Update pom.xml
* version
Co-authored-by: wangjianqiang24 <wa...@jd.com>
---
elastic-job-lite-spring/pom.xml | 6 ++++++
examples/elastic-job-example-lite-springboot/pom.xml | 4 ++--
examples/pom.xml | 2 +-
pom.xml | 20 ++++++++++++++------
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/elastic-job-lite-spring/pom.xml b/elastic-job-lite-spring/pom.xml
index 2d3d081..7d27993 100644
--- a/elastic-job-lite-spring/pom.xml
+++ b/elastic-job-lite-spring/pom.xml
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-context</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/examples/elastic-job-example-lite-springboot/pom.xml b/examples/elastic-job-example-lite-springboot/pom.xml
index 4452426..68970ab 100644
--- a/examples/elastic-job-example-lite-springboot/pom.xml
+++ b/examples/elastic-job-example-lite-springboot/pom.xml
@@ -13,9 +13,9 @@
<name>${project.artifactId}</name>
<properties>
- <springboot.version>1.4.2.RELEASE</springboot.version>
+ <springboot.version>2.3.1.RELEASE</springboot.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index e32a5dc..ba62ba5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
</modules>
<properties>
- <java.version>1.7</java.version>
+ <java.version>1.8</java.version>
<elastic-job.version>3.0.0.M1-SNAPSHOT</elastic-job.version>
<curator.version>2.10.0</curator.version>
<springframework.version>4.3.4.RELEASE</springframework.version>
diff --git a/pom.xml b/pom.xml
index 838b547..cecd690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,17 +43,17 @@
<maven.version.range>[3.0.4,)</maven.version.range>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locale>zh_CN</project.build.locale>
-
- <springframework.version>[3.1.0.RELEASE,5.0.0.M1)</springframework.version>
-
+
+ <springframework.version>[3.1.0.RELEASE,)</springframework.version>
+ <springboot.version>2.3.1.RELEASE</springboot.version>
<guava.version>18.0</guava.version>
<commons-lang3.version>3.4</commons-lang3.version>
<quartz.version>2.3.0</quartz.version>
<curator.version>2.10.0</curator.version>
- <lombok.version>1.16.4</lombok.version>
- <aspectj.version>1.8.0</aspectj.version>
+ <lombok.version>1.18.12</lombok.version>
+ <aspectj.version>1.9.1</aspectj.version>
<slf4j.version>1.7.7</slf4j.version>
- <logback.version>1.1.2</logback.version>
+ <logback.version>1.2.3</logback.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-exec.version>1.3</commons-exec.version>
<snakeyaml.version>1.26</snakeyaml.version>
@@ -94,6 +94,14 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <!-- Import dependency management from Spring Boot -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${springboot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>