Skip to content

Commit 297d318

Browse files
Upgrade to Spring Boot 1.5.6.RELEASE
1 parent cedd083 commit 297d318

File tree

7 files changed

+29
-343
lines changed

7 files changed

+29
-343
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ indent_size = 2
2020
indent_style = space
2121
insert_final_newline = false
2222
trim_trailing_whitespace = true
23+
24+
[LICENSE.code.txt]
25+
charset = utf-8
26+
end_of_line = lf
27+
indent_size = 3
28+
indent_style = space
29+
insert_final_newline = false
30+
trim_trailing_whitespace = true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spring-boot.log.txt
2222
maven-testing-site.log.txt
2323
test.log.txt
2424
docs2
25+
docs-site-deployed
2526
.bundle
2627
.sass-cache
2728
Gemfile.lock

LICENSE

Lines changed: 0 additions & 339 deletions
This file was deleted.

LICENSE.code.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
All code in this repository is:
2+
=======================================================================
3+
Copyright (c) 2013 Thomas Woehlke All Rights Reserved
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.

LICENSE.writing.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Except where otherwise noted, this work is licensed under http://creativecommons.org/licenses/by-nd/3.0/

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.4.RELEASE</version>
17+
<version>1.5.6.RELEASE</version>
1818
</parent>
1919

2020
<organization>
@@ -36,7 +36,7 @@
3636
<distributionManagement>
3737
<site>
3838
<id>simpleworklist.shadowfax.fritz.box</id>
39-
<url>file://${project.basedir}/docs2</url>
39+
<url>file://${project.basedir}/docs-site-deployed</url>
4040
</site>
4141
</distributionManagement>
4242
<developers>

src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ spring:
341341
---
342342
spring:
343343
profiles: travis
344-
datasource:
345-
url: ${DATABASE_URL_TEST}
344+
datasource:
345+
url: ${DATABASE_URL_TEST}
346346

347347

0 commit comments

Comments
 (0)