Skip to content

Commit b49a6b8

Browse files
committed
pom version
1 parent a7e3d06 commit b49a6b8

File tree

8 files changed

+33
-25
lines changed

8 files changed

+33
-25
lines changed

README.md

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
### 环境
1010
- `maven` latest
1111
- `jdk1.8`
12-
- `spring boot 1.5.6 release`(目前最新版)
12+
- `spring boot 1.5.8 release`(目前最新版)
1313
- 个人推荐`idea`来代替eclipse(希望不要被说成异教徒必须死)
1414
- mysql5.5+
1515
- git: 版本管理
@@ -50,13 +50,11 @@
5050

5151

5252
### 更新日志
53-
由于更新日志占用篇幅太多,单独用一个文件存放。链接地址 [更新日志(详细)](/changeLog.md),这里只展示更新简介
54-
5553
- 2017-09-02 api模块: 添加swagger-bootstrap-ui,和原有ui并行存在。
5654
http://localhost:8080 默认UI
5755
http://localhost:808/doc.html bootstrap-ui
5856

59-
- 2017-09-02 spring boot版本从1.4.3更新到1.5.6
57+
- 2017-09-02 spring boot版本从1.4.3更新到1.5.8
6058
- 2017-09-02 修复不配置数据库信息无法启动的bug
6159
- 2017-09-02 版本号更新到2017.1
6260
- 2017-09-02 api模块(swagger)添加开源库swagger-bootstrap-ui,和swagger默认UI同时存在。
@@ -68,7 +66,7 @@ http://localhost:808/doc.html bootstrap-ui
6866
- 2017-11-02 开源协议从apache更换到MIT
6967
- 2017-11-02 添加本地运行方式的说明
7068
- 2017-11-02 版本更新到2017.2
71-
69+
- 2017-11-02 spring boot版本更新到1.5.8
7270

7371

7472
## 贡献者
@@ -143,17 +141,27 @@ http://localhost:808/doc.html bootstrap-ui
143141

144142

145143

146-
## [License](LICENSE "apache")
147-
148-
Copyright 2017 xiaomo
144+
## [License](LICENSE "MIT")
149145

150-
Licensed under the Apache License, Version 2.0 (the "License");
151-
you may not use this file except in compliance with the License.
152-
You may obtain a copy of the License at
146+
MIT License
147+
148+
Copyright (c) 2017 Peng Hu
149+
150+
Permission is hereby granted, free of charge, to any person obtaining a copy
151+
of this software and associated documentation files (the "Software"), to deal
152+
in the Software without restriction, including without limitation the rights
153+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
154+
copies of the Software, and to permit persons to whom the Software is
155+
furnished to do so, subject to the following conditions:
156+
157+
The above copyright notice and this permission notice shall be included in all
158+
copies or substantial portions of the Software.
159+
160+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
161+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
162+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
163+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
164+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
165+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
166+
SOFTWARE.
153167

154-
http://www.apache.org/licenses/LICENSE-2.0
155-
Unless required by applicable law or agreed to in writing, software
156-
distributed under the License is distributed on an "AS IS" BASIS,
157-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
158-
See the License for the specific language governing permissions and
159-
limitations under the License.

api/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
...::: ::::::::::::' ``::.
1717
```` ':. ':::::::::' ::::..
1818
'.:::::' ':'````..
19-
:: Spring Boot :: (v1.5.6.RELEASE)
19+
:: Spring Boot :: (v1.5.8.RELEASE)

freemarker/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
...::: ::::::::::::' ``::.
1717
```` ':. ':::::::::' ::::..
1818
'.:::::' ':'````..
19-
:: Spring Boot :: (v1.5.6.RELEASE)
19+
:: Spring Boot :: (v1.5.8.RELEASE)

multipleSource/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
...::: ::::::::::::' ``::.
1717
```` ':. ':::::::::' ::::..
1818
'.:::::' ':'````..
19-
:: Spring Boot :: (v1.5.6.RELEASE)
19+
:: Spring Boot :: (v1.5.8.RELEASE)

mybatis/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
...::: ::::::::::::' ``::.
1717
```` ':. ':::::::::' ::::..
1818
'.:::::' ':'````..
19-
:: Spring Boot :: (v1.5.6.RELEASE)
19+
:: Spring Boot :: (v1.5.8.RELEASE)

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<parent>
5353
<groupId>org.springframework.boot</groupId>
5454
<artifactId>spring-boot-starter-parent</artifactId>
55-
<version>1.5.6.RELEASE</version>
55+
<version>1.5.8.RELEASE</version>
5656
<relativePath/> <!-- lookup parent from repository -->
5757
</parent>
5858

@@ -102,7 +102,7 @@
102102
<!-- html -->
103103
<jsoup.version>1.10.1</jsoup.version>
104104
<!-- spring-boot version -->
105-
<spring-boot.version>1.5.6.RELEASE</spring-boot.version>
105+
<spring-boot.version>1.5.8.RELEASE</spring-boot.version>
106106
<!-- compiler-plugin version -->
107107
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
108108
<!-- surefile-plugin test util -->

thymeleaf/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
...::: ::::::::::::' ``::.
1717
```` ':. ':::::::::' ::::..
1818
'.:::::' ':'````..
19-
:: Spring Boot :: (v1.5.6.RELEASE)
19+
:: Spring Boot :: (v1.5.8.RELEASE)

website/src/main/resources/config/banner-girl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
...::: ::::::::::::' ``::.
1818
```` ':. ':::::::::' ::::..
1919
'.:::::' ':'````..
20-
:: Spring Boot :: (v1.5.6.RELEASE)
20+
:: Spring Boot :: (v1.5.8.RELEASE)

0 commit comments

Comments
 (0)