Andy Wilkinson
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
Andy Wilkinson
10402a651f
Close context to ensure that logging system is cleaned up
...
See gh-6688
2016-08-25 20:41:43 +01:00
Phillip Webb
2f815a907a
Migrate existing tests from deprecated package
...
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:
find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;
See gh-5293
2016-03-23 22:17:50 -07:00
Phillip Webb
634bb770b2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:58:34 -07:00
Phillip Webb
f3f562f386
Support <springProfile> in logback configurations
...
Include support for a new <springProfile> element which can be used in
`logback-spring.xml` files to selectively enable or disable parts of the
configuration. For example:
<configuration>
...
<springProfile name="staging">
<logger name="sample.logback" level="TRACE" />
</springProfile>
...
</configuration>
Fixes gh-3338
2015-06-26 15:59:07 -07:00
Phillip Webb
5bc8f0f708
Add logback sample application
...
Add a logback sample application to demonstrate how `logback-spring.xml`
can be used for customization.
See gh-2558
2015-06-26 15:59:07 -07:00