Commit Graph

21208 Commits

Author SHA1 Message Date
Stephane Nicoll
91b4b4718f Merge pull request #11510 from izeye:polish-20180105
* pr/11510:
  Polish
2018-01-05 10:29:53 +01:00
Johnny Lim
37d8eedae3 Polish
Closes gh-11510
2018-01-05 10:29:22 +01:00
Madhura Bhave
7c5cf903fc Remove management.security.enabled from documentation
Fixes gh-11383
2018-01-04 16:23:14 -08:00
Madhura Bhave
fc3b43e832 Wait for neo4j to start accepting connections
See gh-10516
2018-01-04 14:26:34 -08:00
Madhura Bhave
8001c6a2b8 Fix docker-lib url in images 2018-01-04 12:42:28 -08:00
Madhura Bhave
747b71ba69 Add docker-lib from github 2018-01-04 12:01:27 -08:00
Madhura Bhave
e28915bd4b Make integration tests self-contained
Fixes gh-10516
2018-01-04 11:26:40 -08:00
Andy Wilkinson
3955c284f5 Start building against Spring Framework 5.0.3 snapshots
See gh-11503
2018-01-04 17:42:54 +00:00
Andy Wilkinson
0e3d873d85 Start building against Spring Integration 5.0.1 snapshots
See gh-11501
2018-01-04 16:56:23 +00:00
Brian Clozel
6525bc46ef Add Jetty libraries to Javadoc build 2018-01-04 16:17:20 +01:00
Andy Wilkinson
bfef8be4dc Merge branch '1.5.x' 2018-01-04 14:59:21 +00:00
Andy Wilkinson
9baa9772c2 Revert "Upgrade to Jackson 2.8.11"
This reverts commit f91f8f7eec.

See gh-11475
2018-01-04 14:58:37 +00:00
Brian Clozel
b96f862c9e Merge pull request #11489 from Buzzardo:linking
* pr/11489:
  Polish
  Full editing pass plus linking
