Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,490 Commits 23 Branches 0 Tags
38891f7594debeef320ebcfc7050e9234f407dcf
Commit Graph

27490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius Bogoevici
34fb909b41 Support multiple root contexts in Restarter 
Update devtools restarter to support multiple application contexts.

Fixes gh-7335
Closes gh-7336
 2016-11-16 15:30:38 -08:00
Phillip Webb
9960e0d621 Merge pull request #7373 from qerub/content-security-policy 
* pr/7373:
  Polish content security policy contribution
  Add properties for content security policy
 2016-11-16 15:30:37 -08:00
Phillip Webb
238c22cd73 Polish content security policy contribution 
See gh-7373
See gh-7373
 2016-11-16 15:30:36 -08:00
Christoffer Sawicki
d7bbea63b7 Add properties for content security policy 
Add `content-security-policy` and `content-security-policy-mode`
`security.header` properties and update auto-configuration to apply
them when specified.

Fixes gh-7373
Closes gh-7357
 2016-11-16 15:30:36 -08:00
Phillip Webb
de26b22fa4 Merge pull request #7393 from stephanedaviet/master 
* pr/7393:
  Polish ErrorPageFilter.getDescription javadoc
  Make ErrorPageFilter.getDescription protected
 2016-11-16 15:30:35 -08:00
Phillip Webb
12d9ebfc02 Polish ErrorPageFilter.getDescription javadoc 
See gh-7393
 2016-11-16 15:30:35 -08:00
Stéphane Daviet
004528777f Make ErrorPageFilter.getDescription protected 
Make `ErrorPageFilter#getDescription` `protected` instead of `private`
to be able to customize the details for the request logged in case of
an error.

Fixes gh-7380
Closes gh-7393
 2016-11-16 15:30:35 -08:00
Phillip Webb
7daf69a393 Upgrade to HTMLUnit 2.23 (+selenium module 2.23.2) 
Fixes gh-7232
 2016-11-16 15:30:34 -08:00
Phillip Webb
ab26347cb3 Merge pull request #7403 from izeye/polish-20161116 
* pr/7403:
  Polish
 2016-11-16 13:37:27 -08:00
Johnny Lim
8038882d46 Polish 
Closes gh-7403
 2016-11-16 13:36:51 -08:00
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