#754 升级spring和springboot版本

vipshop · Jul 13, 2021 · 8d360ea · 8d360ea
1 parent bc865cd
commit 8d360ea
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/examples/saturn-demo-spring/pom.xml b/examples/saturn-demo-spring/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <saturn.version>master-SNAPSHOT</saturn.version>
-        <spring.version>4.0.6.RELEASE</spring.version>
+        <spring.version>5.3.8</spring.version>
         <jcl-over-slf4j.version>1.7.21</jcl-over-slf4j.version>
         <logback.version>1.1.7</logback.version>
     </properties>

diff --git a/examples/saturn-demo-springboot/pom.xml b/examples/saturn-demo-springboot/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.16.RELEASE</version>
+        <version>2.5.2</version>
     </parent>
 
     <properties>

diff --git a/saturn-spring/pom.xml b/saturn-spring/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>saturn-spring</artifactId>
 
     <properties>
-        <spring.version>4.0.6.RELEASE</spring.version>
+        <spring.version>5.3.8</spring.version>
     </properties>
 
     <dependencies>

diff --git a/saturn-springboot/pom.xml b/saturn-springboot/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>saturn-springboot</artifactId>
 
     <properties>
-        <springboot.version>1.5.16.RELEASE</springboot.version>
+        <springboot.version>2.5.2</springboot.version>
     </properties>
 
     <dependencies>

diff --git a/...gboot/src/main/java/com/vip/saturn/job/springboot/GenericSpringBootSaturnApplication.java b/...gboot/src/main/java/com/vip/saturn/job/springboot/GenericSpringBootSaturnApplication.java
@@ -53,7 +53,7 @@ protected ApplicationContext run() {
 	/**
 	 * 使用默认方式启动SpringBoot时，加载的source
 	 */
-	protected Object source() {
+	protected Class<?> source() {
 		return this.getClass();
 	}