Commit Graph

26227 Commits

Author SHA1 Message Date
Stephane Nicoll
877f95d528 Start building against Micrometer 1.11.0 snapshots
See gh-34862
2023-04-05 14:12:32 +02:00
Stephane Nicoll
cbf67b1c9a Start building against Spring Framework 6.0.8 snapshots
See gh-34861
2023-04-05 13:50:08 +02:00
Stephane Nicoll
3812cb1b44 Start building against Reactor Bom 2022.0.6 snapshots
See gh-34860
2023-04-05 13:50:04 +02:00
Stephane Nicoll
cc213a5424 Start building against Micrometer Tracing 1.0.4 snapshots
See gh-34859
2023-04-05 13:49:59 +02:00
Stephane Nicoll
bca565bc17 Start building against Micrometer 1.10.6 snapshots
See gh-34858
2023-04-05 13:49:54 +02:00
Stephane Nicoll
6c4809f54b Start building against Spring Framework 5.3.27 snapshots
See gh-34857
2023-04-05 13:31:49 +02:00
Stephane Nicoll
a51dff9ef1 Start building against Reactor Bom 2020.0.31 snapshots
See gh-34856
2023-04-05 13:31:44 +02:00
Stephane Nicoll
f965eff735 Start building against Micrometer 1.9.10 snapshots
See gh-34855
2023-04-05 13:31:38 +02:00
Andy Wilkinson
16b126a481 Merge branch '2.7.x' into 3.0.x
Closes gh-34799
2023-03-28 14:44:33 +01:00
Andy Wilkinson
c9e69b13b1 Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:43:53 +01:00
Andy Wilkinson
bb0ec34e7b Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:28:16 +01:00
Andy Wilkinson
c33906be11 Merge pull request #34759 from isabek
* gh-34759:
  Document requirement for Maven 3.6.3 and later

Closes gh-34759
2023-03-28 11:36:00 +01:00
Isabek Tashiev
e186d441ed Document requirement for Maven 3.6.3 and later
See gh-34759
2023-03-28 11:34:45 +01:00
Andy Wilkinson
d8d6cb7323 Improve diagnostics with @ServiceConnection on non-static field
Closes gh-34795
2023-03-28 10:44:17 +01:00
Andy Wilkinson
2267430bdb Find service connections declaring in enclosing classes
Fixes gh-34790
2023-03-28 10:24:11 +01:00
Andy Wilkinson
cd5d923910 Merge branch '3.0.x'
Closes gh-34793
2023-03-28 10:22:12 +01:00
Andy Wilkinson
b2e6db544b Merge branch '2.7.x' into 3.0.x
Closes gh-34792
2023-03-28 10:21:47 +01:00
Andy Wilkinson
a3135b49c3 Merge pull request #34764 from krzyk
* gh-34764:
  Polish "Fix support for default values in banner placeholders"
  Fix support for default values in banner placeholders

Closes gh-34764
2023-03-28 10:20:23 +01:00
Andy Wilkinson
2d280bb967 Polish "Fix support for default values in banner placeholders"
See gh-34764
2023-03-28 09:57:22 +01:00
Krzysztof Krason
5c01aa719c Fix support for default values in banner placeholders
See gh-34764
2023-03-28 09:53:52 +01:00
Andy Wilkinson
29193c4b9e Merge branch '3.0.x'
Closes gh-34789
2023-03-28 09:33:55 +01:00
Andy Wilkinson
4b58eefe7b Merge branch '2.7.x' into 3.0.x
Closes gh-34788
2023-03-28 09:33:41 +01:00
Andy Wilkinson
4705e82a6e Note that optional dependencies are included by run and repackage
Closes gh-34636
2023-03-28 09:33:06 +01:00
Andy Wilkinson
f62668dfe1 Add Authorization Server starter to spring-boot-dependencies
Fixes gh-34785
2023-03-28 09:28:30 +01:00
Andy Wilkinson
cd17d92eac Merge branch '3.0.x'
Closes gh-34782
2023-03-27 18:05:26 +01:00
Andy Wilkinson
d6dbf300ab Merge branch '2.7.x' into 3.0.x
Closes gh-34781
2023-03-27 18:05:03 +01:00
Andy Wilkinson
5669ea69d0 Consider properties on outer class in nested sliced tests
Prior to this commit, properties configured using the properties
attribute of a `@…Test` sliced test annotation would not be considered
when processed a `@Nested` test class. This would lead to the nested
class not reusing its outer class's application context due to the
two having different property configuration.

