Commit Graph

10971 Commits

Author SHA1 Message Date
Andy Wilkinson
b2a8be8bbe Merge branch '1.4.x' into 1.5.x 2016-11-21 13:40:11 +00:00
Andy Wilkinson
3423ca87b4 Ensure that RestClientTest can be used without Jackson on the class path
Closes gh-7431
2016-11-21 13:36:05 +00:00
Andy Wilkinson
5a9fc9aa49 Merge branch '1.4.x' into 1.5.x 2016-11-21 13:35:22 +00:00
Andy Wilkinson
3464c0b16e Ensure that Hypermedia-related auto-config works without Jackson
Previously, both HypermediaAutoConfiguration and HttpMessageConverters
assumed that if Spring HATEOAS was on the class path, then Jackson
would be too. When this was not the case, an application would fail
to start.

This commit updates both classes to back off appropriately when
Spring HATEOAS is on the classpath but Jackson is not.

Closes gh-7434
2016-11-21 13:25:25 +00:00
Andy Wilkinson
2c856124e1 Polish ModifiedClassPathRunner 2016-11-21 13:20:37 +00:00
Andy Wilkinson
f4b119cb53 Tidy up spring-boot-junit-runners' dependencies 2016-11-21 13:16:56 +00:00
Andy Wilkinson
ac05b61df9 Merge branch '1.4.x' into 1.5.x 2016-11-21 10:46:09 +00:00
Andy Wilkinson
c9427191ee Set TCCL before initialising test class in FilteredClassPathRunner
Closes gh-7435
2016-11-21 10:41:41 +00:00
Stephane Nicoll
9423b9831c Merge branch '1.4.x' into 1.5.x 2016-11-20 15:52:49 +09:00
Stephane Nicoll
249ed899a6 Fix use of KB and MB in Multipart documentation
Closes gh-7364
2016-11-20 15:51:47 +09:00
Phillip Webb
1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
2016-11-18 17:27:54 -08:00
Phillip Webb
9e18021e8c Merge branch '1.4.x' into 1.5.x 2016-11-18 15:59:05 -08:00
Phillip Webb
c2c5611f77 Polish 2016-11-18 15:58:56 -08:00
Phillip Webb
fce17ca6d9 Polish 2016-11-18 15:50:19 -08:00
Madhura Bhave
3a3228fc70 Add CORS interceptor for Cloud Foundry actuators
This interceptor processes the response with CORS headers
and apepars before the Cloud Foundry security interceptor.

See gh-7108
2016-11-18 09:26:31 -08:00
Andy Wilkinson
f35fa87366 Fix problems in SpringBootMockUtil reported by Checkstyle 2016-11-18 16:56:36 +00:00
Andy Wilkinson
1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
2016-11-18 16:39:44 +00:00
Andy Wilkinson
e0bf8ad280 Merge pull request #7279 from Quentin Caillard
* gh-7279:
  Update to Jersey 2.24
2016-11-18 12:09:19 +00:00
Quentin Caillard
bcc6726c2c Update to Jersey 2.24
Closes gh-7279
2016-11-18 12:08:38 +00:00
Andy Wilkinson
b1ba484d0c Add dependency management for SQL Server's JDBC driver
Closes gh-7413
2016-11-18 12:03:41 +00:00
Andy Wilkinson
5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes
See gh-7391
2016-11-18 11:54:05 +00:00
Andy Wilkinson
af4ca7cf6e Align Spring Data Neo4j auto-configuration with latest Ingalls snapshots
Closes gh-7391
2016-11-18 11:22:39 +00:00
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
2016-11-18 11:56:22 +09:00
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
2016-11-18 11:48:09 +09:00
Andy Wilkinson
cd3f951d35 Merge branch '1.4.x' into 1.5.x 2016-11-17 20:43:06 +00:00
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
2016-11-17 20:41:25 +00:00
Andy Wilkinson
bed5155676 Merge branch '1.4.x' into 1.5.x 2016-11-17 19:56:27 +00:00
Andy Wilkinson
5857010dde Polishing: fix Checkstyle warning 2016-11-17 19:55:34 +00:00
Andy Wilkinson
eff0fc0221 Merge branch '1.4.x' into 1.5.x 2016-11-17 19:28:01 +00:00
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
2016-11-17 19:19:54 +00:00
Stephane Nicoll
7b742fd792 Polish
See gh-7357
2016-11-17 14:44:40 +09:00
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`
2016-11-16 15:30:38 -08:00
Phillip Webb
dfd327d68f Polish multiple root contexts in Restarter
See gh-7335
See gh-7336
2016-11-16 15:30:38 -08:00
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
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
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