Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2019-06-04 00:05:57 -07:00
parent eb9ffd5e7e e61f7a33a7
commit 5fba43aa31
78 changed files with 90 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
View File

@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
SUP top
AUXILIARY
MAY exampleAttributeName
X-ORIGIN 'Managing Schema Document' )
X-ORIGIN 'Managing Schema Document' )

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl
View File

@@ -1 +1 @@
custom
custom

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
View File

@@ -1 +1 @@
yield "custom"
yield "custom"

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
View File

@@ -1 +1 @@
custom
custom

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
View File

@@ -1 +1 @@
INSERT INTO BAR VALUES (1, 'Andy');
INSERT INTO BAR VALUES (1, 'Andy');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
View File

@@ -23,4 +23,4 @@
</expiry>
</cache>
</config>
</config>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
</configuration>
</configuration>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
View File

@@ -1 +1 @@
Hello {{World}}
Hello {{World}}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
View File

@@ -6,4 +6,4 @@
<h2>A Message</h2>
<div>{{message}} at {{time}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
View File

@@ -12,4 +12,4 @@
</div>
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
View File

@@ -12,4 +12,4 @@
</div>
<div class="jumbotron">{{>content}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
View File

@@ -16,4 +16,4 @@
</join>
</network>
</hazelcast>
</hazelcast>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE SPAM (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
View File

@@ -1 +1 @@
INSERT INTO FOO VALUES (1, 'Andy');
INSERT INTO FOO VALUES (1, 'Andy');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
View File

@@ -1,2 +1,2 @@
INSERT INTO BAR(id, name) VALUES (1, 'bar');
INSERT INTO BAR(id, name) VALUES (2, 'ばー');
INSERT INTO BAR(id, name) VALUES (2, 'ばー');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE BAR (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
View File

@@ -1 +1 @@
<html><body data:foo="${foo}"></body></html>
<html><body data:foo="${foo}"></body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl
View File

@@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
View File

@@ -1 +1 @@
<html><body th:text="${foo}">Home</body></html>
<html><body th:text="${foo}">Home</body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm
View File

@@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
View File

@@ -1 +1 @@
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html
View File

@@ -11,4 +11,4 @@
</div>
</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl
View File

@@ -1 +1 @@
Message: ${greeting}
Message: ${greeting}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
View File

@@ -1 +1 @@
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm
View File

@@ -1 +1 @@
Message: ${greeting}
Message: ${greeting}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl
View File

@@ -1 +1 @@
prefixed
prefixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
View File

@@ -1 +1 @@
yield "prefixed"
yield "prefixed"

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
View File

@@ -1 +1 @@
prefixed
prefixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
View File

@@ -1 +1 @@
suffixed
suffixed

4
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
<head>
<title layout:fragment="title">Content</title>
</head>
@@ -7,4 +7,4 @@
<span th:text="${foo}">foo</span>
</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml
View File

@@ -30,4 +30,4 @@
</proxy>
</proxies>
</settings>
</settings>

2
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
View File

@@ -1,3 +1,3 @@
<settingsSecurity>
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
</settingsSecurity>
</settingsSecurity>

2
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
View File

@@ -28,4 +28,4 @@
</proxy>
</proxies>
</settings>
</settings>

2
spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
View File

@@ -22,4 +22,4 @@
2012 2:17:16 PM CDT</div>
</div>
</body>
</html>
</html>

3
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
View File

@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;
/**
* A <a href="http://livereload.com">livereload</a> server.
* A <a href="https://github.com/livereload">livereload</a> server.
*
* @author Phillip Webb
* @since 1.3.0
* @see <a href="http://livereload.com">livereload.com</a>
*/
public class LiveReloadServer {

2
spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml
View File

@@ -1,3 +1,3 @@
test:
foo:
bar: value
bar: value

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql
View File

@@ -1 +1 @@
create table example (id int, name varchar);
create table example (id int, name varchar);

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json
View File

@@ -62,4 +62,4 @@
]
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json
View File

@@ -35,4 +35,4 @@
}
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json
View File

@@ -1,3 +1,3 @@
{
"foo": "bar"
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json
View File

@@ -56,4 +56,4 @@
]
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json
View File

@@ -20,4 +20,4 @@
"sourceType": "org.acme.Foo2"
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json
View File

@@ -5,4 +5,4 @@
"sourceType": "org.acme.Invalid"
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json
View File

@@ -76,4 +76,4 @@
]
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json
View File

@@ -8,4 +8,4 @@
"name": "spring.root2.name"
}
]
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
View File

@@ -6,4 +6,4 @@
public void setExtra(String extra) {
this.extra = extra;
}
}

2
spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml
View File

@@ -8,4 +8,4 @@ version: B
---
spring.profiles: C
version: C
---
---

2
spring-boot-project/spring-boot/src/test/resources/custom-location.yml
View File

@@ -1 +1 @@
foo: ${fooValue}
foo: ${fooValue}

2
spring-boot-project/spring-boot/src/test/resources/testprofiles.yml
View File

@@ -11,4 +11,4 @@ my:
spring:
profiles: other
my:
property: fromotherprofile
property: fromotherprofile

2
spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml
View File

@@ -11,4 +11,4 @@ my:
spring:
profiles: other
my:
property: fromotherprofile
property: fromotherprofile

2
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml
View File

@@ -1,4 +1,4 @@
---
spring:
profiles:
active: dev,healthcheck
active: dev,healthcheck

2
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml
View File

@@ -3,4 +3,4 @@ spring:
profiles:
active:
- dev
- healthcheck
- healthcheck

2
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
View File

@@ -1,4 +1,4 @@
---
spring:
profiles:
active: dev, healthcheck
active: dev, healthcheck

2
spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml
View File

@@ -8,4 +8,4 @@ my:
spring:
profiles: dev
my:
property: fromdevprofile
property: fromdevprofile