8ffaa54e74
Merge branch '1.5.x'
2017-01-23 23:45:44 -08:00
2c89d9918f
Relocate AutoConfigurations from root package
...
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.
Fixes gh-8071
2017-01-23 17:32:45 -08:00
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
be3fe12cf0
Polish
2016-12-30 11:46:24 -08:00
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
e0dfff2b23
Merge branch '1.5.x'
2016-11-22 14:54:17 -08:00
88c84ce234
Merge branch '1.4.x' into 1.5.x
2016-11-22 14:53:30 -08:00
ce58e16860
Add additional Tomcat timeout test
...
Update the Tomcat sample to also test that the connection timeout is
set.
See gh-7425
2016-11-22 14:30:36 -08:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
5f959b074f
Next Development Version
2016-09-20 20:20:06 +00:00
07a50bb16c
Update the samples to make use of auto-configured TestRestTemplate
...
Closes gh-6730
2016-08-25 12:07:40 +01:00
334baaeffd
Next development version
2016-07-28 19:54:01 +00:00
a89ef5df6e
Next Development Version
2016-07-28 09:18:40 +00:00
2216369348
Next Development Version
2016-07-04 14:15:02 +00:00
bcfa2e6676
Make TestRestTemplate not extend RestTemplate
...
Update TestRestTemplate so that it no longer directly extends
RestTemplate. Prior to this commit it was possible that TestRestTemplate
could interfere with user defined RestTemplate beans.
TestRestTemplate offers the same methods as RestTemplate so should be
a drop-in replacement. If access is needed to the actual underlying
template the `getRestTemplate()` method should be used.
Fixes gh-5915
2016-05-16 12:35:31 -07:00
819a9574a6
Next Development Version
2016-05-10 05:28:34 +00:00
3348ed5bb3
Make use of new GetMapping and PostMapping annotations
...
Closes gh-5277
2016-05-09 17:08:16 +01:00
376bbe68d8
Next Development Version
2016-05-06 11:23:57 +00: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
225d877ab9
Next Development Version
2016-02-26 01:06:16 -08: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
fbaf209240
Move master to 1.4.0.BUILD-SNAPSHOT
2016-01-24 10:45:24 -08:00
504d3e97ba
Next development version
2016-01-21 18:41:30 -08:00
8db59059a5
Next Development Version
2015-12-18 05:43:02 -08:00
1b81d9f0b5
Add support for server.server-header property
...
Add a `server.server-header` property which can be used to override the
`server` header usually sent back automatically by Tomcat/Jetty or
Undertow.
See https://www.owasp.org/index.php/Securing_tomcat for background.
Fixes gh-4461
Closes gh-4504
2015-12-12 21:24:29 +00:00
0e09408f91
Merge branch '1.2.x'
2015-12-03 11:10:52 +00:00
d6bd120b2c
Remove unused test.css from spring-boot-sample-tomcat
...
Closes gh-4606
2015-12-03 11:10:15 +00:00
3f6f57a80e
Next Development Version
2015-11-16 03:18:54 -08: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
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
2b38a861e3
Next Development Version
2015-10-16 05:57:24 -07:00
c9fb9916b8
Reformat code using Eclipse Mars
2015-10-07 23:37:10 -07:00
e473364e4e
Merge branch '1.2.x'
2015-10-07 23:34:08 -07:00
6ab376e2e8
Reformat code use Eclipse Mars
2015-10-07 23:32:31 -07:00
9409c49c10
Next development version
2015-09-16 09:00:17 -07:00
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
2015-08-19 17:09:34 +02:00
7ce391db4f
Next development version
2015-07-01 22:48:01 -07:00
d213cc05d5
Polish
2015-06-29 16:48:59 -07:00
00d594dcda
Replace GzipFilter and Tomcat compression with general purpose approach
...
Closes gh-3296
2015-06-29 15:58:57 +01:00
5d81c87b43
Next Development Version
2015-06-04 00:49:11 -07:00
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
a57a88f5cf
Move master to 1.3.0.BUILD-SNAPSHOT
2015-02-26 17:01:02 -08:00
8f0ad02237
Next development version
2015-02-26 15:26:53 -08:00
60725cd8bd
Next development version
2015-01-07 23:37:07 -08:00
978cf8c2e6
Polish @WebIntegrationTest support
...
See gh-2299
2015-01-07 14:07:28 -08:00
1a788c1741
Next development version
2014-12-10 16:35:50 -08:00
21115f29cf
Remove accidental SampleControllerAdvice test
...
Accidentally committed in 4668f59723
2014-11-18 12:45:53 -08:00
4668f59723
Improve relaxed enum binding
...
Update RelaxedConversionService to support more relaxed enum binding.
Fixes gh-1950
2014-11-18 11:24:32 -08:00
d039f43107
Update samples to use @SpringBootApplication
...
Update the relevant samples to use the new @SpringBootApplication
annotation.
Closes gh-1842
2014-11-06 22:51:09 -08:00
249e09d9bc
Switch master to 1.2.0.BUILD-SNAPSHOT
2014-07-11 10:44:05 +02:00
40327e1ae6
Next development version
2014-07-08 02:33:36 -07:00
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
981669b7c0
Next development version
2014-06-26 14:09:54 -07:00
200cd535c2
Revert "Next development version"
...
This reverts commit 67189477fe
2014-06-26 11:03:09 -07:00
67189477fe
Next development version
2014-06-26 10:51:35 -07:00
542f3cbda8
Next development version
2014-06-24 13:53:56 -07:00
a2efe17fc9
Polish
2014-06-18 16:30:22 -07:00
4ca26a21dc
Next development version
2014-06-11 10:46:27 -07:00
05ed7b3bcd
Next development version
2014-06-10 12:40:35 -07:00
3007a777d0
Roll back to 1.1.0.BUILD-SNAPSHOT
2014-06-10 09:00:08 -07:00
c650f2391e
Next development version
2014-06-09 21:55:19 -07:00
64a835e91a
Move master to 1.1.0.BUILD-SNAPSHOT
2014-04-24 12:45:20 +01:00
d3954a1703
Next development version
2014-04-24 02:24:28 -07:00
fad5ce45db
Polish
2014-04-23 12:35:33 +01:00
7b07fe8ce0
Convert remaining samples to use random port
...
Partial fix for gh-337. See also gh-607 which complements this, but might
conflict on a merge.
2014-04-17 20:29:04 -07:00
a5864ebcd0
Next development version
2014-04-06 22:43:18 -07:00
15e9dbe98b
Next development version
2014-04-01 03:05:51 -07:00
1e68b7e0a9
Remove superfluous <packaging> tags from POMs
2014-04-01 02:07:43 -07:00
0af7f7e347
Add missing POM info
2014-04-01 02:07:42 -07:00
488b03387f
Polish POM formatting
2014-04-01 02:07:36 -07:00
6f9bb233ad
Revert "Next development version"
...
This reverts commit b67bb70ee3
2014-04-01 00:38:48 -07:00
b67bb70ee3
Next development version
2014-03-31 22:38:42 -07:00
ac4cdd33c3
Revert "Next development version"
...
This reverts commit 1d0eea12eb
2014-03-31 17:14:30 -07:00
1d0eea12eb
Next development version
2014-03-28 11:47:09 -07:00
aca67066bf
Rename RestTemplates to TestRestTemplate
...
Rename the RestTemplates to TestRestTemplate to help indicate that it's
primarily intended for testing. Also now extend RestTemplate to allow
direct use, rather than via factory methods.
Fixes gh-599
2014-03-27 11:22:03 -07:00
80ac1fb0cd
Polish
2014-03-15 13:02:01 -07:00
7a285cf65d
Convert all sample tests to @IntegrationTest where appropriate
...
Makes them a lot more readable IMO, and also enables @Autowiring
from the context into the test case (sweeet). I added @DirtiesContext
to all of them as well to be on the safe side, but possbly that can be
optimized in some way as well.
2014-03-11 13:54:30 +00:00
ab6c8dfee3
Use org.springframework.boot groupId in spring-boot-samples
...
Use org.springframework.boot instead of ${project.groupId}
groupId in order to make it easier to use spring-boot-samples
modules as a starting point for new projects.
2014-03-07 17:02:20 +00:00
b0d4e8ae69
Next development version
2014-03-03 22:46:12 -08:00
cb8668a151
Release version 1.0.0.RC4
2014-03-03 22:46:05 -08:00
cf23b519d2
Polish
2014-02-24 13:43:54 -08:00
b2b487ee5f
Add ServletRegistrationBean for DispatcherServlet
...
Mapping is exposed via server.servletPath.
Fixes gh-379
2014-02-20 09:49:24 +00:00
1367d57e8c
Next development version
2014-02-13 13:19:12 -08:00
eaff1677a7
Release version 1.0.0.RC3
2014-02-13 13:18:56 -08:00
0160760568
Apply latest eclipse cleanup rules
2014-01-21 16:28:26 -08:00
68293f34af
Upgrade version to 1.0.0.BUILD-SNAPSHOT
...
Fixes fg-243
2014-01-21 00:43:54 -08:00
559f907b54
Use explicit test dependencies in samples
2014-01-17 09:08:18 +00:00
1bcd3de7b5
Polish
2014-01-02 12:10:37 -08:00
f448e79f29
Remove long package names from samples
...
Long package names are really unnecessary in samples and they
just clutter things up. Also Spring Loaded doesn't work with
org.sfw packages, so to demo that technology you need a
different package name.
2013-12-31 08:40:26 +00:00
Phillip Webb
Spring Buildmaster
Stephane Nicoll
Andy Wilkinson
Eddú Meléndez
Ivan Chen
Huang YunKun
Stephane Nicoll
Phillip Webb
Dave Syer
Sebastien Deleuze