aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
db75347eb6
Merge branch '2.1.x'
2019-06-04 14:41:20 -07:00
0ef331018e
Merge branch '2.0.x' into 2.1.x
2019-06-04 14:30:52 -07:00
7fc01971ed
Merge branch '1.5.x' into 2.0.x
2019-06-04 14:20:25 -07:00
d548c5ed31
Fix checkstyle violations
2019-06-04 12:45:23 -07:00
1db1c8b03c
Validate our own tests work with JUnit5 and the vintage engine
...
Closes gh-14737
Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-05-08 16:05:44 +02:00
ddbfb2530d
Update copyright header of changed files
2019-04-03 17:01:00 -07:00
ad7eebee9e
Merge branch '2.1.x'
2019-04-03 17:00:25 -07:00
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
878a635bfb
Merge branch '2.1.x'
2019-03-28 11:48:47 +00:00
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
94633cfd89
Merge branch '1.4.x' into 1.5.x
2019-03-27 14:04:32 +00:00
baec3d6e8e
Merge branch '1.3.x' into 1.4.x
2019-03-27 12:22:40 +00:00
e401d02ced
Use HTTPS for external links wherever possible
...
See gh-16316
2019-03-27 11:35:54 +00:00
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
79c53de30c
Merge branch '1.4.x' into 1.5.x
2019-03-26 13:44:03 +00:00
46d6fb0e1c
Merge branch '1.3.x' into 1.4.x
2019-03-26 13:40:26 +00:00
adc2462689
Use HTTPS for external links from XML files where possible
...
See gh-16311
2019-03-26 13:37:30 +00:00
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
4b6bddd476
Merge branch '1.4.x' into 1.5.x
2019-03-20 16:30:04 +00:00
6920c39349
Merge branch '1.3.x' into 1.4.x
2019-03-20 15:06:50 +00:00
0e009ef047
Use HTTPS to link to the Apache license
2019-03-20 15:00:10 +00:00
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
68bfb020aa
Reduce need for bean method proxying and disable where not needed
...
Closes gh-9068
2019-03-12 13:18:42 +00:00
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
4853477081
Reformat code
2018-05-25 18:17:37 -07:00
adfb6dc128
Polish
2018-01-25 13:20:29 -08:00
d65f9b25bc
Remove redundant throws Exception
2018-01-25 17:25:38 +05:30
23218add90
Polish
2017-12-12 11:57:30 +01:00
512030f4fa
Polish "Samples cleanup"
...
Closes gh-10548
2017-11-14 15:49:56 +01:00
d8fa71bc97
Samples cleanup
...
- Modifying dependencies to starter-web with tomcat exclusion plus
alternative servlet container instead of manual dependency on
spring-webmvc as it is the preferrable way to use alternative servlet
container
- Previously RestTemplate with ssl was configured manually in tests - now
it rellies on autoconfiguration - changed this for multi-connector test
and added test to ensure that ssl autoconfiguration is working
- Most samples with alterntative servlet containers used some kind of
service reading property and returning default since it wasn't
configured - removed it, since it is not specific to using alternative
servlet containers.
See gh-10548
2017-11-14 15:39:27 +01:00
06558675bb
Polish
2017-04-25 09:45:14 -07:00
c2e5fd031a
Replace usage of WebMvcConfigurerAdapter
...
Closes gh-8964
2017-04-24 15:31:39 -07:00
07a50bb16c
Update the samples to make use of auto-configured TestRestTemplate
...
Closes gh-6730
2016-08-25 12:07:40 +01:00
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
2016-04-28 12:45:15 -07:00
b398b3319c
Rename @SpringApplicationTest -> @SpringBootTest
...
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.
Fixes gh-5562
2016-04-04 22:36:58 -07:00
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
2016-03-31 21:35:10 -07:00
0829a1bde8
Drop superfluous annotations
...
Update internal tests to drop annotations that can now
be inferred.
Fixes gh-5470
2016-03-23 22:19:36 -07:00
c28f552883
Migrate SpringJUnit4ClassRunner to SpringRunner
...
Replace all existing SpringJUnit4ClassRunner references with the new
SpringRunner alias.
Fixes gh-5292
2016-03-23 22:18:18 -07:00
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
2526a54e31
Polish contribution
...
Closes gh-5337
2016-03-14 14:24:24 +01:00
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
2016-02-25 12:09:42 +00:00
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
2016-02-06 15:51:26 -08:00
bead239448
Remove support for Log4j
...
Apache Log4j 1.x is EOL and has now been replaced by log4j 2. This commit
removes the deprecated support for Log4j 1.x
See gh-4905
2016-01-25 14:06:06 +01:00
1c5e445554
Update the samples to use @WebIntegrationTest and randomPort=true
...
Closes gh-4294
Closes gh-4271
2015-10-27 11:56:01 +00:00
1e4d974ec0
Merge remote-tracking branch 'local12x/1.2.x'
2015-10-19 12:56:55 -07:00
Andy Wilkinson
Phillip Webb
Madhura Bhave
Spring Operator
Stephane Nicoll
Ivan Sopov
Huang YunKun