From caf0aa7e049ec2c8b0b02386c63a849644273d4e Mon Sep 17 00:00:00 2001
From: zhouwei <zhouweiwansui@gmail.com>
Date: 星期三, 07 十一月 2018 10:14:22 +0800
Subject: [PATCH] 11

---
 app-root/pom.xml |   84 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/app-root/pom.xml b/app-root/pom.xml
index 70ee9be..bde4eb5 100644
--- a/app-root/pom.xml
+++ b/app-root/pom.xml
@@ -612,19 +612,56 @@
       <artifactId>jackson-annotations</artifactId>
       <version>2.2.3</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.jetbrains.kotlin</groupId>-->
-      <!--<artifactId>kotlin-stdlib</artifactId>-->
-      <!--<version>${kotlin.version}</version>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>net.coobird</groupId>
+      <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>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-reflect</artifactId>
       <version>${kotlin.version}</version>
 
+
+
     </dependency>
 
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -632,11 +669,15 @@
       <version>${kotlin.version}</version>
 
     </dependency>
-
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+    </dependency>
   </dependencies>
 
   <properties>
-    <kotlin.version>1.2.50</kotlin.version>
+    <kotlin.version>1.3.0</kotlin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jdk.version>1.8</jdk.version>
     <asm.version>4.2</asm.version>
@@ -709,10 +750,24 @@
 
   <build>
         <plugins>
+
             <plugin>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <version>1.2.50</version>
+              <artifactId>kotlin-maven-plugin</artifactId>
+              <groupId>org.jetbrains.kotlin</groupId>
+              <version>${kotlin.version}</version>
+              <configuration>
+                <compilerPlugins>
+                  <!-- Or "spring" for the Spring support -->
+                  <plugin>spring</plugin>
+                </compilerPlugins>
+              </configuration>
+              <dependencies>
+                <dependency>
+                  <groupId>org.jetbrains.kotlin</groupId>
+                  <artifactId>kotlin-maven-allopen</artifactId>
+                  <version>${kotlin.version}</version>
+                </dependency>
+              </dependencies>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -747,6 +802,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
+
                   <source>${jdk.version}</source>
                   <target>${jdk.version}</target>
                 </configuration>
@@ -772,14 +828,6 @@
                         <goals> <goal>testCompile</goal> </goals>
                     </execution>
                 </executions>
-
-              <dependencies>
-                <dependency>
-                  <groupId>org.jetbrains.kotlin</groupId>
-                  <artifactId>kotlin-maven-allopen</artifactId>
-                  <version>${kotlin.version}</version>
-                </dependency>
-              </dependencies>
 
             </plugin>
 

--
Gitblit v1.8.0