Merge branch '1.5.x' into 2.0.x

philwebb · philwebb · commit b442d3b9061e · 2019-06-04T01:49:03.000-07:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
@@ -73,7 +73,7 @@ public void createFromConfigClass() {
 		load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("template", attrs);
+		String result = engine.process("template", attrs).trim();
 		assertThat(result).isEqualTo("<html>bar</html>");
 	}
 
@@ -176,7 +176,7 @@ public void useDataDialect() {
 		ISpringWebFluxTemplateEngine engine = this.context
 				.getBean(ISpringWebFluxTemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("data-dialect", attrs);
+		String result = engine.process("data-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
 	}
 
@@ -186,7 +186,7 @@ public void useJava8TimeDialect() {
 		ISpringWebFluxTemplateEngine engine = this.context
 				.getBean(ISpringWebFluxTemplateEngine.class);
 		Context attrs = new Context(Locale.UK);
-		String result = engine.process("java8time-dialect", attrs);
+		String result = engine.process("java8time-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
 	}
 
@@ -196,7 +196,7 @@ public void renderTemplate() {
 		ISpringWebFluxTemplateEngine engine = this.context
 				.getBean(ISpringWebFluxTemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("home", attrs);
+		String result = engine.process("home", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>bar</body></html>");
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
@@ -89,7 +89,7 @@ public void createFromConfigClass() {
 				"spring.thymeleaf.suffix:");
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("template.html", attrs);
+		String result = engine.process("template.html", attrs).trim();
 		assertThat(result).isEqualTo("<html>bar</html>");
 	}
 
@@ -172,7 +172,7 @@ public void useDataDialect() {
 		load(BaseConfiguration.class);
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("data-dialect", attrs);
+		String result = engine.process("data-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
 	}
 
@@ -181,7 +181,7 @@ public void useJava8TimeDialect() {
 		load(BaseConfiguration.class);
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK);
-		String result = engine.process("java8time-dialect", attrs);
+		String result = engine.process("java8time-dialect", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
 	}
 
@@ -190,7 +190,7 @@ public void renderTemplate() {
 		load(BaseConfiguration.class);
 		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
 		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
-		String result = engine.process("home", attrs);
+		String result = engine.process("home", attrs).trim();
 		assertThat(result).isEqualTo("<html><body>bar</body></html>");
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
@@ -15,4 +15,4 @@
 			</basic>
 		</attributes>
 	</entity>
-</entity-mappings>
+</entity-mappings>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
@@ -1 +1 @@
-INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
+INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
@@ -1 +1 @@
-INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
+INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
@@ -1,8 +1,8 @@
 <html>
 <body>
 <ul>
-    <li>status: {{status}}</li>
-    <li>message: {{message}}</li>
+	<li>status: {{status}}</li>
+	<li>message: {{message}}</li>
 </ul>
 </body>
-</html>
+</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
@@ -1 +1 @@
-<html th:text="${foo}">foo</html>
+<html th:text="${foo}">foo</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://www.springframework.org/spring-ws/wsdl"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
+<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
+	xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
+	xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
 	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
+		<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
+			elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
 			<xsd:element name="request" type="xsd:string" />
 			<xsd:element name="response" type="xsd:string" />
 		</xsd:schema>
@@ -23,7 +23,7 @@
 	</wsdl:portType>
 	<wsdl:binding name="binding" type="tns:portType">
 		<wsdlsoap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http/" />
+			transport="https://schemas.xmlsoap.org/soap/http/" />
 		<wsdl:operation name="operation">
 			<wsdlsoap:operation soapAction="" />
 			<wsdl:input name="request">
@@ -40,4 +40,3 @@
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>
-
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="qualified"
-	targetNamespace="http://www.springframework.org/spring-ws/wsdl/schemas">
+	targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
 	<element name="request" type="string" />
 	<element name="response" type="string" />
 </schema>
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script
@@ -1 +1 @@
-FOO=BAR
+FOO=BAR
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
@@ -62,7 +62,7 @@ public void viewResolvesHandlebars() {
 		view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
 				this.exchange).block(Duration.ofSeconds(30));
 		assertThat(this.exchange.getResponse().getBodyAsString()
-				.block(Duration.ofSeconds(30))).isEqualTo("Hello Spring");
+				.block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring");
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
@@ -64,7 +64,7 @@ public void viewResolvesHandlebars() throws Exception {
 		view.setApplicationContext(this.context);
 		view.render(Collections.singletonMap("World", "Spring"), this.request,
 				this.response);
-		assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring");
+		assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 org.springframework.boot.env.PropertySourceLoader=\
 org.springframework.boot.context.config.TestPropertySourceLoader1,\
-org.springframework.boot.context.config.TestPropertySourceLoader2
+org.springframework.boot.context.config.TestPropertySourceLoader2
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
@@ -1 +1 @@
-spring.main.web-application-type: reactive
+spring.main.web-application-type: reactive
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html
@@ -1 +1 @@
-Hello {{World}}
+Hello {{World}}
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html
@@ -1 +1 @@
-Hello {{World}}
+Hello {{World}}
diff --git a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml
@@ -17,4 +17,4 @@ spring:
   profiles: "!other"
 my:
   property: fromnototherprofile
-  notother: foo
+  notother: foo
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh
@@ -3,4 +3,4 @@ install_double_link_service
 echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf
 start_service
 await_app http://127.0.0.1:8081/
-curl -s http://127.0.0.1:8081/
+curl -s http://127.0.0.1:8081/

Original file line number	Diff line number	Diff 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');`