Commit Graph

9299 Commits (2ba3b279546185453ca8e533cbea8734e033a12e)
 

Author SHA1 Message Date
Stephane Nicoll 2ba3b27954 Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
#	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
8 years ago
Stephane Nicoll 0072a93915 Expose Tomcat's accesslog requestAttributesEnabled
This commit adds an extra property to the `server.tomcat.accesslog` to
control the `reqestAttributesEnabled` flag. This flag sets request
attributes for IP address, Hostname, protocol and port used for the
request.

Closes gh-7367
8 years ago
Andy Wilkinson cd3f951d35 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 5dea4c5a03 Wait for server port to be written in a more robust manner
Previously, we just waited for the file to exist before trying to read
the port from it. This left a window where the file existed but its
contents had not be written which could result in a
NumberFormatException.

This commit now waits for the file to have a length that is greater
than zero.

See gh-7379
8 years ago
Andy Wilkinson bed5155676 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 5857010dde Polishing: fix Checkstyle warning 8 years ago
Andy Wilkinson eff0fc0221 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 918e122ddc Fix remote DevTools' support for adding and removing classes
Previously, remote DevTools only correctly supported modifying
existing classes. New classes that were added would be missed, and
deleted classes could cause a failure as they would be found by
component scanning but hidden by RestartClassLoader.

This commit introduces a DevTools-specific ResourcePatternResolver
that is installed as the application context's resource loader. This
custom resolver is aware of the files that have been added and
deleted and modifies the result returned from getResource and
getResources accordingly.

New intergration tests have been introduced to verify DevTools'
behaviour. The tests cover four scenarios:

- Adding a new controller
- Removing an existing controller
- Adding a request mapping to a controller
- Removing a request mapping from a controller

These four scenarios are tested with:

- DevTools updating a local application
- DevTools updating a remote application packaged in a jar file
- DevTools updating a remote application that's been exploded

Closes gh-7379
8 years ago
Stephane Nicoll 7b742fd792 Polish
See gh-7357
8 years ago
Phillip Webb dcbfb51a1a Merge pull request #7336 from mbogoevici/GH-7335-1.4.x
* pr/7336:
  Polish multiple root contexts in `Restarter`
  Support multiple root contexts in `Restarter`
8 years ago
Phillip Webb dfd327d68f Polish multiple root contexts in `Restarter`
See gh-7335
See gh-7336
8 years ago
Marius Bogoevici 34fb909b41 Support multiple root contexts in `Restarter`
Update devtools restarter to support multiple application contexts.

Fixes gh-7335
Closes gh-7336
8 years ago
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
8 years ago
Phillip Webb 238c22cd73 Polish content security policy contribution
See gh-7373
See gh-7373
8 years ago
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
8 years ago
Phillip Webb de26b22fa4 Merge pull request #7393 from stephanedaviet/master
* pr/7393:
  Polish ErrorPageFilter.getDescription javadoc
  Make ErrorPageFilter.getDescription protected
8 years ago
Phillip Webb 12d9ebfc02 Polish ErrorPageFilter.getDescription javadoc
See gh-7393
8 years ago
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
8 years ago
Phillip Webb 7daf69a393 Upgrade to HTMLUnit 2.23 (+selenium module 2.23.2)
Fixes gh-7232
8 years ago
Phillip Webb ab26347cb3 Merge pull request #7403 from izeye/polish-20161116
* pr/7403:
  Polish
8 years ago
Johnny Lim 8038882d46 Polish
Closes gh-7403
8 years ago
Andy Wilkinson 387a406aad Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson b3e0a37197 Remove unwanted System.out calls in test code 8 years ago
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
8 years ago
Phillip Webb 449b42ffa0 Polish LinksEnhancer to use endpoint name
See gh-7164
See gh-7132
8 years ago
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
8 years ago
Phillip Webb f7739a6796 Merge pull request #7390 from nebhale/logger-actuator-docs
* pr/7390:
  Add Logger actuator documentation
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Madhura Bhave e7db7adfb8 Rename ApplicationStartedEvent
Rename `ApplicationStartedEvent` to `ApplicationStartingEvent` to
avoid confusion.

Fixes gh-7381
8 years ago
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
8 years ago
Phillip Webb 764f13453a Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6eedfe40e5 Start building against Spring AMQP 1.7.0 snapshots
See gh-7385
8 years ago
Phillip Webb bacf0878af Polish 8 years ago
Andy Wilkinson 26f26c30ee Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 948b5760a7 Upgrade to Spring Retry 1.1.5.RELEASE
Closes gh-7384
8 years ago
Andy Wilkinson 24cc5d5644 Give javac's type inferencing a helping hand 8 years ago
Andy Wilkinson 22e456a177 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson c2730ac63f Polish formatting and address warnings 8 years ago
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 8a57ebde06 Merge pull request #7370 from ultraq:update-layout-dialect
* pr/7370:
  Upgrade Thymeleaf 3 layout dialect in doc
8 years ago
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc
Closes gh-7370
8 years ago
Madhura Bhave 2697bf2ba1 Add Content-Type to allowed headers for CloudFoundry actuators
See gh-7108
8 years ago
Andy Wilkinson 2930bd4145 Merge pull request #7323 from Huang YunKun
* gh-7323:
  Upgrade to Log4j 2.7
8 years ago
Huang YunKun 71826708a4 Upgrade to Log4j 2.7
Closes gh-7323
8 years ago
Andy Wilkinson c30b917ba1 Use Log4j 2's bom to provide dependency management for it
Closes gh-7355
8 years ago
Andy Wilkinson 89d5e086e4 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a1dda12bcb Disable Server header by default when using SSL with Jetty 9
Closes gh-7359
8 years ago
Stephane Nicoll c0f6c93b3d Upgrade to Spring Security 4.2.0.RELEASE
Closes gh-7366
8 years ago