Commit Graph

21208 Commits

Author SHA1 Message Date
Andy Wilkinson
d154ec8d64 Merge branch '2.0.x' into 2.1.x 2019-04-01 11:54:22 +01:00
Andy Wilkinson
2adb6b1fa4 Override version of Maven Site Plugin for JDK 9+181 compatibility
See gh-16400
2019-04-01 11:53:31 +01:00
Andy Wilkinson
84b557246e Merge branch '2.1.x' 2019-04-01 10:49:26 +01:00
Andy Wilkinson
8f1f258b25 Merge branch '2.0.x' into 2.1.x 2019-04-01 10:48:56 +01:00
Andy Wilkinson
ef09c81ea7 Upgrade JDK 9 CI image to JDK 9+181
Closes gh-16400
2019-04-01 10:47:30 +01:00
Stephane Nicoll
dcf849d4e0 Merge branch '2.1.x' 2019-03-31 19:41:19 +02:00
Stephane Nicoll
bd72ff5d83 Switch to snapshots 2019-03-31 19:41:05 +02:00
Stephane Nicoll
8bbca7fd65 Merge branch '2.0.x' into 2.1.x 2019-03-31 19:38:06 +02:00
Stephane Nicoll
695dc8e992 Switch to snapshots 2019-03-31 19:37:43 +02:00
Stephane Nicoll
e129f2ae20 Merge branch '1.5.x' into 2.0.x 2019-03-31 19:32:09 +02:00
Stephane Nicoll
2874d77021 Switch to snapshots 2019-03-31 19:31:44 +02:00
Stephane Nicoll
ceb6ebcb85 Merge branch '2.1.x' 2019-03-31 15:29:30 +02:00
Stephane Nicoll
085ca0f915 Upgrade to Spring Framework 5.1.6.RELEASE
Closes gh-16340
2019-03-31 15:28:04 +02:00
Stephane Nicoll
bf173e78b6 Merge branch '2.0.x' into 2.1.x 2019-03-31 15:27:46 +02:00
Stephane Nicoll
165b9d950a Upgrade to Spring Framework 5.0.13.RELEASE
Closes gh-16339
2019-03-31 15:26:57 +02:00
Stephane Nicoll
65296f0b77 Merge branch '1.5.x' into 2.0.x 2019-03-31 15:26:30 +02:00
Stephane Nicoll
a0002c6ebe Upgrade to Spring Framework 4.3.23.RELEASE
Closes gh-16338
2019-03-31 15:25:31 +02:00
Stephane Nicoll
28bd5f5e50 Merge pull request #16039 from amcghie
* pr/16039:
  Polish "Complete support for customizing Tomcat's access log"
  Complete support for customizing Tomcat's access log
2019-03-29 17:48:22 +01:00
Stephane Nicoll
076e327481 Polish "Complete support for customizing Tomcat's access log"
Closes gh-16039
2019-03-29 17:47:53 +01:00
Andrew McGhie
f823ae488d Complete support for customizing Tomcat's access log
See gh-16039
2019-03-29 17:47:53 +01:00
Andy Wilkinson
6615e11e65 Merge branch '2.1.x' 2019-03-29 16:12:40 +00:00
Andy Wilkinson
4e734669fe Merge branch '2.0.x' into 2.1.x 2019-03-29 16:12:27 +00:00
Stephane Nicoll
c2b35e1cd5 Merge pull request #16084 from nosan
* pr/16084:
  Polish "Permit use of https for configuring Prometheus push gateway"
  Permit use of https for configuring Prometheus push gateway
2019-03-29 17:07:16 +01:00
Andy Wilkinson
7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll
f4c4b1d3f0 Polish "Permit use of https for configuring Prometheus push gateway"
Closes gh-16084
2019-03-29 17:03:28 +01:00
Dmytro Nosan
eed4e9ea56 Permit use of https for configuring Prometheus push gateway
See gh-16084
2019-03-29 16:48:27 +01:00
Andy Wilkinson
946e8267a8 Upgrade to Jetty 9.4.15.v20190215
In addition to upgrading to Jetty 9.4.15, this commit updates the
KeyStores used in embedded container testing to add to their entries
subject alternative name extensions for localhost and 127.0.0.1. As
of 9.4.16, Jetty requires the SAN extensions.

