root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source
pull/17068/head
Phillip Webb 6 years ago
parent d057f49618 b442d3b906
commit ccfbd03482
107 changed files with 130 additions and 112 deletions
Show Stats Download Patch File Download Diff File

7
pom.xml
Unescape Escape View File

@ -25,6 +25,7 @@
</activation>
<properties>
<spring-javaformat.version>0.0.9</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties>
<build>
<plugins>
@ -43,6 +44,11 @@
<artifactId>spring-javaformat-checkstyle</artifactId>
<version>${spring-javaformat.version}</version>
</dependency>
<dependency>
<groupId>io.spring.nohttp</groupId>
<artifactId>nohttp-checkstyle</artifactId>
<version>${nohttp-checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
@ -54,6 +60,7 @@
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<resourceIncludes>**\/*.*</resourceIncludes>
</configuration>
<goals>
<goal>check</goal>

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html
Unescape Escape View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html
Unescape Escape View File

@ -0,0 +1 @@

2
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql
Unescape Escape View File

@ -1 +1 @@
DROP TABLE IF EXISTS TEST;
DROP TABLE IF EXISTS TEST;

2
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
Unescape Escape View File

@ -1 +1 @@
DROP TABLE IF EXISTS TEST;
DROP TABLE IF EXISTS TEST;

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
Unescape Escape View File

@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}
@ -210,7 +210,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.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>");
});
}
@ -221,7 +221,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = 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>");
});
}
@ -251,7 +251,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.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>");
});
}

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
Unescape Escape View File

@ -95,7 +95,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}
@ -222,7 +222,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}
@ -232,7 +232,7 @@ public class ThymeleafServletAutoConfigurationTests {
this.contextRunner.run((context) -> {
TemplateEngine engine = 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>");
});
}
@ -262,7 +262,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
Unescape Escape View File

@ -15,4 +15,4 @@
</basic>
</attributes>
</entity>
</entity-mappings>
</entity-mappings>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
Unescape Escape View File

@ -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');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
Unescape Escape 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
Unescape Escape View File

@ -1 +1 @@
custom
custom

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
Unescape Escape View File

@ -0,0 +1 @@

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

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

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

@ -1 +1 @@
custom
custom

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
Unescape Escape 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/db/non-annotated-data.sql
Unescape Escape View File

@ -1 +1 @@
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');

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

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

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml
Unescape Escape 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
Unescape Escape View File

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

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
Unescape Escape View File

@ -0,0 +1 @@

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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/jdbc/another.sql
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache
Unescape Escape View File

@ -1 +1 @@
404 page
404 page

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache
Unescape Escape View File

@ -1 +1 @@
4xx page
4xx page

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
Unescape Escape 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
Unescape Escape View File

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

6
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
Unescape Escape View File

@ -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>

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

@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
Unescape Escape 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
Unescape Escape View File

@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
Unescape Escape 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
Unescape Escape View File

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

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

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

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
Unescape Escape 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
Unescape Escape View File

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

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

@ -1 +1 @@
prefixed
prefixed

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

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

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

@ -1 +1 @@
prefixed
prefixed

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

@ -1 +1 @@
suffixed
suffixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
Unescape Escape View File

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

4
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
Unescape Escape 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>

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
Unescape Escape View File

@ -0,0 +1 @@

13
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
Unescape Escape View File

@ -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>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
Unescape Escape View File

@ -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>

2
spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml
Unescape Escape 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
Unescape Escape 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
Unescape Escape View File

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

1
spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file
Unescape Escape View File

@ -0,0 +1 @@

2
spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape View File

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

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script
Unescape Escape View File

@ -1 +1 @@
FOO=BAR
FOO=BAR

1
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
Unescape Escape View File

@ -0,0 +1 @@

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
Unescape Escape View File

@ -62,7 +62,7 @@ public class MustacheViewTests {
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");
}
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
Unescape Escape View File

@ -64,7 +64,7 @@ public class MustacheViewTests {
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");
}
}

2
spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
Unescape Escape View File

@ -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

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

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

2
spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
Unescape Escape View File

@ -1 +1 @@
spring.main.web-application-type: reactive
spring.main.web-application-type: reactive

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

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

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html
Unescape Escape View File

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

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html
Unescape Escape View File

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

2
spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml
Unescape Escape View File

@ -17,4 +17,4 @@ spring:
profiles: "!other"
my:
property: fromnototherprofile
notother: foo
notother: foo

2
spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml
Unescape Escape View File

@ -11,4 +11,4 @@ spring:
profiles: (dev | other) & another
my:
property: devorotherandanother
---
---

2
spring-boot-project/spring-boot/src/test/resources/testprofiles.yml
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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
Unescape Escape View File

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

2
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
Unescape Escape 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
Unescape Escape View File

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

2
spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
Unescape Escape View File

@ -18,4 +18,4 @@
<AppenderRef ref="Console"/>
</Root>
</Loggers>
</Configuration>
</Configuration>

2
spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
Unescape Escape View File

@ -11,4 +11,4 @@
<jsr107:mbeans enable-statistics="true"/>
</cache>
</config>
</config>

2
spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql
Unescape Escape View File

@ -6,4 +6,4 @@ CREATE TABLE PERSON (
create sequence person_sequence start with 1 increment by 1;
insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
insert into PERSON (first_name, last_name) values ('Dave', 'Syer');

2
spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql
Unescape Escape View File

@ -1 +1 @@
DROP ALL OBJECTS;
DROP ALL OBJECTS;

2
spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql
Unescape Escape View File

@ -14,4 +14,4 @@ insert into note_tags(notes_id, tags_id) values (1, 3)
insert into note_tags(notes_id, tags_id) values (2, 3)
insert into note_tags(notes_id, tags_id) values (3, 3)
insert into note_tags(notes_id, tags_id) values (4, 2)
insert into note_tags(notes_id, tags_id) values (4, 3)
insert into note_tags(notes_id, tags_id) values (4, 3)

2
spring-boot-samples/spring-boot-sample-profile/application.yml
Unescape Escape View File

@ -1 +1 @@
hello: Bonjour
hello: Bonjour

2
spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
Unescape Escape View File

@ -4,4 +4,4 @@ name: Phil
spring:
profiles: goodbye,dev
name: Everyone
name: Everyone

2
spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html
Unescape Escape View File

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

2
spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html
Unescape Escape View File

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

2
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql
Unescape Escape View File

@ -1,3 +1,3 @@
insert into users (username, password, enabled) values ('user', '{noop}user', true);
insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');

2
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql
Unescape Escape View File

@ -7,4 +7,4 @@ create table users (
create table authorities (
username varchar(256),
authority varchar(256)
);
);

2
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html
Unescape Escape View File

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

2
spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
Unescape Escape View File

@ -7,4 +7,4 @@ create table users (
create table authorities (
username varchar(256),
authority varchar(256)
);
);

2
spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
Unescape Escape View File

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

2
spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
Unescape Escape View File

@ -23,4 +23,4 @@
<xs:element name="LastName" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
</xs:schema>

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save