Commit Graph

8175 Commits

Author SHA1 Message Date
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
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
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
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
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
466c1ba251 Merge branch '2.2.x'
Closes gh-20118
2020-02-11 10:31:03 +01:00
Stephane Nicoll
a425cc1b46 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-11 10:30:19 +01:00
Ruslan Stelmachenko
5f7e1ac4f2 Remove unnecessary leading slash in changelog locations
See gh-19926
2020-02-11 10:14:49 +01:00
Stephane Nicoll
32bd845a7d Merge branch '2.2.x'
Closes gh-20116
2020-02-11 09:31:03 +01:00
Stephane Nicoll
66809c6c1e Polish "Fix condition source in OnBeanCondition"
See gh-19948
2020-02-11 09:27:59 +01:00
Jorge Cordoba
547fc30ead Fix condition source in OnBeanCondition
See gh-19948
2020-02-11 09:10:07 +01:00
Madhura Bhave
19b7dc8e4f Merge branch '2.2.x'
Closes gh-20114
2020-02-10 17:11:33 -08:00
Madhura Bhave
d485708f68 Fix 404 when composite contributor is added to a group
Fixes gh-19974
2020-02-10 17:09:01 -08:00
Madhura Bhave
ec42dcd173 Fix typo 2020-02-10 15:22:13 -08:00
dreis2211
aa0360e1ba Fix some deprecation warnings
See gh-20108
2020-02-10 15:28:30 +01:00
Stephane Nicoll
ddcf5966bb Disable Spring Data Neo4j's open session in view by default
Closes gh-20012
2020-02-10 12:28:25 +01:00
Stephane Nicoll
77bdf992ec Polish "Create HazelCastClient if necessary"
See gh-20109
2020-02-10 11:41:10 +01:00
Dmytro Nosan
67dd9ad537 Create HazelCastClient if necessary
This commit makes sure to create a HazelcastClient if an instance name
is provided in configuration and if no such client already exists. This
harmonizes the behaviour with of the server counter-part.

See gh-20109
2020-02-10 11:39:55 +01:00
Stephane Nicoll
e8b97dbc75 Start building against Spring Kafka 2.4.2 snapshots
See gh-20107
2020-02-09 08:58:00 +01:00
Stephane Nicoll
cf06eec174 Start building against Spring AMQP 2.2.4 snapshots
See gh-20105
2020-02-09 08:57:25 +01:00
Stephane Nicoll
a053d207d6 Start building against Spring Integration 5.3 M2 snapshots
See gh-20104
2020-02-09 08:56:44 +01:00
Stephane Nicoll
9d60afdbc4 Merge branch '2.2.x'
Closes gh-20100
2020-02-08 09:12:24 +01:00
Stephane Nicoll
76c21571b4 Remove unnecessary dependency on sendgrid
Closes gh-20099
2020-02-08 09:11:03 +01:00
Stephane Nicoll
2af93b5297 Upgrade to Undertow 2.0.29.Final
Closes gh-20096
2020-02-08 08:04:08 +01:00
Stephane Nicoll
5e02227b02 Upgrade to UnboundID LDAPSDK 4.0.14
Closes gh-20095
2020-02-08 08:04:08 +01:00
Stephane Nicoll
577c8812c5 Upgrade to Spring Retry 1.2.5.RELEASE
Closes gh-20094
2020-02-08 08:04:08 +01:00