14882 Commits

Author SHA1 Message Date
Jonatan Ivanov
dd475a2445 Expose Elastic's apiKeyCredentials property
See gh-28400
2021-10-21 17:17:01 +01:00
Andy Wilkinson
56b8494f15 Disable the env info contributor by default
Closes gh-28311
2021-10-20 12:42:17 +01:00
Andy Wilkinson
f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
2021-10-20 12:18:54 +01:00
Andy Wilkinson
f2b3f1f41f Make URL- and property-based pooling config mutually exclusive
Closes gh-28144
2021-10-20 11:22:05 +01:00
Stephane Nicoll
052726f5d9 Upgrade to Spring Integration 5.5.5
Closes gh-28259
2021-10-20 08:43:03 +02:00
Madhura Bhave
40a3824279 Reinstate ConditionalOnBean
See gh-28131
2021-10-19 21:23:48 -07:00
Madhura Bhave
b7521e2fda Auto-configure health web components only if endpoint is exposed over HTTP
Fixes gh-28131

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-10-19 20:26:44 -07:00
Scott Frederick
871468931f Polish "Add option to customize cache volume names when building an image"
See gh-28292
2021-10-19 15:38:12 -05:00
Julian Liebig
dc36346285 Add option to customize cache volume names when building an image
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the names of build and launch cache volumes provided
to the CNB builder.

See gh-28292
2021-10-19 15:38:12 -05:00
Andy Wilkinson
9d6a0cfd24 Starting building against Spring Framework 5.3.12 snapshots
This reverts commit 3969e63ced8e349474c9de5ca2907583c1516d95, reversing
changes made to f01d086a8d1ac5bee92d04c21b3c6c9785006aa9.

Closes gh-28385
See gh-28252
2021-10-19 18:43:53 +01:00
Andy Wilkinson
6c43914652 Merge branch '2.5.x'
Closes gh-28383
2021-10-19 17:43:40 +01:00
Andy Wilkinson
76272ffb62 Merge branch '2.4.x' into 2.5.x
Closes gh-28382
2021-10-19 17:43:30 +01:00
Andy Wilkinson
54ce51e43c Polish "Fix typos in EnvironmentPostProcessor javadoc"
See gh-28376
2021-10-19 17:43:16 +01:00
fml2
ded396b728 Fix typos in EnvironmentPostProcessor javadoc
See gh-28376
2021-10-19 17:41:46 +01:00
Andy Wilkinson
356554311f Merge branch '2.5.x'
Closes gh-28381
2021-10-19 17:17:29 +01:00
Artem Bilan
344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson
9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean"
See gh-28361
2021-10-19 16:30:06 +01:00
Bartosz Jaszczak
31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean
See gh-28361
2021-10-19 16:19:12 +01:00
Andy Wilkinson
791f3f57c6 Upgrade to Spring Kafka 2.8.0-RC1
Closes gh-28257
2021-10-19 14:45:44 +01:00
Andy Wilkinson
ab3396de26 Upgrade to Spring Security 5.5.3
Closes gh-28247
2021-10-19 14:35:22 +01:00
Andy Wilkinson
d767e0e1f1 Upgrade to Spring Kafka 2.7.8
Closes gh-28246
2021-10-19 14:34:39 +01:00
Andy Wilkinson
ce8671ff37 Upgrade to Spring Security 5.4.9
Closes gh-28228
2021-10-19 14:32:57 +01:00
Andy Wilkinson
669caa92f8 Upgrade to Spring Kafka 2.6.11
Closes gh-28227
2021-10-19 14:32:33 +01:00
Andy Wilkinson
a27dfcb9b0 Make R2DBC auto-config back off without a connection provider
Closes gh-26439
2021-10-19 14:18:34 +01:00
Andy Wilkinson
2af2a02fbb Merge branch '2.5.x'
Closes gh-28380
2021-10-19 14:18:12 +01:00
Andy Wilkinson
c8e0791b50 Merge branch '2.4.x' into 2.5.x
Closes gh-28379
2021-10-19 14:17:53 +01:00
Andy Wilkinson
5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC
Fixes gh-28378
2021-10-19 13:52:45 +01:00
Andy Wilkinson
8ac2a59000 Upgrade to Spring Security 5.6.0-RC1
Closes gh-28258
2021-10-19 11:18:41 +01:00
Andy Wilkinson
657eb86dad Polish "Add a config prop to enable/disable SI's default logging"
See gh-28355
2021-10-19 11:04:32 +01:00
Artem Bilan
c6891c5184 Add a config prop to enable/disable SI's default logging
See gh-28355
2021-10-19 11:04:32 +01:00
Andy Wilkinson
14fb9c437d Merge branch '2.5.x'
See gh-28377
2021-10-19 11:03:51 +01:00
Andy Wilkinson
bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration
See gh-28345
2021-10-19 11:03:20 +01:00
Andy Wilkinson
89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
2021-10-19 10:01:30 +01:00
Phillip Webb
04123e0a0e Merge branch '2.5.x'
Closes gh-28377
2021-10-18 21:47:07 -07:00
Phillip Webb
b93a629dbe Shutdown in-memory R2DBC databases before devtools restart
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
2021-10-18 21:46:12 -07:00
Phillip Webb
19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson
9ff17edb78 Upgrade to Spring Data 2021.1.0-RC1
Closes gh-28255
2021-10-18 19:17:20 +01:00
Andy Wilkinson
43a10eab59 Upgrade to Spring AMQP 2.4.0-RC1
Closes gh-28256
2021-10-18 19:15:37 +01:00
Andy Wilkinson
f87b2478d5 Upgrade to Spring AMQP 2.3.11
Closes gh-28245
2021-10-18 19:14:28 +01:00
Andy Wilkinson
754b52c6bc Upgrade to Spring AMQP 2.3.11
Closes gh-28226
2021-10-18 19:12:19 +01:00
Andy Wilkinson
31d88c3d3c Improve failure analysis action when circular references are allowed
Closes gh-27735
2021-10-18 16:02:13 +01:00
Andy Wilkinson
42ef97b9ec Merge branch '2.5.x'
Closes gh-28372
2021-10-18 15:07:16 +01:00
Andy Wilkinson
5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
2021-10-18 15:06:58 +01:00
Andy Wilkinson
a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
2021-10-18 13:37:45 +01:00
Andy Wilkinson
a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +01:00
Andy Wilkinson
779439311d Revert "Upgrade to Spring Data 2020.0.14"
This reverts commit 752789d3ee72490b611830d6f68c06dc31d93a93.

See gh-28225
2021-10-18 12:59:20 +01:00
Andy Wilkinson
c39e9fa918 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit fda26703b2e1df6dcaf319a47704a98cf8461880.

See gh-28261
2021-10-18 12:32:37 +01:00
Andy Wilkinson
c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit c0605ffc71f0086a7529eb117cdd587f9136e401.

See gh-28250
2021-10-18 12:31:23 +01:00
Andy Wilkinson
22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit 33ffae8e74adf1bee0fe98b7333dc6d0ff030564.

See gh-28230
2021-10-18 12:30:20 +01:00
Andy Wilkinson
16dbdc5d88 Upgrade to Spring Data 2021.0.6
Closes gh-28244
2021-10-18 12:28:20 +01:00