root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
9,480 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

9480 Commits

Author SHA1 Message Date
Andy Wilkinson 4edab86ba2 Merge branch '1.5.x' 2016-11-16 09:13:32 +00:00
Andy Wilkinson 387a406aad Merge branch '1.4.x' into 1.5.x 2016-11-16 09:13:17 +00:00
Andy Wilkinson b3e0a37197 Remove unwanted System.out calls in test code 2016-11-16 09:12:13 +00:00
Phillip Webb d8b7d6dfdc Merge branch '1.5.x' 2016-11-15 18:53:54 -08:00
Phillip Webb 4a6b49ef00 Merge pull request #7164 from mbhave/gh-7132 
* pr/7164:
  Polish LinksEnhancer to use endpoint name
  Change LinksEnhancer to use endpoint name
 2016-11-15 18:08:02 -08:00
Phillip Webb 449b42ffa0 Polish LinksEnhancer to use endpoint name 
See gh-7164
See gh-7132
 2016-11-15 18:07:50 -08:00
Madhura Bhave ada02232b9 Change LinksEnhancer to use endpoint name 
Update `LinksEnhancer` to use NamedEndpoint names as rel names. If the
endpoint name is not available, fallback to endpoint path. Allow
multiple hrefs per rel if path is different.

Fixes gh-7132
Closes gh-7164
 2016-11-15 18:03:26 -08:00
Phillip Webb f7739a6796 Merge pull request #7390 from nebhale/logger-actuator-docs 
* pr/7390:
  Add Logger actuator documentation
 2016-11-15 17:47:29 -08:00
Ben Hale 00099552db Add Logger actuator documentation 
Add Actuator and Reference documentation for the `/logger` endpoint.
This documentation includes information on listing, reading, and
modifying the configuration of loggers.

Closes gh-7390
See gh-7086
 2016-11-15 17:47:15 -08:00
Phillip Webb 1d2f6d25fa Use consistent 'ROOT' logger name 
Ensure all LoggingSystem implementation provide a consistent ROOT logger
name. Prior to this commit the `/loggers` endpoint could return '' for
root loggers which could then not be set using a POST.

Fixes gh-7372
 2016-11-15 17:27:15 -08:00
Phillip Webb 01c381f2a9 Remove empty logger from default logback config 
Remove the empty logger as it was not also defined in `defaults.xml`
and caused rendering issues with the new `/loggers` endpoint.

Fixes gh-7386
 2016-11-15 15:46:19 -08:00
Madhura Bhave e7db7adfb8 Rename ApplicationStartedEvent 
Rename `ApplicationStartedEvent` to `ApplicationStartingEvent` to
avoid confusion.

Fixes gh-7381
 2016-11-15 15:43:35 -08:00
Madhura Bhave 0e3a3df6f4 Return log levels in `/loggers` endpoint payload 
Update `LoggersEndpoint` to additionally return the log levels actually
supported by the system.

Fixes gh-7396
 2016-11-15 14:32:02 -08:00
Phillip Webb 764f13453a Merge branch '1.4.x' into 1.5.x 2016-11-15 13:58:54 -08:00
Andy Wilkinson 3de98bc29d Merge branch '1.5.x' 2016-11-15 20:28:02 +00:00
Andy Wilkinson 6eedfe40e5 Start building against Spring AMQP 1.7.0 snapshots 
See gh-7385
 2016-11-15 20:26:39 +00:00
Phillip Webb bacf0878af Polish 2016-11-15 10:40:21 -08:00
Andy Wilkinson 9e49a2d780 Merge branch '1.5.x' 2016-11-15 15:50:43 +00:00
Andy Wilkinson 26f26c30ee Merge branch '1.4.x' into 1.5.x 2016-11-15 15:50:34 +00:00
Andy Wilkinson 948b5760a7 Upgrade to Spring Retry 1.1.5.RELEASE 
Closes gh-7384
 2016-11-15 15:49:11 +00:00
