Commit Graph

9672 Commits (9c374e77554f311285fd0a2b9ee42d60bb44bd6c)
 

Author SHA1 Message Date
Andy Wilkinson 9ec38dc8c1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f35fa87366 Fix problems in SpringBootMockUtil reported by Checkstyle 8 years ago
Andy Wilkinson 9273b1789b Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson fd10d428f9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e0bf8ad280 Merge pull request #7279 from Quentin Caillard
* gh-7279:
  Update to Jersey 2.24
8 years ago
Quentin Caillard bcc6726c2c Update to Jersey 2.24
Closes gh-7279
8 years ago
Andy Wilkinson 318fcb37de Merge branch '1.5.x' 8 years ago
Andy Wilkinson b1ba484d0c Add dependency management for SQL Server's JDBC driver
Closes gh-7413
8 years ago
Andy Wilkinson 93612116c5 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes
See gh-7391
8 years ago
Andy Wilkinson ae8ad454b3 Merge branch '1.5.x' 8 years ago
Andy Wilkinson af4ca7cf6e Align Spring Data Neo4j auto-configuration with latest Ingalls snapshots
Closes gh-7391
8 years ago
Andy Wilkinson 800718637e Add dependency management for Reactor 3's Add-ons
Closes gh-7414
8 years ago
Stephane Nicoll 7ebe324514 Merge branch '1.5.x' 8 years ago
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 b0d0ddfcb6 Merge branch '1.5.x' 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 8c80722a70 Merge branch '1.5.x' 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 6361a6728a Add support for new PATCH methods to TestRestTemplate
Closes gh-7412
8 years ago
Andy Wilkinson 971e5e834c Merge branch '1.5.x' 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 22edb9eded Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7b742fd792 Polish
See gh-7357
8 years ago
Phillip Webb cb7c0b5031 Merge branch '1.5.x' 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 4edab86ba2 Merge branch '1.5.x' 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 d8b7d6dfdc Merge branch '1.5.x' 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