Commit Graph

25152 Commits

Author SHA1 Message Date
dreis2211
23bf948101 Upgrade to Asciidoctor Gradle JVM 3.0.0
See gh-19953
2020-02-13 09:42:17 +00:00
Stephane Nicoll
db1c9f4058 Remove plugin management for infinispan-protocol-parser-generator
Closes gh-20155
2020-02-13 09:59:23 +01:00
Stephane Nicoll
cd11b74db7 Remove usage of Infinispan BOM
Closes gh-20154
2020-02-13 09:58:36 +01:00
Stephane Nicoll
90f7a3fd32 Merge pull request #20143 from scheerer
* pr/20143:
  Fix Spring Boot version reference in spring-boot-starter-parent

Closes gh-20143
2020-02-13 08:33:56 +01:00
Russell Scheerer
d61029a37a Fix Spring Boot version reference in spring-boot-starter-parent
See gh-20143
2020-02-13 08:30:21 +01:00
Andy Wilkinson
7970bf2437 Upgrade to Spring Integration 5.3.0.M2
Closes gh-20104
2020-02-12 20:04:05 +00:00
Andy Wilkinson
9860f9705c Upgrade to Spring AMQP 2.2.4.RELEASE
Closes gh-20105
2020-02-12 20:03:16 +00:00
Andy Wilkinson
f22aeda0ce Upgrade to Spring Kafka 2.4.2.RELEASE
Closes gh-20107
2020-02-12 20:02:33 +00:00
Scott Frederick
e294d26458 Set ephemeral builder container creation to a fixed date
This commit fixes the `Created` date and time of the ephemeral builder
container image at the Windows epoch plus one second
(1980-01-01T00:00:01Z). This date matches the created date of the builder
image and influences the created date of the resulting image. Using
a fixed date for images ensures that the digest is consistent for all
images with the same version.

Fixes gh-20126
2020-02-12 13:55:54 -06:00
Scott Frederick
191dce3f5e Set Spring Boot version in ephemeral builder
This commit adds a `createdBy` structure to the metadata of the ephemeral
builder container image that identifies Spring Boot as the creator of the
image, along with the Spring Boot version.

See gh-20126
2020-02-12 13:31:21 -06:00
Brian Clozel
97af0b2f3a Add actuator specific ObjectMapper
Prior to this commit, Actuator endpoints would use the application
ObjectMapper instance for serializing payloads as JSON. This was
problematic in several cases:

* application-specific configuration would change the actuator endpoint
output.
* choosing a different JSON mapper implementation in the application
would break completely some endpoints.

Spring Boot Actuator already has a hard dependency on Jackson, and this
commit uses that fact to configure a shared `ObjectMapper` instance that
will be used by the Actuator infrastructure consistently, without
polluting the application context.

This `ObjectMapper` is used in Actuator for:

* JMX endpoints
* Spring MVC endpoints with an HTTP message converter
* Spring WebFlux endpoints with an `Encoder`
* Jersey endpoints with a `ContextResolver<ObjectMapper>`

For all web endpoints, this configuration is limited to the
actuator-specific media types such as
`"application/vnd.spring-boot.actuator.v3+json"`.

Fixes gh-12951
2020-02-12 20:10:25 +01:00
Andy Wilkinson
420af17570 Merge branch '2.2.x'
Closes gh-20148
2020-02-12 18:05:50 +00:00
dreis2211
92b4ba6367 Fix structuring your code link in multi-page HTML documentation
Closes gh-19953
2020-02-12 17:43:08 +00:00
Andy Wilkinson
2f16898c5f Upgrade to Spring Data Neumann-M3
Closes gh-20103
2020-02-12 14:26:41 +00:00
Andy Wilkinson
5fed25bb43 Upgrade to Spring HATEOAS 1.1.0.M2
Closes gh-20142
2020-02-12 14:09:07 +00:00
Stephane Nicoll
1b4a3dfa77 Merge pull request #20141 from dreis2211
* pr/20141:
  Exclude jcl-over-slf4j also on Reactive Cassandra starter

Closes gh-20141
2020-02-12 14:58:05 +01:00
dreis2211
450ef36c72 Exclude jcl-over-slf4j also on Reactive Cassandra starter
See gh-20141
2020-02-12 14:57:39 +01:00
Stephane Nicoll
d19920ae39 Upgrade to Cassandra Driver 4.4.0
Closes gh-20064
2020-02-12 12:54:02 +01:00
Madhura Bhave
fe325c06c2 Merge branch '2.2.x' 2020-02-11 19:43:42 -08:00
Madhura Bhave
4eb71fc424 Merge branch '2.1.x' into 2.2.x 2020-02-11 19:43:19 -08:00
Madhura Bhave
97ac6c9de7 Polish 2020-02-11 19:41:54 -08:00
Madhura Bhave
8d9b1d2988 Merge branch '2.2.x'
Closes gh-20133
2020-02-11 19:04:12 -08:00
Madhura Bhave
98a657fedb Merge branch '2.1.x' into 2.2.x
Closes gh-20132
2020-02-11 19:02:19 -08:00
Madhura Bhave
8bce270445 Merge pull request #19202 from bono007
* pr/19202:
  Polish "Verify ssl key alias on server startup"
  Verify ssl key alias on server startup