Fixes gh-33317
2023-03-27 17:58:51 +01:00
Andy Wilkinson
d69335d94a Use driver class name from JdbcConnectionDetails
Fixes gh-34777
2023-03-27 11:39:28 +01:00
Andy Wilkinson
b91f814e42 Fix incomplete assertions
See gh-34503
2023-03-24 16:48:45 +00:00
Andy Wilkinson
95f45eab1f Create service connections from Testcontainers-managed containers
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.

See gh-34658

Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
Andy Wilkinson
8ec266bea4 Add infrastructure for pluggable connection details factories
See gh-34658

Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
Andy Wilkinson
8721c0e64f Add ConnectionDetail support to Zipkin auto-configuration
Update Zipkin auto-configuration so that `ZipkinConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:26 +00:00
Andy Wilkinson
ac55caa463 Add ConnectionDetail support to Redis auto-configuration
Update Redis auto-configuration so that `RedisConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:26 +00:00
Andy Wilkinson
69f31cb6c0 Add ConnectionDetail support to Rabbit auto-configuration
Update Rabbit auto-configuration so that `RabbitConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson
de8fb04814 Add ConnectionDetail support to Neo4J auto-configuration
Update Neo4J auto-configuration so that `Neo4jConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson
2ef33dc81f Add ConnectionDetail support to Mongo auto-configuration
Update Mongo auto-configuration so that `MongoConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson
042f0c8520 Add ConnectionDetail support to Kafka auto-configuration
Update Kafka auto-configuration so that `KafkaConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson
d860d875b9 Add ConnectionDetail support to Influx auto-configuration
Update Influx auto-configuration so that `InfluxDbConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson
4cc7958c0b Add ConnectionDetail support to Elasticsearch auto-configuration
Update Elasticsearch auto-configuration so that
`ElasticsearchConnectionDetails` beans may be optionally used to
provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson
9f187bb13a Add ConnectionDetail support to Couchbase auto-configuration
Update Couchbase auto-configuration so that
`CouchbaseConnectionDetails` beans may be optionally used to provide
connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson
4307fdc0a0 Add ConnectionDetail support to Cassandra auto-configuration
Update Cassandra auto-configuration so that `CassandraConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:23 +00:00
Andy Wilkinson
61e9fe8cd4 Add ConnectionDetail support to R2DBC auto-configuration
Update R2DBC auto-configuration so that `R2dbcConnectionDetails` beans
may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:23 +00:00
Andy Wilkinson
d09ac00824 Add ConnectionDetail support to JDBC auto-configuration
Update JDBC auto-configuration so that `JdbcConnectionDetails` beans
may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 01:22:44 -07:00
Andy Wilkinson
aa91f2b8b6 Introduce ConnectionDetails interface
Add a `ConnectionDetails` tagging interface which will be used
to mark beans that are a source of configuration settings for
connection to a remove service. When such beans are available,
they will take precedence over any connection-related
configuration properties. Configuration properties that are not
related to the connection itself, such as properties that control
the size and behavior of a connection pool, will still used.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 01:14:31 -07:00
Phillip Webb
c0f59a1f61 Merge branch '3.0.x' 2023-03-23 23:04:35 -07:00
Phillip Webb
d3cdaf9d01 Merge branch '2.7.x' into 3.0.x 2023-03-23 23:04:01 -07:00
Mortitz Halbritter
dcb4f3cf97 Polish 2023-03-23 23:03:46 -07:00
Phillip Webb
3dbc3a1943 Merge branch '3.0.x' 2023-03-23 23:01:32 -07:00
Mortitz Halbritter
42187e7bff Polish 2023-03-23 23:00:58 -07:00
Phillip Webb
b6777524f7 Merge branch '2.7.x' into 3.0.x 2023-03-23 23:00:50 -07:00