67 Commits (1d589fc55a06a47b06d50ba2f993f2d21e9de168)

Author	SHA1	Message	Date
Phillip Webb	53f1df86a2	Merge branch '1.5.x'	8 years ago
Phillip Webb	be3fe12cf0	Polish	8 years ago
Stephane Nicoll	6643ec3713	Next development version	8 years ago
Spring Buildmaster	7e9ed5e1a7	Next Development Version	8 years ago
Spring Buildmaster	334baaeffd	Next development version	8 years ago
Andy Wilkinson	3348ed5bb3	Make use of new GetMapping and PostMapping annotations ... Closes gh-5277	9 years ago
Phillip Webb	a7cb689f95	Move @LocalServerPort annotation ... Move the @LocalServerPort to org.springframework.boot.context.embedded since it's only really useful when working with embedded servlet containers. See gh-5822	9 years ago
Phillip Webb	b398b3319c	Rename @SpringApplicationTest -> @SpringBootTest ... Rename @SpringApplicationTest to SpringBootTest and @SpringApplicationContextLoader to @SpringBootContextLoader. Fixes gh-5562	9 years ago
Andy Wilkinson	33f0ea3480	Rework SpringApplicationTest to support web modes ... Rework the new testing support so that @SpringApplicationTest can be used for standard integration tests, web integration tests with a mock Servlet environment and web integration tests with an embedded servlet container. This means that it a replacement for 1.3's @IntegrationTest and @WebIntegrationTest and allows all SpringApplication testing to be configured using a common annotation. The old @IntegrationTest and @WebIntegrationTest along with their supporting classes have been reinstated to their previous form (while remaining deprecated). This should ensure that they continue to work in 1.4 exactly as they did in 1.3 giving users a smooth path to @SpringApplicationTest. See gh-5477	9 years ago
Phillip Webb	0829a1bde8	Drop superfluous annotations ... Update internal tests to drop annotations that can now be inferred. Fixes gh-5470	9 years ago
Phillip Webb	c28f552883	Migrate SpringJUnit4ClassRunner to SpringRunner ... Replace all existing SpringJUnit4ClassRunner references with the new SpringRunner alias. Fixes gh-5292	9 years ago
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	9 years ago
Stephane Nicoll	2526a54e31	Polish contribution ... Closes gh-5337	9 years ago
Andy Wilkinson	44ddfcc7fa	Upgrade copyright headers of all files changed in 2016	9 years ago
Phillip Webb	1cc1fc6431	Use AssertJ in spring-boot-samples ... See gh-5083	9 years ago
Phillip Webb	fbaf209240	Move master to 1.4.0.BUILD-SNAPSHOT	9 years ago
Spring Buildmaster	504d3e97ba	Next development version	9 years ago
Spring Buildmaster	8db59059a5	Next Development Version	9 years ago
Stephane Nicoll	f269383803	Polish contribution ... Closes gh-4770	9 years ago
David Morley	288aa962c4	Rename method to clarify which connector is being created ... See gh-4770	9 years ago
Spring Buildmaster	3f6f57a80e	Next Development Version	9 years ago
Andy Wilkinson	248fcbec5d	Merge branch '1.2.x'	9 years ago
Andy Wilkinson	05b501ce41	Update Tomcat multi-connectors sample to configure SSL declaratively ... The documentation recommends configuring the HTTP connector in code and using application.properties to configure the HTTPS connector as it's easier. This commit updates the sample to follow that recommendation. Closes gh-4342	9 years ago
Huang YunKun	1c5e445554	Update the samples to use @WebIntegrationTest and randomPort=true ... Closes gh-4294 Closes gh-4271	9 years ago
Phillip Webb	1e4d974ec0	Merge remote-tracking branch 'local12x/1.2.x'	9 years ago
Phillip Webb	a79131f8d2	Organize imports with new settings ... See gh-4234	9 years ago
Spring Buildmaster	2b38a861e3	Next Development Version	9 years ago
Phillip Webb	e473364e4e	Merge branch '1.2.x'	9 years ago
Phillip Webb	6ab376e2e8	Reformat code use Eclipse Mars	9 years ago
Spring Buildmaster	9409c49c10	Next development version	9 years ago
Phillip Webb	2615990ffb	Organize imports	9 years ago
Stephane Nicoll	7c0c953f81	Add value alias for SpringApplicationConfiguration ... Given that Spring Boot uses java config accross the board, a new `value` attribute is now aliased to the existing `classes` attribute such that one could write the following: @SpringApplicationConfiguration(MyConfig.class) public class MyTest {} Closes gh-3635	9 years ago
Spring Buildmaster	7ce391db4f	Next development version	10 years ago
Phillip Webb	61fc4f3f12	Polish copyright headers	10 years ago
Phillip Webb	1ce617f1ae	Polish sample package names	10 years ago
Spring Buildmaster	5d81c87b43	Next Development Version	10 years ago
Andy Wilkinson	2085a5b0cf	Work around the behaviour change in latest Spring 4.2 snapshots ... The changes made in spring-projects/spring-framework@e403aefe cause SampleTomcatTwoConnectorsApplication to fail to launch. The port bean, typed as an int, is coerced into an Integer when the bean’s created. The port() method is then called, and the proxy’s bean method interceptor complains as it’s expecting the port bean to be an int but it’s actually an Integer. Changing the port() bean method’s return type to Integer works around the problem.	10 years ago
Spring Buildmaster	e03c11dda8	Next development version	10 years ago
Phillip Webb	a57a88f5cf	Move master to 1.3.0.BUILD-SNAPSHOT	10 years ago
Spring Buildmaster	8f0ad02237	Next development version	10 years ago
Spring Buildmaster	60725cd8bd	Next development version	10 years ago
Spring Buildmaster	1a788c1741	Next development version	10 years ago
Phillip Webb	a641f0c72a	Polish	10 years ago
Phillip Webb	d039f43107	Update samples to use @SpringBootApplication ... Update the relevant samples to use the new @SpringBootApplication annotation. Closes gh-1842	10 years ago
Stephane Nicoll	249e09d9bc	Switch master to 1.2.0.BUILD-SNAPSHOT	11 years ago
Spring Buildmaster	40327e1ae6	Next development version	11 years ago
Phillip Webb	fa88c481a5	Remote trailing whitespace	11 years ago
Spring Buildmaster	981669b7c0	Next development version	11 years ago
Phillip Webb	200cd535c2	Revert "Next development version" ... This reverts commit 67189477fe.	11 years ago
Spring Buildmaster	67189477fe	Next development version	11 years ago