Skip to content

Commit d306b31

Browse files
philwebbphilwebb
committed
Merge branch '2.1.x'
2 parents 2b51cf4 + ccfbd03 commit d306b31

File tree

107 files changed

+130
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+130
-112
lines changed

‎pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
</activation>
2626
<properties>
2727
<spring-javaformat.version>0.0.9</spring-javaformat.version>
28+
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
2829
</properties>
2930
<build>
3031
<plugins>
@@ -43,6 +44,11 @@
4344
<artifactId>spring-javaformat-checkstyle</artifactId>
4445
<version>${spring-javaformat.version}</version>
4546
</dependency>
47+
<dependency>
48+
<groupId>io.spring.nohttp</groupId>
49+
<artifactId>nohttp-checkstyle</artifactId>
50+
<version>${nohttp-checkstyle.version}</version>
51+
</dependency>
4652
</dependencies>
4753
<executions>
4854
<execution>
@@ -54,6 +60,7 @@
5460
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
5561
<includeTestSourceDirectory>true</includeTestSourceDirectory>
5662
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
63+
<resourceIncludes>**\/*.*</resourceIncludes>
5764
</configuration>
5865
<goals>
5966
<goal>check</goal>

‎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/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/V2__update.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DROP TABLE IF EXISTS TEST;
1+
DROP TABLE IF EXISTS TEST;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DROP TABLE IF EXISTS TEST;
1+
DROP TABLE IF EXISTS TEST;

‎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
TemplateEngine engine = context.getBean(TemplateEngine.class);
7474
Context attrs = new Context(Locale.UK,
7575
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
}
@@ -210,7 +210,7 @@ public void useDataDialect() {
210210
.getBean(ISpringWebFluxTemplateEngine.class);
211211
Context attrs = new Context(Locale.UK,
212212
Collections.singletonMap("foo", "bar"));
213-
String result = engine.process("data-dialect", attrs);
213+
String result = engine.process("data-dialect", attrs).trim();
214214
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
215215
});
216216
}
@@ -221,7 +221,7 @@ public void useJava8TimeDialect() {
221221
ISpringWebFluxTemplateEngine engine = context
222222
.getBean(ISpringWebFluxTemplateEngine.class);
223223
Context attrs = new Context(Locale.UK);
224-
String result = engine.process("java8time-dialect", attrs);
224+
String result = engine.process("java8time-dialect", attrs).trim();
225225
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
226226
});
227227
}
@@ -251,7 +251,7 @@ public void renderTemplate() {
251251
.getBean(ISpringWebFluxTemplateEngine.class);
252252
Context attrs = new Context(Locale.UK,
253253
Collections.singletonMap("foo", "bar"));
254-
String result = engine.process("home", attrs);
254+
String result = engine.process("home", attrs).trim();
255255
assertThat(result).isEqualTo("<html><body>bar</body></html>");
256256
});
257257
}

‎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
@@ -98,7 +98,7 @@ public void createFromConfigClass() {
9898
TemplateEngine engine = context.getBean(TemplateEngine.class);
9999
Context attrs = new Context(Locale.UK,
100100
Collections.singletonMap("foo", "bar"));
101-
String result = engine.process("template.html", attrs);
101+
String result = engine.process("template.html", attrs).trim();
102102
assertThat(result).isEqualTo("<html>bar</html>");
103103
});
104104
}
@@ -225,7 +225,7 @@ public void useDataDialect() {
225225
TemplateEngine engine = context.getBean(TemplateEngine.class);
226226
Context attrs = new Context(Locale.UK,
227227
Collections.singletonMap("foo", "bar"));
228-
String result = engine.process("data-dialect", attrs);
228+
String result = engine.process("data-dialect", attrs).trim();
229229
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
230230
});
231231
}
@@ -235,7 +235,7 @@ public void useJava8TimeDialect() {
235235
this.contextRunner.run((context) -> {
236236
TemplateEngine engine = context.getBean(TemplateEngine.class);
237237
Context attrs = new Context(Locale.UK);
238-
String result = engine.process("java8time-dialect", attrs);
238+
String result = engine.process("java8time-dialect", attrs).trim();
239239
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
240240
});
241241
}
@@ -265,7 +265,7 @@ public void renderTemplate() {
265265
TemplateEngine engine = context.getBean(TemplateEngine.class);
266266
Context attrs = new Context(Locale.UK,
267267
Collections.singletonMap("foo", "bar"));
268-
String result = engine.process("home", attrs);
268+
String result = engine.process("home", attrs).trim();
269269
assertThat(result).isEqualTo("<html><body>bar</body></html>");
270270
});
271271
}

‎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-schema.ldif

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
1414
SUP top
1515
AUXILIARY
1616
MAY exampleAttributeName
17-
X-ORIGIN 'Managing Schema Document' )
17+
X-ORIGIN 'Managing Schema Document' )

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
custom
1+
custom

‎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/custom-templates/custom.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
yield "custom"
1+
yield "custom"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
custom
1+
custom

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO BAR VALUES (1, 'Andy');
1+
INSERT INTO BAR VALUES (1, 'Andy');

‎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/ehcache3.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
</expiry>
2424
</cache>
2525

26-
</config>
26+
</config>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
33
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4-
</configuration>
4+
</configuration>

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

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

‎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/mustache-templates/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
<h2>A Message</h2>
77
<div>{{message}} at {{time}}</div>
88
</body>
9-
</html>
9+
</html>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
</div>
1313
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
1414
</body>
15-
</html>
15+
</html>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
</div>
1313
<div class="jumbotron">{{>content}}</div>
1414
</body>
15-
</html>
15+
</html>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CREATE TABLE SPAM (
22
id INTEGER IDENTITY PRIMARY KEY,
33
name VARCHAR(30),
4-
);
4+
);

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO FOO VALUES (1, 'Andy');
1+
INSERT INTO FOO VALUES (1, 'Andy');

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
INSERT INTO BAR(id, name) VALUES (1, 'bar');
2-
INSERT INTO BAR(id, name) VALUES (2, 'ばー');
2+
INSERT INTO BAR(id, name) VALUES (2, 'ばー');

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CREATE TABLE FOO (
22
id INTEGER IDENTITY PRIMARY KEY,
33
name VARCHAR(30),
4-
);
4+
);

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
404 page
1+
404 page

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4xx page
1+
4xx page

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CREATE TABLE BAR (
22
id INTEGER IDENTITY PRIMARY KEY,
33
name VARCHAR(30),
4-
);
4+
);

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

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

‎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/home.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
home
1+
home

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

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

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
home
1+
home

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ <h1 layout:fragment="title">Layout</h1>
1111
</div>
1212
</div>
1313
</body>
14-
</html>
14+
</html>

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Message: ${greeting}
1+
Message: ${greeting}

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

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

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Message: ${greeting}
1+
Message: ${greeting}

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
prefixed
1+
prefixed

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
yield "prefixed"
1+
yield "prefixed"

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
prefixed
1+
prefixed

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
suffixed
1+
suffixed

‎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/templates/view.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
1+
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
22
<head>
33
<title layout:fragment="title">Content</title>
44
</head>
@@ -7,4 +7,4 @@
77
<span th:text="${foo}">foo</span>
88
</div>
99
</body>
10-
</html>
10+
</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/.m2/settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
</proxy>
3131
</proxies>
3232

33-
</settings>
33+
</settings>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<settingsSecurity>
22
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
3-
</settingsSecurity>
3+
</settingsSecurity>

‎spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
</proxy>
2929
</proxies>
3030

31-
</settings>
31+
</settings>

‎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-cli/src/test/resources/schema-all.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CREATE TABLE FOO (
22
id INTEGER IDENTITY PRIMARY KEY,
33
name VARCHAR(30),
4-
);
4+
);

‎spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ <h1 th:text="${title}">Title</h1>
2222
2012 2:17:16 PM CDT</div>
2323
</div>
2424
</body>
25-
</html>
25+
</html>

0 commit comments

Comments
 (0)