21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
e69296d7d3
Fix checkstyle violations in samples
2018-05-25 18:18:00 -07:00
010b4fccbd
Next development version
2018-05-09 09:31:46 +00:00
c10aad165f
Next Development Version
2018-04-09 23:14:33 +00:00
ade4760842
Next Development Version
2018-04-05 09:01:52 +00:00
8608202e56
Remove Surefire workarounds that are not needed with 2.21
...
Closes gh-12721
2018-04-05 07:48:09 +01:00
4a47ab4b3e
Make JAX-B available to the Jersey 1 sample on Java 9
2018-04-05 07:13:10 +01:00
065456a4af
Make JAX-B available to Jersey sample when building with JDK 10
...
See gh-12028
2018-03-03 17:52:41 +00:00
6414b42335
Next Development Version
2018-01-30 23:29:33 +00:00
df2ae7aa19
Next Development Version
2017-11-28 09:55:46 +00:00
c0f9f64776
Next Development Version
2017-10-16 12:36:43 +00:00
2855010841
Fix sample POMs
...
Update sample POMs to follow CI friendly Maven conventions.
See gh-9316
2017-10-04 16:34:39 -07:00
30eb937a83
Next Development Version
2017-09-12 10:54:22 +00:00
17a5bb0be4
Next development version
2017-07-27 08:00:21 +00:00
41c5c0e7c9
Next development version
2017-07-26 08:30:55 +00:00
05d4d0281c
Next Development Version
2017-06-08 12:47:16 +00:00
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
67556ba8ea
Restructure embedded web server packages
...
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:
Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server
Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter
Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server
Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded
In addition:
- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
`ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
`ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.
Fixes gh-8532
2017-03-12 21:08:25 -07:00
d8f827d224
Cleanup and format code
2017-03-06 17:08:09 -08:00
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
df08863641
Make ServletRegistrationBean and FilterRegistration bean generic
...
Closes gh-7666
2017-02-09 13:36:35 +00:00
95f659f4f9
Add new WebApplicationType enum to pave the way for Web Flux support
...
Closes gh-8077
2017-01-30 20:26:24 +00:00
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00: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
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +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
609cb52cd4
Move to relocated web classes
...
Refactor code to move from recently deprecated classes.
Closes gh-5822
2016-04-28 12:45:15 -07: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
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
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
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
Phillip Webb
Spring Buildmaster
Andy Wilkinson
Stephane Nicoll
Huang YunKun