From 6741269c0f42c44e871cf5ade02cae0dca2bbf6d Mon Sep 17 00:00:00 2001
From: zhouwei <zhouweiwansui@gmail.com>
Date: 星期一, 15 七月 2019 10:14:18 +0800
Subject: [PATCH] 升级kotlin版本1.3.41
---
app-root/pom.xml | 43 ++++++++++++++-----------------------------
boot-parent/pom.xml | 6 +++---
2 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/app-root/pom.xml b/app-root/pom.xml
index f180396..aacbc40 100644
--- a/app-root/pom.xml
+++ b/app-root/pom.xml
@@ -559,29 +559,35 @@
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-green</artifactId>
- <version>1.1.0</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
- <version>2.2.6</version>
+ <version>3.2.8</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-push</artifactId>
- <version>2.1.0</version>
+ <version>3.10.0</version>
</dependency>
- <dependency>
- <groupId>net.coobird</groupId>
- <artifactId>thumbnailator</artifactId>
- <version>0.4.3</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.aliyun</groupId>-->
+ <!--<artifactId>aliyun-java-sdk-push</artifactId>-->
+ <!--<version>2.1.0</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>2.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>0.4.3</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
@@ -616,29 +622,8 @@
<artifactId>thumbnailator</artifactId>
<version>0.4.3</version>
</dependency>
- <dependency>
- <groupId>com.aliyun.oss</groupId>
- <artifactId>aliyun-sdk-oss</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-green</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-core</artifactId>
- <version>3.0.7</version>
- </dependency>
-
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-push</artifactId>
- <version>2.1.0</version>
- </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
diff --git a/boot-parent/pom.xml b/boot-parent/pom.xml
index 5e11058..54cb237 100644
--- a/boot-parent/pom.xml
+++ b/boot-parent/pom.xml
@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
- <kotlin.version>1.3.0</kotlin.version>
+ <kotlin.version>1.3.41</kotlin.version>
</properties>
<dependencies>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
+ <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -122,7 +122,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>22.0</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
--
Gitblit v1.8.0