Commit Graph

31427 Commits

Author SHA1 Message Date
Andy Wilkinson
ca46fe7cd0 Test our Gradle plugin against Gradle 7.0-rc-1
Closes gh-25763
2021-03-23 10:41:43 +00:00
Andy Wilkinson
9d7135f515 Relax Micrometer import control for docs examples
See gh-25762
2021-03-23 10:30:16 +00:00
Andy Wilkinson
cf7f59fe4b Merge branch '2.4.x'
Closes gh-25762
2021-03-23 10:20:44 +00:00
Andy Wilkinson
5ff7d3bc02 Merge branch '2.3.x' into 2.4.x
Closes gh-25761
2021-03-23 10:20:29 +00:00
Andy Wilkinson
f8c1a73bf2 Prevent import of Micrometer class outside of the Actuator
Closes gh-25760
2021-03-23 10:16:42 +00:00
Andy Wilkinson
5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson
fa336bb565 Move DataSource dependency detection into dedicated package
Closes gh-25757
2021-03-22 14:23:14 +00:00
Stephane Nicoll
a900306b17 Merge branch '2.4.x'
Closes gh-25755
2021-03-22 14:46:37 +01:00
Stephane Nicoll
2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll
2b29b99984 Merge pull request #25129 from bono007
* pr/25129:
  Polish "Take JPA database action into account when setting ddlAuto"
  Take JPA database action into account when setting ddlAuto

Closes gh-25129
2021-03-22 14:44:10 +01:00
Stephane Nicoll
c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007
674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Andy Wilkinson
64f9d8d4fe Deprecate support for Mustache's Environment fallback
Closes gh-21045
2021-03-22 11:45:01 +00:00
Scott Frederick
2dd4010eb0 Merge branch '2.4.x'
Closes gh-25701
2021-03-19 15:58:14 -05:00
Scott Frederick
6f860b441b Merge branch '2.3.x' into 2.4.x
Closes gh-25700
2021-03-19 14:52:20 -05:00
Andy Wilkinson
fb670ee654 Drop support for Gradle 5.6.x
Closes gh-24225
2021-03-19 17:30:27 +00:00
Andy Wilkinson
83342c7aa7 Test the Gradle plugin against 7.0-milestone-3
Closes gh-25747
2021-03-19 17:01:38 +00:00
Phillip Webb
616917c8dc Upgrade spring-asciidoctor-backends to 0.0.1-M1
Closes gh-25553
2021-03-18 21:43:52 -07:00
Phillip Webb
26ee346510 Polish 'Support OpenMetrics text format with Prometheus'
Closes gh-25564
2021-03-18 20:50:43 -07:00
Andy Wilkinson
11b4a19dee Support OpenMetrics text format with Prometheus
Update `PrometheusScrapeEndpoint` so that it can produce both classic
Prometheus text output as well as Openmetrics output.

See gh-25564
2021-03-18 20:50:40 -07:00
Phillip Webb
c81a0223cc Refine 'Allow operations to produce different output'
Refine the new `Producible` support so that it can also be used with
`@ReadOperation`, `@WriteOperation` and `@DeleteOperation` annotations.

This update allows the same enum to be used both as an argument and as
an indicator of the media-types that an operation may produce.

Closes gh-25738
2021-03-18 20:50:27 -07:00
Andy Wilkinson
1ec49cee8b Allow operations to produce different output
Update the actuator @Enpoint` infrastructure code so that operations
may inject enums that indicate the type of output to produce. A new
`Producible` interface can be implemented by any enum that indicates
the mime-type that an enum value produces.

The new `OperationArgumentResolver` provides a general strategy for
resolving operation arguments with `ProducibleOperationArgumentResolver`
providing support for `Producible` enums. Existing injection support has
been refactored to use the new resolver.

See gh-25738
2021-03-18 20:36:18 -07:00
Phillip Webb
663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Phillip Webb
685b045c3d Polish 2021-03-18 14:49:52 -07:00
Phillip Webb
bb38ee38a6 Fix package tangle and polish prefix support
Polish the prefix support introduced in commit a8592f36d4 and fix a
package tangle between `boot.context.properties.source` and `boot.env`.

The `Prefix` interface has now been moved into a new default method on
`OriginLookup`.

See gh-3450
2021-03-18 14:49:52 -07:00
Stephane Nicoll
2c0e0e0662 Merge branch '2.4.x' 2021-03-18 10:40:41 +01:00
Spring Buildmaster
adb82c1d4e Next development version (v2.4.5-SNAPSHOT) 2021-03-18 08:55:52 +00:00
Stephane Nicoll
1111b3db98 Polish 2021-03-18 09:10:42 +01:00
Stephane Nicoll
b132b96989 Merge branch '2.4.x' 2021-03-18 08:29:56 +01:00
Stephane Nicoll
efcb5ee684 Upgrade to Spring Batch 4.3.2
Closes gh-25580
2021-03-18 08:29:43 +01:00
Stephane Nicoll
072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
2021-03-18 08:28:36 +01:00
Stephane Nicoll
5dbe4dd89d Merge branch '2.4.x' 2021-03-18 08:16:55 +01:00
Stephane Nicoll
eff3a4f1a6 Upgrade to Spring Kafka 2.7.0-RC1
Closes gh-25582
2021-03-18 08:14:09 +01:00
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