2018-01-04 14:50:08 +01:00
Brian Clozel
c6a1fc93bd Polish 2018-01-04 14:48:23 +01:00
Jay Bryant
0e7dbd59b2 Full editing pass plus linking
I made a complete editing pass plus another pass to see where I could add more links, both within the document and to other parts of Spring. The result was a thorough edit (though I'm sure I missed things, purely due to the size of the thing).
2018-01-04 14:34:50 +01:00
Andy Wilkinson
0aedd3f11d Exclude tomcat-annotations-api and use javax.annotations-api instead
Closes gh-10133
2018-01-04 10:25:39 +00:00
Andy Wilkinson
a7808388ad Make github-tag property available when generating Gradle plugin docs
Closes gh-11490
2018-01-04 10:11:41 +00:00
Stephane Nicoll
03dd53f347 Fix broken merge 2018-01-04 10:16:27 +01:00
Stephane Nicoll
e3bfd797a3 Merge branch '1.5.x' 2018-01-04 10:11:32 +01:00
Stephane Nicoll
d49b022ce3 Shade json in configuration processor
This commit shades the json API in the configuration processor so that
it doesn't bring `android-json` to the classpath anymore.

Closes gh-10307
2018-01-04 10:10:56 +01:00
Phillip Webb
bee5fa7fc6 Polish 2018-01-03 13:24:04 -08:00
Phillip Webb
6bac365a72 Polish micrometer cache metrics
Change `CacheMeterBinderProvider` to include a cache type
generic which helps to simplify implementations. Also move
and extract a few classes.

See gh-11221
2018-01-03 13:19:31 -08:00
Phillip Webb
37fe7bc8f6 Update validator background initializer
Update the validator background initializer to actually create
the validator.

Closes gh-11412
2018-01-03 13:19:31 -08:00
Madhura Bhave
732d9868e3 Increase session timeout to prevent CI failures 2018-01-03 11:12:41 -08:00
Madhura Bhave
716543828a Refactor some tests to use ApplicationContextRunner 2018-01-03 11:07:19 -08:00
Brian Clozel
3ab32df242 Add support for HTTP/2 in Jetty with Conscrypt
This commit configures Jetty for HTTP/2 support as soon as the following
conditions are met:

* `server.http2.enabled=true`
* Both `org.eclipse.jetty:jetty-alpn-conscrypt-server` and
`org.eclipse.jetty.http2:http2-server` are on classpath

This will use the Conscrypt library for ALPN and TLS support using
native libraries shipped within the Conscrypt uber Jar. This does not
require a JVM agent or patching the JDK classes.

Closes gh-10902
2018-01-03 17:43:32 +01:00
Stephane Nicoll
ea70b2ed2e Upgrade to Kotlin 1.2.10
See gh-11235
2018-01-03 17:25:14 +01:00
Andy Wilkinson
6d8676c268 Merge branch '1.5.x' 2018-01-03 15:04:00 +00:00
Stephane Nicoll
0515ca0dd0 Auto configure micrometer cache metrics
Closes gh-11221
2018-01-03 15:22:08 +01:00
Andy Wilkinson
1f14b11be4 Upgrade to Spring Security Jwt 1.0.9.RELEASE
Closes gh-11483
2018-01-03 13:10:19 +00:00
Andy Wilkinson
fc3e4085cb Upgrade to Spring Retry 1.2.2.RELEASE
Closes gh-11482
2018-01-03 13:10:18 +00:00
Andy Wilkinson
2ac5f7b464 Upgrade to Spring Integration 4.3.13.RELEASE
Closes gh-11481
2018-01-03 13:10:17 +00:00
Andy Wilkinson
40c8edc52e Upgrade to Spring Amqp 1.7.5.RELEASE
Closes gh-11480
2018-01-03 13:10:17 +00:00
Andy Wilkinson
cc61bc05e6 Upgrade to Tomcat 8.5.24
Closes gh-11479
2018-01-03 13:10:16 +00:00
Andy Wilkinson
5552434660 Upgrade to Httpclient 4.5.4
Closes gh-11478
2018-01-03 13:10:15 +00:00
Andy Wilkinson
38f94cc683 Upgrade to Mysql 5.1.45
Closes gh-11477
2018-01-03 13:10:14 +00:00
Andy Wilkinson
e926c87e81 Upgrade to Appengine Sdk 1.9.60
Closes gh-11476
2018-01-03 13:10:13 +00:00
Andy Wilkinson
f91f8f7eec Upgrade to Jackson 2.8.11
Closes gh-11475
2018-01-03 13:10:13 +00:00
Andy Wilkinson
38ac595615 Polish 2018-01-03 10:50:16 +00:00
Andy Wilkinson
bac21e2ee6 Merge branch '1.5.x' 2018-01-03 09:57:13 +00:00
Andy Wilkinson
77edcaab86 Merge branch '1.5.x' 2018-01-03 09:54:18 +00:00
Andy Wilkinson
451a4dfc7f Make management web security back off without spring-security-web
Closes gh-11474
2018-01-03 09:51:33 +00:00
Andy Wilkinson
70e14edaf7 Work around incorrect layout of generated epub archive
Previously, the Docbook Maven plugin would generate an epub archive
with the majority of contents in OEBPS/, including content.opf, while
the META-INF/container.xml file reference to content.opf in the root
of the archive.

This commit overrides the epub.oebps.dir variable to move the content
into the root of the archive where it's expected to be. Implementing
this override highlighted that our customization stylesheet was not
being applied as the configuration property was incorrect (it was
epubCustomnization rather than the required epub3Customization). This
has been corrected along with a problem with missing images that
fixing it revealed.

Closes gh-11470
2018-01-02 17:50:15 +00:00
Brian Clozel
366d1122f0 Upgrade to Animal Sniffer 1.16
This version is compatible with JDK9 libraries; this is now required
since Jetty introduced a dependency on ASM 6.0 in gh-11469.
2018-01-02 17:40:34 +01:00
Brian Clozel
8286cbc9f3 Merge branch '1.5.x' 2018-01-02 16:13:11 +01:00
Brian Clozel
88b15baf20 Upgrade to Jetty 9.4.8.v20171121
Closes gh-11469
2018-01-02 16:06:45 +01:00
Stephane Nicoll
f0b210c751 Merge branch '1.5.x' 2018-01-02 15:58:49 +01:00
Stephane Nicoll
e187aac93d Mention that a custom starter must bring the core starter
Closes gh-11455
2018-01-02 15:56:46 +01:00
Stephane Nicoll
397d3e85e8 Fix Windows build
Closes gh-11459
2018-01-02 15:45:43 +01:00
Stephane Nicoll
6277d0ceb7 Update copyright header 2018-01-02 15:02:29 +01:00