Stephane Nicoll
cd81784772
Upgrade to Spring AMQP 2.3.6
...
Closes gh-25648
2021-03-18 07:56:42 +01:00
Stephane Nicoll
91619d6555
Upgrade to Spring Integration 5.5.0-M3
...
Closes gh-25577
2021-03-18 07:56:01 +01:00
Stephane Nicoll
8e35d6a5fc
Upgrade to Spring Integration 5.4.5
...
Closes gh-25646
2021-03-18 07:55:06 +01:00
Phillip Webb
8ba45cc6b5
Allow DB migrations without DataSourceProperties
...
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.
This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.
Closes gh-25643
2021-03-17 17:05:04 -07:00
Phillip Webb
85f1e2c9b6
Refactor DataSourceBuilder and add derivedFrom
...
Refactor `DataSourceBuilder` to use direct property mappers rather than
the `Binder` and aliases. Supported DataSource types now include two-way
mappers which allows us to both get and set properties in a uniform way.
A new `derivedFrom` factory method has been added which allows a new
`DataSource` to be derived from an existing one. This update is
primarily to allow Flyway and Liquibase migrations to work against a
`@Bean` configured DataSource rather than assuming that the primary
DataSource was always created via auto-configuration.
See gh-25643
2021-03-17 17:00:44 -07:00
Phillip Webb
6e92daa0a0
Change Kafka cleanup.on-shutdown default to false
...
Align our property with the recently changed spring-kafka default.
Closes gh-25730
2021-03-17 16:38:46 -07:00
Scott Frederick
e4fa39df01
Fail fast when finalName is misconfigured
...
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.
Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson
d0d78a6caa
Merge branch '2.4.x'
2021-03-17 18:40:58 +00:00
Andy Wilkinson
0d7a60f8cf
Upgrade to Spring AMQP 2.3.6
...
Closes gh-25647
2021-03-17 18:27:16 +00:00
Andy Wilkinson
5005bd3ded
Upgrade to Spring Kafka 2.6.7
...
Closes gh-25578
2021-03-17 18:26:44 +00:00
Andy Wilkinson
af3aa234de
Merge branch '2.4.x'
...
Closes gh-25728
2021-03-17 17:38:39 +00:00
Andy Wilkinson
2c2e2c8448
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25727
2021-03-17 17:38:17 +00:00
Andy Wilkinson
4358d9bc39
Update CI to use Artifactory Resource 0.0.14
...
Closes gh-25698
2021-03-17 17:37:09 +00:00
Stephane Nicoll
54e7d7f060
Promote ConnectionFactoryBuilder to the "spring-boot" module
...
Closes gh-25492
2021-03-17 16:26:54 +00:00
Stephane Nicoll
9ba2cd3be7
Merge branch '2.4.x'
2021-03-17 16:03:06 +01:00
Stephane Nicoll
426fb49951
Merge branch '2.3.x' into 2.4.x
2021-03-17 16:02:53 +01:00
Stephane Nicoll
b61e4bbe08
Merge pull request #25721 from shakuzen
...
* pr/25721:
Polish "Support sending metrics to InfluxDB v2"
Support sending metrics to InfluxDB v2
Closes gh-25721
2021-03-17 15:57:07 +01:00
Stephane Nicoll
8808d5e4c0
Polish "Support sending metrics to InfluxDB v2"
...
See gh-25721
2021-03-17 15:56:04 +01:00
Tommy Ludwig
8eb73bcf01
Support sending metrics to InfluxDB v2
...
See gh-25721
2021-03-17 15:14:43 +01:00
Stephane Nicoll
6f9352bda9
Fix description of management.metrics.export.influx.db
...
Closes gh-25723
2021-03-17 15:09:37 +01:00
Stephane Nicoll
91c3c7276b
Merge branch '2.4.x'
...
Closes gh-25725
2021-03-17 15:08:47 +01:00
Stephane Nicoll
42994349fe
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25724
2021-03-17 15:08:32 +01:00
Stephane Nicoll
446e838b1b
Fix description of management.metrics.export.influx.db
...
Closes gh-25723
2021-03-17 15:07:02 +01:00
Stephane Nicoll
070d5e7ab7
Merge branch '2.4.x'
2021-03-17 14:42:18 +01:00
Stephane Nicoll
2f1ee94321
Upgrade to Spring Data 2021.0.0-M5
...
Close gh-25548
2021-03-17 14:42:03 +01:00
Stephane Nicoll
83ae2df42f
Upgrade to Lettuce 6.1.0.RC1
...
Closes gh-25722
2021-03-17 14:40:23 +01:00
Stephane Nicoll
606c871d4a
Upgrade to Spring Data 2020.0.6
...
Closes gh-25547
2021-03-17 14:27:48 +01:00
Stephane Nicoll
052624ffb2
Upgrade to Lettuce 6.0.3.RELEASE
...
Closes gh-25720
2021-03-17 14:25:38 +01:00
Stephane Nicoll
a8667daf52
Upgrade to Kotlin Coroutines 1.4.3
...
Closes gh-25719
2021-03-17 14:25:36 +01:00
Andy Wilkinson
67545cf4f1
Polish
2021-03-17 12:39:50 +00:00
Andy Wilkinson
7ef9ca02c1
Merge branch '2.4.x'
...
Closes gh-25718
2021-03-17 12:26:58 +00:00
Andy Wilkinson
758a2ee7ca
Don't pass null exception translation result into jOOQ
...
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson
2adf3f836c
Merge branch '2.4.x'
2021-03-17 12:25:24 +00:00
Andy Wilkinson
c815195f13
Polish
2021-03-17 12:25:13 +00:00
Andy Wilkinson
36c72cb6ef
Merge branch '2.4.x'
...
Closes gh-25716
2021-03-17 11:33:48 +00:00
Andy Wilkinson
5595fd4017
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson
0e0418546b
Test spring-boot:build-image when repackage is also invoked
...
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson
68e5a107cc
Revert "Merge branch '2.4.x'"
...
This reverts commit 5488b8cb46
, reversing
changes made to dee0df5c53
.
See gh-25701
2021-03-17 11:17:54 +00:00
Andy Wilkinson
70036409aa
Merge branch '2.4.x'
2021-03-17 11:17:39 +00:00
Andy Wilkinson
ed4e419b0c
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit eaa510872a
, reversing
changes made to 3e69522e2d
.
See gh-25700
2021-03-17 11:13:58 +00:00
Andy Wilkinson
6ddf525ac0
Merge branch '2.3.x' into 2.4.x
2021-03-17 11:12:36 +00:00
Andy Wilkinson
ae2ff7849b
Revert "Fail fast when finalName is misconfigured"
...
This reverts commit 263b7c20e4
.
See gh-25590
2021-03-17 11:11:24 +00:00
Stephane Nicoll
e9c596746b
Merge pull request #25707 from jonatan-ivanov
...
* pr/25707:
Polish "Upgrade to Micrometer 1.7.0-M1"
Upgrade to Micrometer 1.7.0-M1
Closes gh-25707
2021-03-17 11:41:19 +01:00
Stephane Nicoll
eb406867ea
Polish "Upgrade to Micrometer 1.7.0-M1"
...
See gh-25707
2021-03-17 11:28:52 +01:00
Jonatan Ivanov
7c5e0505d8
Upgrade to Micrometer 1.7.0-M1
...
See gh-25707
2021-03-17 11:12:25 +01:00
Stephane Nicoll
7e6df7d0e8
Merge branch '2.4.x'
...
Closes gh-25710
2021-03-17 08:44:18 +01:00
Stephane Nicoll
c0c23ae50c
Merge pull request #25709 from dreis2211
...
* pr/25709:
Upgrade to Java 16 GA builds in CI
Closes gh-25709
2021-03-17 08:44:07 +01:00
dreis2211
678da84dd9
Upgrade to Java 16 GA builds in CI
...
See gh-25709
2021-03-17 08:43:55 +01:00
Scott Frederick
5488b8cb46
Merge branch '2.4.x'
...
Closes gh-25701
2021-03-16 17:48:54 -05:00
Scott Frederick
eaa510872a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-16 17:31:32 -05:00