From 337fefa5622482ddf5a421dc9a0311440da19f2f Mon Sep 17 00:00:00 2001
From: yexuejc <940526mf>
Date: Wed, 26 Sep 2018 17:01:02 +0800
Subject: [PATCH] =?UTF-8?q?1.1.1=20=E5=9F=BA=E4=BA=8Espringboot=201.x=202.?=
 =?UTF-8?q?x=20=E5=88=86=E5=BC=80=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                       |  8 ++++--
 UPDATE.md                       | 12 +++++++++
 pom.xml                         | 45 ++++++---------------------------
 yexuejc-springboot-base/pom.xml |  2 +-
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index d8c8537..39061ff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-# yexuejc-springboot-base
+# yexuejc-springboot
+
+### 说明
+>本分支基于 springboot 1.x 
+>2.x 分支基于springboot 2.x
 
 
 #### 项目介绍
@@ -9,7 +13,7 @@ parent：版本封装<br/>
 base:功能封装
 
 #### 最新版本
->yexuejc.springboot.version=1.1.0 <br>
+>yexuejc.springboot.version=1.1.1 <br>
 >yexuejc.base.version=1.1.9
 
 pom.xml
diff --git a/UPDATE.md b/UPDATE.md
index 4fcbe04..f4f4173 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,18 @@
 yexuejc-springboot 更新内容
 -------------------
 
+#### version ：1.1.1
+**time：2018-9-26 17:00:38** <br/>
+**branch：** master    <br/>
+**关联工程：**    <br/>
+```
+springboot-base:1.1.9
+spring-boot-starter-parent:1.5.16.RELEASE
+```
+**update：**     <br/>
+1. 升级依赖
+#
+
 #### version ：1.1.0
 **time：2018-9-23 12:49:36** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index b443349..3dcda5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.yexuejc.springboot</groupId>
     <artifactId>yexuejc-springboot-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -15,7 +15,7 @@
         <!-- spring boot父级,包含了统一版本管理,统一插件管理等 -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.15.RELEASE</version>
+        <version>1.5.16.RELEASE</version>
         <!--  <relativePath/> lookup parent from repository -->
     </parent>
 
@@ -59,9 +59,9 @@
         <dependencies>
             <!--基础包-->
             <!--<dependency>-->
-                <!--<groupId>com.github.yexuejc</groupId>-->
-                <!--<artifactId>yexuejc-base</artifactId>-->
-                <!--<version>${yexuejc.base.version}</version>-->
+            <!--<groupId>com.github.yexuejc</groupId>-->
+            <!--<artifactId>yexuejc-base</artifactId>-->
+            <!--<version>${yexuejc.base.version}</version>-->
             <!--</dependency>-->
             <dependency>
                 <groupId>com.yexuejc.base</groupId>
@@ -176,37 +176,6 @@
                 <classifier>jar-with-dependencies</classifier>
             </dependency>
 
-            <!-- spring-boot-admin相关 -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server-ui</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server-ui-hystrix</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server-ui-turbine</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server-ui-activiti</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -271,7 +240,9 @@
                                 <goal>single</goal>
                             </goals>
                             <configuration>
-                                <descriptor>${basedir}/assembly/assembly.xml</descriptor>
+                                <descriptors>
+                                    <descriptor>${basedir}/assembly/assembly.xml</descriptor>
+                                </descriptors>
                             </configuration>
                         </execution>
                     </executions>
diff --git a/yexuejc-springboot-base/pom.xml b/yexuejc-springboot-base/pom.xml
index 1bb0af9..6f25fe7 100644
--- a/yexuejc-springboot-base/pom.xml
+++ b/yexuejc-springboot-base/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
         <!-- 本地打包：使用相对关联路径 -->
         <!--<relativePath>../../yexuejc</relativePath>-->
     </parent>