Closes gh-19202
2020-02-11 17:09:05 -08:00
Madhura Bhave
ac91f14f05 Polish "Verify ssl key alias on server startup"
See gh-19202
2020-02-11 17:08:59 -08:00
cbono
e351605962 Verify ssl key alias on server startup
See gh-19202
2020-02-11 17:04:31 -08:00
Madhura Bhave
a5a2d52ee3 Merge branch '2.2.x' 2020-02-11 14:58:06 -08:00
Madhura Bhave
3bdd91a119 Merge branch '2.1.x' into 2.2.x 2020-02-11 14:57:49 -08:00
Madhura Bhave
747eab020d Update copyright of changed files 2020-02-11 14:57:17 -08:00
Madhura Bhave
c5ffe198af Merge branch '2.2.x'
Closes gh-20130
2020-02-11 14:54:27 -08:00
Madhura Bhave
d1c7699539 Merge branch '2.1.x' into 2.2.x
Closes gh-20129
2020-02-11 14:53:30 -08:00
Madhura Bhave
3917968d2a Merge pull request #18915 from schulzh
* pr/18915:
  Polish contribution
  Handle JSON keys containing a dot from CF environment as a single path segment

Closes gh-18915
2020-02-11 14:51:37 -08:00
Madhura Bhave
544dca7f1b Polish contribution
Along with surrounding map keys with dot from VCAP_SERVICES with `[ ]`,
this commit also does that for non-alphanumeric and `-` characters so that
they are not stripped off later.

See gh-18915
2020-02-11 14:50:55 -08:00
Hans Schulz
6828a15d31 Handle JSON keys containing a dot from CF environment as a single path segment
See gh-18915
2020-02-11 14:50:04 -08:00
Stephane Nicoll
00b10e655e Merge branch '2.2.x'
Closes gh-20125
2020-02-11 16:27:33 +01:00
Stephane Nicoll
8f06d819e4 Harmonize JMS connection factory bean names
This commit restores consistent naming for the auto-configured
connection factory.

Closes gh-19565
2020-02-11 16:23:56 +01:00
Stephane Nicoll
b21a41cde1 Merge branch '2.2.x'
Closes gh-20124
2020-02-11 14:27:33 +01:00
Stephane Nicoll
d1f4a1821c Merge branch '2.1.x' into 2.2.x
Closes gh-20123
2020-02-11 14:26:57 +01:00
Stephane Nicoll
b0aba9ed67 Document how to register a blocking health contributor with reactive
Closes gh-19707
2020-02-11 14:22:16 +01:00
Stephane Nicoll
a21dc3052d Merge branch '2.2.x' 2020-02-11 14:01:43 +01:00
Stephane Nicoll
fe6b96174e Merge branch '2.1.x' into 2.2.x
Closes gh-20122
2020-02-11 14:00:30 +01:00
Stephane Nicoll
06e5b0e912 Upgrade CI to Artifactory Resource 0.0.11
Closes gh-19629
2020-02-11 13:59:37 +01:00
Stephane Nicoll
c22ea8c937 Merge pull request #20113 from dreis2211
* pr/20113:
  Remove redundant jar task configuration

Closes gh-20113
2020-02-11 13:55:24 +01:00
dreis2211
cfc16c2589 Remove redundant jar task configuration
See gh-20113
2020-02-11 13:54:57 +01:00
Stephane Nicoll
3229142188 Merge branch '2.2.x'
Closes gh-20121
2020-02-11 13:50:54 +01:00
Stephane Nicoll
765b2178d1 Document spring-boot.run.arguments behaviour with multiple arguments
Closes gh-19998
2020-02-11 13:39:10 +01:00
Stephane Nicoll
5f584101c6 Merge branch '2.1.x' into 2.2.x 2020-02-11 13:38:05 +01:00
Stephane Nicoll
2a90c3dea4 Fix broken smoke test
See gh-19926
2020-02-11 13:32:31 +01:00
Stephane Nicoll
1306c9b77e Merge branch '2.2.x' 2020-02-11 11:57:27 +01:00
Stephane Nicoll
1e43537212 Fix broken smoke test
See gh-19926
2020-02-11 11:56:52 +01:00