Skip to content

Commit b442d3b

Browse files
philwebbphilwebb
committed
Merge branch '1.5.x' into 2.0.x
2 parents 5fba43a + 80d8a5c commit b442d3b

File tree

31 files changed

+44
-32
lines changed

31 files changed

+44
-32
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void createFromConfigClass() {
7373
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
7474
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
7575
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
76-
String result = engine.process("template", attrs);
76+
String result = engine.process("template", attrs).trim();
7777
assertThat(result).isEqualTo("<html>bar</html>");
7878
}
7979

@@ -176,7 +176,7 @@ public void useDataDialect() {
176176
ISpringWebFluxTemplateEngine engine = this.context
177177
.getBean(ISpringWebFluxTemplateEngine.class);
178178
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
179-
String result = engine.process("data-dialect", attrs);
179+
String result = engine.process("data-dialect", attrs).trim();
180180
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
181181
}
182182

@@ -186,7 +186,7 @@ public void useJava8TimeDialect() {
186186
ISpringWebFluxTemplateEngine engine = this.context
187187
.getBean(ISpringWebFluxTemplateEngine.class);
188188
Context attrs = new Context(Locale.UK);
189-
String result = engine.process("java8time-dialect", attrs);
189+
String result = engine.process("java8time-dialect", attrs).trim();
190190
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
191191
}
192192

@@ -196,7 +196,7 @@ public void renderTemplate() {
196196
ISpringWebFluxTemplateEngine engine = this.context
197197
.getBean(ISpringWebFluxTemplateEngine.class);
198198
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
199-
String result = engine.process("home", attrs);
199+
String result = engine.process("home", attrs).trim();
200200
assertThat(result).isEqualTo("<html><body>bar</body></html>");
201201
}
202202

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void createFromConfigClass() {
8989
"spring.thymeleaf.suffix:");
9090
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
9191
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
92-
String result = engine.process("template.html", attrs);
92+
String result = engine.process("template.html", attrs).trim();
9393
assertThat(result).isEqualTo("<html>bar</html>");
9494
}
9595

@@ -172,7 +172,7 @@ public void useDataDialect() {
172172
load(BaseConfiguration.class);
173173
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
174174
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
175-
String result = engine.process("data-dialect", attrs);
175+
String result = engine.process("data-dialect", attrs).trim();
176176
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
177177
}
178178

@@ -181,7 +181,7 @@ public void useJava8TimeDialect() {
181181
load(BaseConfiguration.class);
182182
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
183183
Context attrs = new Context(Locale.UK);
184-
String result = engine.process("java8time-dialect", attrs);
184+
String result = engine.process("java8time-dialect", attrs).trim();
185185
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
186186
}
187187

@@ -190,7 +190,7 @@ public void renderTemplate() {
190190
load(BaseConfiguration.class);
191191
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
192192
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
193-
String result = engine.process("home", attrs);
193+
String result = engine.process("home", attrs).trim();
194194
assertThat(result).isEqualTo("<html><body>bar</body></html>");
195195
}
196196

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
</basic>
1616
</attributes>
1717
</entity>
18-
</entity-mappings>
18+
</entity-mappings>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
1+
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
1+
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<html>
22
<body>
33
<ul>
4-
<li>status: {{status}}</li>
5-
<li>message: {{message}}</li>
4+
<li>status: {{status}}</li>
5+
<li>message: {{message}}</li>
66
</ul>
77
</body>
8-
</html>
8+
</html>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<html th:text="${foo}">foo</html>
1+
<html th:text="${foo}">foo</html>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
3-
xmlns:tns="http://www.springframework.org/spring-ws/wsdl"
4-
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
2+
<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
3+
xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
4+
xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
55
<wsdl:types>
6-
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
7-
elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
6+
<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
7+
elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
88
<xsd:element name="request" type="xsd:string" />
99
<xsd:element name="response" type="xsd:string" />
1010
</xsd:schema>
@@ -23,7 +23,7 @@
2323
</wsdl:portType>
2424
<wsdl:binding name="binding" type="tns:portType">
2525
<wsdlsoap:binding style="document"
26-
transport="http://schemas.xmlsoap.org/soap/http/" />
26+
transport="https://schemas.xmlsoap.org/soap/http/" />
2727
<wsdl:operation name="operation">
2828
<wsdlsoap:operation soapAction="" />
2929
<wsdl:input name="request">
@@ -40,4 +40,3 @@
4040
</wsdl:port>
4141
</wsdl:service>
4242
</wsdl:definitions>
43-

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<schema xmlns="http://www.w3.org/2001/XMLSchema"
33
elementFormDefault="qualified"
4-
targetNamespace="http://www.springframework.org/spring-ws/wsdl/schemas">
4+
targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
55
<element name="request" type="string" />
66
<element name="response" type="string" />
77
</schema>

‎spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FOO=BAR
1+
FOO=BAR

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void viewResolvesHandlebars() {
6262
view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
6363
this.exchange).block(Duration.ofSeconds(30));
6464
assertThat(this.exchange.getResponse().getBodyAsString()
65-
.block(Duration.ofSeconds(30))).isEqualTo("Hello Spring");
65+
.block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring");
6666
}
6767

6868
}

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void viewResolvesHandlebars() throws Exception {
6464
view.setApplicationContext(this.context);
6565
view.render(Collections.singletonMap("World", "Spring"), this.request,
6666
this.response);
67-
assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring");
67+
assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
6868
}
6969

7070
}

‎spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.springframework.boot.env.PropertySourceLoader=\
22
org.springframework.boot.context.config.TestPropertySourceLoader1,\
3-
org.springframework.boot.context.config.TestPropertySourceLoader2
3+
org.springframework.boot.context.config.TestPropertySourceLoader2

‎spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
spring.main.web-application-type: reactive
1+
spring.main.web-application-type: reactive

‎spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Hello {{World}}
1+
Hello {{World}}

‎spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Hello {{World}}
1+
Hello {{World}}

‎spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spring:
1717
profiles: "!other"
1818
my:
1919
property: fromnototherprofile
20-
notother: foo
20+
notother: foo

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ install_double_link_service
33
echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf
44
start_service
55
await_app http://127.0.0.1:8081/
6-
curl -s http://127.0.0.1:8081/
6+
curl -s http://127.0.0.1:8081/

0 commit comments

Comments
 (0)