Phillip Webb
9db72450da
Merge branch '1.5.x'
2017-07-19 10:23:23 -07:00
Phillip Webb
68910f2b8f
Polish
2017-07-19 10:21:06 -07:00
Madhura Bhave
ecaa6340e2
Update path in actuator sample tests
2017-07-17 19:22:33 -07:00
Madhura Bhave
b58923a42d
Merge branch '1.5.x'
2017-07-17 11:27:08 -07:00
Madhura Bhave
0f8a819af9
Enable cors in default management security config
...
Fixes gh-9548
2017-07-17 10:49:48 -07:00
Stephane Nicoll
aa083996f9
Fixup version numbers following release
2017-06-08 17:38:11 +03:00
Spring Buildmaster
05d4d0281c
Next Development Version
2017-06-08 12:47:16 +00:00
Phillip Webb
06558675bb
Polish
2017-04-25 09:45:14 -07:00
Stephane Nicoll
9327b58304
Fixup version numbers following release
2017-04-21 11:26:45 +02:00
Spring Buildmaster
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
Madhura Bhave
bcd79dd992
Move all actuators under `/application`
...
Context path can be configured via `management.context-path`.
Closes gh-6886
2017-04-14 15:15:44 -07:00
Phillip Webb
c4cba6b0ea
Merge branch '1.5.x'
2017-04-11 21:07:51 -07:00
Phillip Webb
d301d0f4c3
Merge branch '1.4.x' into 1.5.x
2017-04-11 20:42:48 -07:00
Phillip Webb
758ddcd420
Polish
2017-04-11 20:17:23 -07:00
Madhura Bhave
971057705d
Merge branch '1.5.x'
2017-04-11 15:57:10 -07:00
Madhura Bhave
535451f9e5
Merge branch '1.4.x' into 1.5.x
2017-04-11 15:54:01 -07:00
Madhura Bhave
b2f0ebfcb8
Prevent empty json for parameters in trace endpoint
...
Fixes gh-8883
2017-04-11 15:30:39 -07:00
Phillip Webb
2de7e9c310
Merge branch '1.5.x'
2017-04-04 10:07:38 -07:00
Phillip Webb
3b93bb46e0
Revert accidental call to `.close()`
...
Remove call to `.close()` which was accidentally left in after some
performance testing.
2017-04-04 09:56:03 -07:00
Phillip Webb
ad38776de3
Polish
2017-04-04 09:48:10 -07:00
Andy Wilkinson
47c0c3c0ef
Update samples with Gradle configuration to align with new plugin
2017-04-04 15:33:27 +01:00
Phillip Webb
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
Phillip Webb
d8f827d224
Cleanup and format code
2017-03-06 17:08:09 -08:00
Phillip Webb
425dbc3e52
Update copyright header for edited files
2017-03-06 15:04:07 -08:00
Stephane Nicoll
3cdc81c351
Fixup version numbers following release
2017-03-03 17:34:05 +01:00
Spring Buildmaster
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
Stephane Nicoll
dac3810bc1
Fixup version numbers following release
2017-03-03 16:14:56 +01:00
Spring Buildmaster
2a83e80a9b
Next Development Version
2017-03-03 14:39:21 +00:00
Andy Wilkinson
fbf493b1e8
Merge branch '1.5.x'
2017-02-08 20:51:37 +00:00
Andy Wilkinson
ab192d01cc
Merge branch '1.4.x' into 1.5.x
2017-02-08 20:51:30 +00:00
Andy Wilkinson
7e030d2068
Polish
2017-02-08 20:51:23 +00:00
Andy Wilkinson
1efa700713
Merge branch '1.5.x'
2017-02-08 20:50:45 +00:00
Andy Wilkinson
25982ecf69
Merge branch '1.4.x' into 1.5.x
2017-02-08 20:50:24 +00:00
Andy Wilkinson
04c8b912ee
Fall back to standard LiveBeansView behaviour when MBean is in use
...
Closes gh-8146
2017-02-08 20:49:16 +00:00
Brian Clozel
12d883f6b9
Introduce "server.servlet" configuration prefix
...
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.
Closes gh-8066
2017-02-07 16:48:22 +01:00
Madhura Bhave
5dafa3ae9c
Fixup version numbers following release
2017-01-30 15:27:42 -08:00
Spring Buildmaster
5c12500366
Next Development Version
2017-01-30 20:10:13 +00:00
Andy Wilkinson
a9656145de
Fix up version numbers following release
2017-01-30 12:27:04 +00:00
Spring Buildmaster
a2696bf873
Next Development Version
2017-01-30 11:40:24 +00:00
Stephane Nicoll
bd0c1cb9c3
Fixup version numbers following release
2017-01-26 15:55:14 +01:00
Spring Buildmaster
ed1ce140c0
Next Development Version
2017-01-26 14:20:39 +00:00
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
Phillip Webb
273beaa3ce
Polish
2016-12-30 11:10:44 -08:00
Stephane Nicoll
4604bb7e8a
Merge branch '1.5.x'
2016-12-30 18:01:59 +01:00
Stephane Nicoll
c903ff46a7
Polish samples
2016-12-30 17:57:14 +01:00
Phillip Webb
c3edf9e341
Fixup version numbers following release
2016-12-22 19:03:09 -08:00
Spring Buildmaster
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
Stephane Nicoll
72e696bcbd
Fixup version numbers following release
2016-11-08 18:24:42 +01:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00