Skip to content

Commit ccfbd03

Browse files
philwebbphilwebb
committed
Merge branch '2.0.x' into 2.1.x
2 parents d057f49 + b442d3b commit ccfbd03

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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void createFromConfigClass() {
9595
TemplateEngine engine = context.getBean(TemplateEngine.class);
9696
Context attrs = new Context(Locale.UK,
9797
Collections.singletonMap("foo", "bar"));
98-
String result = engine.process("template.html", attrs);
98+
String result = engine.process("template.html", attrs).trim();
9999
assertThat(result).isEqualTo("<html>bar</html>");
100100
});
101101
}
@@ -222,7 +222,7 @@ public void useDataDialect() {
222222
TemplateEngine engine = context.getBean(TemplateEngine.class);
223223
Context attrs = new Context(Locale.UK,
224224
Collections.singletonMap("foo", "bar"));
225-
String result = engine.process("data-dialect", attrs);
225+
String result = engine.process("data-dialect", attrs).trim();
226226
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
227227
});
228228
}
@@ -232,7 +232,7 @@ public void useJava8TimeDialect() {
232232
this.contextRunner.run((context) -> {
233233
TemplateEngine engine = context.getBean(TemplateEngine.class);
234234
Context attrs = new Context(Locale.UK);
235-
String result = engine.process("java8time-dialect", attrs);
235+
String result = engine.process("java8time-dialect", attrs).trim();
236236
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
237237
});
238238
}
@@ -262,7 +262,7 @@ public void renderTemplate() {
262262
TemplateEngine engine = context.getBean(TemplateEngine.class);
263263
Context attrs = new Context(Locale.UK,
264264
Collections.singletonMap("foo", "bar"));
265-
String result = engine.process("home", attrs);
265+
String result = engine.process("home", attrs).trim();
266266
assertThat(result).isEqualTo("<html><body>bar</body></html>");
267267
});
268268
}

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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' )

0 commit comments

Comments
 (0)