From c2ba71795c95f9b1727054069268486fcad3e38b Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Sun, 4 Nov 2018 22:44:56 +0800
Subject: [PATCH] :arrow_up: Upgrading Spring Boot dependencies from
 2.0.5.RELEASE to 2.1.0.RELEASE.

---
 pom.xml                                      |  5 +-
 spring-boot-demo-actuator/pom.xml            |  4 +-
 spring-boot-demo-admin-client/pom.xml        |  4 +-
 spring-boot-demo-admin-server/pom.xml        |  4 +-
 spring-boot-demo-elasticsearch/pom.xml       |  4 +-
 spring-boot-demo-exception-handler/pom.xml   |  4 +-
 spring-boot-demo-helloworld/pom.xml          |  4 +-
 spring-boot-demo-log-aop/pom.xml             |  4 +-
 spring-boot-demo-logback/pom.xml             |  4 +-
 spring-boot-demo-neo4j/pom.xml               |  4 +-
 spring-boot-demo-orm-jdbctemplate/pom.xml    |  4 +-
 spring-boot-demo-orm-jpa/pom.xml             |  4 +-
 spring-boot-demo-properties/pom.xml          |  4 +-
 spring-boot-demo-template-beetl/pom.xml      |  4 +-
 spring-boot-demo-template-enjoy/pom.xml      |  4 +-
 spring-boot-demo-template-freemarker/pom.xml |  4 +-
 spring-boot-demo-template-thymeleaf/pom.xml  |  4 +-
 spring-boot-demo-upload/pom.xml              |  4 +-
 spring-boot-demo-war/pom.xml                 | 60 ++++++++++----------
 19 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb4adc170..b23448883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.xkcoding</groupId>
 	<artifactId>spring-boot-demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<modules>
 		<module>spring-boot-demo-helloworld</module>
 		<module>spring-boot-demo-properties</module>
@@ -22,6 +22,7 @@
 		<module>spring-boot-demo-template-enjoy</module>
 		<module>spring-boot-demo-orm-jdbctemplate</module>
 		<module>spring-boot-demo-orm-jpa</module>
+		<module>spring-boot-demo-email</module>
 		<module>spring-boot-demo-upload</module>
 		<module>spring-boot-demo-war</module>
 		<module>spring-boot-demo-elasticsearch</module>
@@ -38,7 +39,7 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
+		<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
 		<mysql.version>8.0.12</mysql.version>
 		<hutool.version>4.1.19</hutool.version>
 		<user.agent.version>1.20</user.agent.version>
diff --git a/spring-boot-demo-actuator/pom.xml b/spring-boot-demo-actuator/pom.xml
index 6baf264f0..8906c7755 100644
--- a/spring-boot-demo-actuator/pom.xml
+++ b/spring-boot-demo-actuator/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-actuator</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-actuator</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-admin-client/pom.xml b/spring-boot-demo-admin-client/pom.xml
index 10fb8f447..682adbb2c 100644
--- a/spring-boot-demo-admin-client/pom.xml
+++ b/spring-boot-demo-admin-client/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-admin-client</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-admin-client</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-admin-server/pom.xml b/spring-boot-demo-admin-server/pom.xml
index 3e1c2e2bf..e151e93b4 100644
--- a/spring-boot-demo-admin-server/pom.xml
+++ b/spring-boot-demo-admin-server/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-admin-server</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-admin-server</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-elasticsearch/pom.xml b/spring-boot-demo-elasticsearch/pom.xml
index 9a446dee2..2fb615886 100644
--- a/spring-boot-demo-elasticsearch/pom.xml
+++ b/spring-boot-demo-elasticsearch/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-elasticsearch</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-elasticsearch</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-exception-handler/pom.xml b/spring-boot-demo-exception-handler/pom.xml
index 4f79d6e38..14e4c9545 100644
--- a/spring-boot-demo-exception-handler/pom.xml
+++ b/spring-boot-demo-exception-handler/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-exception-handler</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-exception-handler</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-helloworld/pom.xml b/spring-boot-demo-helloworld/pom.xml
index 5130c627a..aef8a55bc 100644
--- a/spring-boot-demo-helloworld/pom.xml
+++ b/spring-boot-demo-helloworld/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-helloworld</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-helloworld</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-log-aop/pom.xml b/spring-boot-demo-log-aop/pom.xml
index fccdc7d15..17087e8d9 100644
--- a/spring-boot-demo-log-aop/pom.xml
+++ b/spring-boot-demo-log-aop/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-log-aop</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-log-aop</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-logback/pom.xml b/spring-boot-demo-logback/pom.xml
index 0e92707da..05a187f87 100644
--- a/spring-boot-demo-logback/pom.xml
+++ b/spring-boot-demo-logback/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-logback</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-logback</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-neo4j/pom.xml b/spring-boot-demo-neo4j/pom.xml
index aa4968e65..c16371129 100644
--- a/spring-boot-demo-neo4j/pom.xml
+++ b/spring-boot-demo-neo4j/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-boot-demo-neo4j</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-demo-neo4j</name>
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.xkcoding</groupId>
         <artifactId>spring-boot-demo</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/spring-boot-demo-orm-jdbctemplate/pom.xml b/spring-boot-demo-orm-jdbctemplate/pom.xml
