Commit Graph

27490 Commits

Author SHA1 Message Date
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
a87f8419f8 Merge branch '1.5.x' 2016-11-21 13:20:54 +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
34f73eb4e0 Correct the version of spring-boot-junit-runners' parent 2016-11-21 10:51:57 +00:00
Andy Wilkinson
37bdaf9ccf Merge branch '1.5.x' 2016-11-21 10:46:25 +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
77bef0536f Merge branch '1.5.x' 2016-11-20 15:53:04 +09: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
20d7dd5747 Merge branch '1.5.x' 2016-11-18 17:30:03 -08: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
9ec38dc8c1 Merge branch '1.5.x' 2016-11-18 16:57:02 +00:00
Andy Wilkinson
f35fa87366 Fix problems in SpringBootMockUtil reported by Checkstyle 2016-11-18 16:56:36 +00:00
Andy Wilkinson
9273b1789b Merge branch '1.5.x' 2016-11-18 16:41:22 +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
fd10d428f9 Merge branch '1.5.x' 2016-11-18 12:09:27 +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
318fcb37de Merge branch '1.5.x' 2016-11-18 12:05:04 +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
93612116c5 Merge branch '1.5.x' 2016-11-18 11:54:48 +00:00
Andy Wilkinson
5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes
See gh-7391
2016-11-18 11:54:05 +00:00
Andy Wilkinson
ae8ad454b3 Merge branch '1.5.x' 2016-11-18 11:26:08 +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
Andy Wilkinson
800718637e Add dependency management for Reactor 3's Add-ons
Closes gh-7414
2016-11-18 09:40:56 +00:00
Stephane Nicoll
7ebe324514 Merge branch '1.5.x' 2016-11-18 11:58:17 +09: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
b0d0ddfcb6 Merge branch '1.5.x' 2016-11-17 20:43:15 +00: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
8c80722a70 Merge branch '1.5.x' 2016-11-17 19:56:35 +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
6361a6728a Add support for new PATCH methods to TestRestTemplate
Closes gh-7412
2016-11-17 19:51:16 +00:00
Andy Wilkinson
971e5e834c Merge branch '1.5.x' 2016-11-17 19:28:31 +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
22edb9eded Merge branch '1.5.x' 2016-11-17 14:45:07 +09:00
Stephane Nicoll
7b742fd792 Polish
See gh-7357
2016-11-17 14:44:40 +09:00
Phillip Webb
cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08: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