合并SpringBoot2.x版本

hengboy · hengboy · commit 363cb08dccf7 · 2019-03-22T14:41:08.000+08:00
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.minbox.framework</groupId>
       <artifactId>api-boot-dependencies</artifactId>
-      <version>2.1.1.RELEASE</version>
+      <version>2.0.1.RELEASE</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java
@@ -45,7 +45,7 @@ public class SwaggerProperties {
     /**
      * 文档版本号
      */
-    private String version = "2.1.1.RELEASE";
+    private String version = "2.0.1.RELEASE";
     /**
      * 文档版权
      */
diff --git a/api-boot-project/api-boot-common/pom.xml b/api-boot-project/api-boot-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../..</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/api-boot-project/api-boot-parent/pom.xml b/api-boot-project/api-boot-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-dependencies</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../api-boot-dependencies</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot Plugin 阿里云 对象存储oss</description>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-sms/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot集成阿里云国际短信服务</description>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api-boot-plugin</artifactId>
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-alibaba-oss/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-alibaba-oss/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-alibaba-sms/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-alibaba-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-http-converter/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-http-converter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api-boot-starter-security-oauth-jwt</artifactId>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-swagger/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-project/api-boot-starters/api-boot-starter/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-starters</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-project/api-boot-starters/pom.xml b/api-boot-project/api-boot-starters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/api-boot-project/pom.xml b/api-boot-project/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api-boot-samples/api-boot-sample-alibaba-oss/README.md b/api-boot-samples/api-boot-sample-alibaba-oss/README.md
@@ -183,7 +183,7 @@ ApiBootOssOverrideService apiBootOssOverrideService(ApiBootOssProperties apiBoot
 
 `ApiBootOssProperties`属性配置类，是`ApiBoot`内置的，可以在任意地方进行注入，这里目的只是为了拿到相关配置进行构造参数实例化使用。
 
-### v2.1.2.RELEASE规划
+### v2.0.2.RELEASE规划
 
 1. 上传、下载进度条监听
 2. 追加上传
diff --git a/api-boot-samples/api-boot-sample-alibaba-oss/pom.xml b/api-boot-samples/api-boot-sample-alibaba-oss/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-samples</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot 集成阿里云Oss对象存储</description>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-alibaba-sms/pom.xml b/api-boot-samples/api-boot-sample-alibaba-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-samples</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot集成阿里云国际短信服务.</description>
@@ -31,7 +31,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-http-converter/pom.xml b/api-boot-samples/api-boot-sample-http-converter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-samples</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml b/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-samples</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-swagger/pom.xml b/api-boot-samples/api-boot-sample-swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-samples</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/pom.xml b/api-boot-samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </modules>
     <groupId>org.minbox.framework</groupId>
     <artifactId>api-boot</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.0.1.RELEASE</version>
     <name>api-boot</name>
     <description>
         ApiBoot是一款基于SpringBoot1.x、2.x的接口服务集成基础框架，