Closes gh-16188
2019-03-29 15:42:06 +00:00
Stephane Nicoll
d7d2c345c1 Merge branch '2.1.x' 2019-03-29 15:58:00 +01:00
Stephane Nicoll
f1df366ac0 Merge pull request #16262 from mrifni
* pr/16262:
  Polish "Automatically detect log4j2.properties"
  Automatically detect log4j2.properties
2019-03-29 15:57:33 +01:00
Stephane Nicoll
b894696efb Polish "Automatically detect log4j2.properties"
Closes gh-16262
2019-03-29 15:57:06 +01:00
Mohamed Rifni
2cb4403cd0 Automatically detect log4j2.properties
See gh-16262
2019-03-29 15:55:49 +01:00
Stephane Nicoll
0a20ce8333 Merge pull request #16326 from simionAndrei
* pr/16326:
  Polish "Add Spring-specific styling to Actuator's API documentation"
  Use asciidoctor 1.5.8
  Add Spring-specific styling to Actuator's API documentation
2019-03-29 15:37:08 +01:00
Stephane Nicoll
1bc47b7e74 Polish "Add Spring-specific styling to Actuator's API documentation"
Closes gh-16326
2019-03-29 15:36:35 +01:00
Stephane Nicoll
604b0891d0 Use asciidoctor 1.5.8
This commit uses asciidoctor 1.5.8 for the time being. Once a new
version of the plugin is released, this override will be unnecessary.
2019-03-29 15:35:45 +01:00
simionAndrei
26cfbe04b2 Add Spring-specific styling to Actuator's API documentation
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16326
2019-03-29 15:35:45 +01:00
Stephane Nicoll
d1507497d8 Merge branch '2.1.x' 2019-03-29 14:16:58 +01:00
Stephane Nicoll
1261c3960d Merge branch '2.0.x' into 2.1.x 2019-03-29 14:16:38 +01:00
Stephane Nicoll
28b38ddc9a Upgrade to Reactor Bom Bismuth-SR17
Closes gh-16372
2019-03-29 14:15:40 +01:00
Stephane Nicoll
4c1186cbd8 Merge branch '1.5.x' into 2.0.x 2019-03-29 14:12:52 +01:00
Stephane Nicoll
dfe6bf0f5f Upgrade to Appengine Sdk 1.9.73
Closes gh-16387
2019-03-29 14:11:50 +01:00
Stephane Nicoll
241171fcfa Merge branch '2.1.x' 2019-03-29 14:09:01 +01:00
Stephane Nicoll
6cee5feaab Merge pull request #16332 from zhanglc
* pr/16332:
  Disable nulls serialization when serialize-nulls property is false
2019-03-29 14:08:10 +01:00
liucheng.zhang
4d1717f18e Disable nulls serialization when serialize-nulls property is false
Closes gh-16332
2019-03-29 13:57:08 +01:00
Stephane Nicoll
e80b6cfc44 Merge branch '2.1.x' 2019-03-29 13:41:01 +01:00
Stephane Nicoll
877a47f22b Upgrade to Jooq 3.11.10
Closes gh-16386
2019-03-29 13:36:59 +01:00
Stephane Nicoll
e03f9e2467 Upgrade to Infinispan 9.4.11.Final
Closes gh-16385
2019-03-29 13:36:58 +01:00
Stephane Nicoll
3ae7257171 Upgrade to Hibernate 5.3.9.Final
Closes gh-16384
2019-03-29 13:36:57 +01:00
Stephane Nicoll
2af72170c6 Upgrade to Byte Buddy 1.9.12
Closes gh-16383
2019-03-29 13:36:57 +01:00
Stephane Nicoll
8ea0ecd07c Upgrade to Rxjava2 2.2.8
Closes gh-16382
2019-03-29 13:36:55 +01:00
Stephane Nicoll
ab110ee39a Upgrade to Reactor Bom Californium-SR6
Closes gh-16381
2019-03-29 13:36:54 +01:00