index 102eae214..8d31e9beb 100644
--- a/spring-boot-demo-orm-jdbctemplate/pom.xml
+++ b/spring-boot-demo-orm-jdbctemplate/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-orm-jdbctemplate</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-orm-jdbctemplate</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-orm-jpa/pom.xml b/spring-boot-demo-orm-jpa/pom.xml
index 6109a66b2..f6d824bfc 100644
--- a/spring-boot-demo-orm-jpa/pom.xml
+++ b/spring-boot-demo-orm-jpa/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-boot-demo-orm-jpa</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-demo-orm-jpa</name>
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.xkcoding</groupId>
         <artifactId>spring-boot-demo</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/spring-boot-demo-properties/pom.xml b/spring-boot-demo-properties/pom.xml
index 82d1ddf2b..1bb7e8992 100644
--- a/spring-boot-demo-properties/pom.xml
+++ b/spring-boot-demo-properties/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-properties</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-properties</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-template-beetl/pom.xml b/spring-boot-demo-template-beetl/pom.xml
index faa73a851..39324c09f 100644
--- a/spring-boot-demo-template-beetl/pom.xml
+++ b/spring-boot-demo-template-beetl/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-template-beetl</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-template-beetl</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-template-enjoy/pom.xml b/spring-boot-demo-template-enjoy/pom.xml
index 789f59505..737160e7a 100644
--- a/spring-boot-demo-template-enjoy/pom.xml
+++ b/spring-boot-demo-template-enjoy/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-template-enjoy</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-template-enjoy</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-template-freemarker/pom.xml b/spring-boot-demo-template-freemarker/pom.xml
index cc05d161c..f72fb119a 100644
--- a/spring-boot-demo-template-freemarker/pom.xml
+++ b/spring-boot-demo-template-freemarker/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-template-freemarker</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-template-freemarker</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-template-thymeleaf/pom.xml b/spring-boot-demo-template-thymeleaf/pom.xml
index 8995f3466..835611c22 100644
--- a/spring-boot-demo-template-thymeleaf/pom.xml
+++ b/spring-boot-demo-template-thymeleaf/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-boot-demo-template-thymeleaf</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-demo-template-thymeleaf</name>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.xkcoding</groupId>
 		<artifactId>spring-boot-demo</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-boot-demo-upload/pom.xml b/spring-boot-demo-upload/pom.xml
index 6947e5780..042defe63 100644
--- a/spring-boot-demo-upload/pom.xml
+++ b/spring-boot-demo-upload/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-boot-demo-upload</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-demo-upload</name>
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.xkcoding</groupId>
         <artifactId>spring-boot-demo</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/spring-boot-demo-war/pom.xml b/spring-boot-demo-war/pom.xml
index 38fc08a79..995e5081c 100644
--- a/spring-boot-demo-war/pom.xml
+++ b/spring-boot-demo-war/pom.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-boot-demo-war</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <!-- 若需要打成 war 包，则需要将打包方式改成 war -->
     <packaging>war</packaging>
 
-    <name>spring-boot-demo-war</name>
-    <description>Demo project for Spring Boot</description>
+	<name>spring-boot-demo-war</name>
+	<description>Demo project for Spring Boot</description>
 
-    <parent>
-        <groupId>com.xkcoding</groupId>
-        <artifactId>spring-boot-demo</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>com.xkcoding</groupId>
+		<artifactId>spring-boot-demo</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
 
     <dependencies>
         <dependency>
@@ -36,21 +36,21 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-boot-demo-war</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>spring-boot-demo-war</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>