Commit Graph

1576 Commits (9e18021e8cc62e7e2c8dff8434466e0eb95ca17b)

Author SHA1 Message Date
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
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
Stephane Nicoll 7b742fd792 Polish
See gh-7357
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
Johnny Lim 8038882d46 Polish
Closes gh-7403
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
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 8 years ago
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc
Closes gh-7370
8 years ago
Spring Buildmaster e712a9ba8c Next Development Version 8 years ago
Stephane Nicoll 389acb094b Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim ec9f0ab6b4 Polish
Closes gh-7322
8 years ago
Stephane Nicoll f3ac98aa82 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 8350238b8c Polish doc
See gh-5137
8 years ago
Stephane Nicoll 1b38528333 Polish doc
Closes gh-7170
8 years ago
Andy Wilkinson ef3395beaa Raise the minimum supported version of Gradle to 2.9
Closes gh-6884
8 years ago
Stephane Nicoll a733c62689 Fix typo 8 years ago
Andy Wilkinson 20e8c36590 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6828997651 Correct minimum recommended version of Gradle to be 2.9 rather than 2.8
Closes gh-7189
See gh-6884
8 years ago
Andy Wilkinson 8b631390ba Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 307fd94b4f Correct typo in the documentation for RestTemplateBuilder customization
See gh-7054
8 years ago
Andy Wilkinson ffbbd2a5f8 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson be78dc4b99 Flesh out the documentation on RestTemplateBuilder customization
Closes gh-7054
8 years ago
Phillip Webb 97fee46682 Revert Layout changes
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
8 years ago
Stephane Nicoll 4f06e52d7e Allow adding additional tld skip patterns
This commit improves `TomcatEmbeddedServletContainerFactory` so that tld
skip patterns can be set or added to an existing set. An additional
`server.tomcat.additional-tld-skip-patterns` is now being exposed to
easily add patterns via configuration.

Closes gh-5010
8 years ago
Dave Syer 537e0c12c2 Support for custom layout types to change loader classes
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
8 years ago
Stephane Nicoll c4d8fb1c09 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 6d50e26b70 Polish contribution
Closes gh-7215
8 years ago
Johnny Lim 1546cd4072 Update documentation on Actuator hypermedia support
Spring Boot Actuator hypermedia support has been disabled by default via
c7c685f, but its documentation wasn't updated.

This commit updates the documentation related to the change.

See gh-7215
8 years ago
Stephane Nicoll f6959ccbcd Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 7f8849c62b Merge branch '1.3.x' into 1.4.x 8 years ago
Stephane Nicoll 5863e6f78c Fix class name in generated meta-data
Previously, the algorithm that computes the String representation of a
class reference and a property type was shared. This lead to generic
information for group's `type` and `sourceType` property.

This commit separates that logic in two: `getQualifiedName` is now
responsible to generate a fully qualified class name while the existing
`getType` is solely responsible to generate a type representation for the
property. Only the latter has generic information.

Closes gh-7236
8 years ago
Stephane Nicoll ed7de8eb60 Polish contribution
Also add rotate attribute to Undertow

Closes gh-7225
8 years ago
Stephane Nicoll b37b3f7c59 Merge pull request #7224 from ajayk:adoc-indentation
* pr/7224:
  Fix indentation for spring.jms.template.* keys
8 years ago
ajk 548190673c Fix indentation for spring.jms.template.* keys
Closes gh-7224
8 years ago
Andy Wilkinson 5b9eaab6c0 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson ee7141cf63 Allow PropertyLauncher loader.path to be configured using manifest
Closes gh-7178
8 years ago
Andy Wilkinson a56bf44b39 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
8 years ago
Stephane Nicoll eddb10e4c9 Merge branch '1.4.x' into 1.5.x 8 years ago
Vedran Pavic 469a4e3444 Improve systemd service documentation
Closes gh-6954
8 years ago
Stephane Nicoll b0474b7c9d Merge branch '1.4.x' into 1.5.x 8 years ago
Ken Dombeck 4621f82b0e Correct typo in docs
Closes gh-7203
8 years ago
Andy Wilkinson d7e2708687 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 999fa123df Deprecate support for Gradle 2.7 and earlier 8 years ago
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
Closes gh-7112
8 years ago
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
8 years ago
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 8 years ago