Andy Wilkinson 4431f9bd12 Use TomEE 7.0.2 for deployment tests 
Following the release of TomEE 7.0.2, 7.0.1 is no longer available
from https://www.apache.org/dist. This commit upgrades to 7.0.2 and
also switches to using https://archive.apache.org/dist where binaries
appear to be be permanently availble.
 2016-11-15 14:50:21 +00:00
Andy Wilkinson 86c55dda16 Merge branch '1.5.x' 2016-11-15 13:29:43 +00:00
Andy Wilkinson 24cc5d5644 Give javac's type inferencing a helping hand 2016-11-15 13:29:19 +00:00
Andy Wilkinson e26a3e3766 Merge branch '1.5.x' 2016-11-15 13:14:44 +00:00
Andy Wilkinson 22e456a177 Merge branch '1.4.x' into 1.5.x 2016-11-15 13:14:30 +00:00
Andy Wilkinson c2730ac63f Polish formatting and address warnings 2016-11-15 11:48:35 +00:00
Stephane Nicoll 6aa57e8ffe Merge branch '1.5.x' 2016-11-12 11:16:43 +01:00
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 2016-11-12 11:16:30 +01:00
Stephane Nicoll 8a57ebde06 Merge pull request #7370 from ultraq:update-layout-dialect 
* pr/7370:
  Upgrade Thymeleaf 3 layout dialect in doc
 2016-11-12 11:15:53 +01:00
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc 
Closes gh-7370
 2016-11-12 11:15:00 +01:00
Madhura Bhave ed75ed3d93 Merge branch '1.5.x' 2016-11-11 12:39:01 -08:00
Madhura Bhave 2697bf2ba1 Add Content-Type to allowed headers for CloudFoundry actuators 
See gh-7108
 2016-11-11 12:09:16 -08:00
Andy Wilkinson d4a7db7b7c Merge branch '1.5.x' 2016-11-11 15:27:11 +00:00
Andy Wilkinson 2930bd4145 Merge pull request #7323 from Huang YunKun 
* gh-7323:
  Upgrade to Log4j 2.7
 2016-11-11 15:25:51 +00:00
Huang YunKun 71826708a4 Upgrade to Log4j 2.7 
Closes gh-7323
 2016-11-11 15:25:33 +00:00
Andy Wilkinson 7cb5981e7c Merge branch '1.5.x' 2016-11-11 15:19:59 +00:00
Andy Wilkinson c30b917ba1 Use Log4j 2's bom to provide dependency management for it 
Closes gh-7355
 2016-11-11 15:18:45 +00:00
Andy Wilkinson be4ab6165a Merge branch '1.5.x' 2016-11-11 11:48:06 +00:00
Andy Wilkinson 89d5e086e4 Merge branch '1.4.x' into 1.5.x 2016-11-11 11:47:55 +00:00
Andy Wilkinson a1dda12bcb Disable Server header by default when using SSL with Jetty 9 
Closes gh-7359
 2016-11-11 11:46:57 +00:00
Stephane Nicoll fe40a49e4c Merge branch '1.5.x' 2016-11-11 10:49:20 +01:00
Stephane Nicoll c0f6c93b3d Upgrade to Spring Security 4.2.0.RELEASE 
Closes gh-7366
 2016-11-11 10:49:08 +01:00
Madhura Bhave e1a216e34a Merge branch '1.5.x' 2016-11-09 11:22:46 -08:00
Madhura Bhave af61278213 Extend HealthMvcEndpoint for Cloud Foundry 
The CloudFoundryHealthMvcEndpoint does not perform additional
security checks since security is handled by the interceptor.

See gh-7108
 2016-11-09 11:04:51 -08:00
Madhura Bhave a3bcb2778f Add message to response body for Cloud Foundry security error 
See gh-7108
 2016-11-09 10:54:56 -08:00
Stephane Nicoll ed9f111e8a Merge branch '1.5.x' 2016-11-08 18:25:28 +01:00
Stephane Nicoll 8e160d7fda Merge branch '1.4.x' into 1.5.x 2016-11-08 18:24:58 +01: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
Stephane Nicoll 3b588aabbc Merge branch '1.5.x' 2016-11-08 17:04:18 +01:00