Commit Graph

20810 Commits

Author SHA1 Message Date
Stephane Nicoll ae0efba523 Merge branch '3.0.x'
See gh-35312
2023-05-05 12:09:03 +02:00
Stephane Nicoll 1b4f9a7e9c Remove GraphQL's tracing observation auto-configuration
This commit removes the auto-configuration for
PropagationWebGraphQlInterceptor as it has been deprecated with no
replacement.

See gh-35303
2023-05-05 12:07:12 +02:00
Stephane Nicoll 66cc9d73b8 Merge branch '3.0.x' 2023-05-05 11:58:30 +02:00
Stephane Nicoll be29ab389a Merge branch '2.7.x' into 3.0.x 2023-05-05 11:57:51 +02:00
Stephane Nicoll eeefb2a1de Polish 2023-05-05 11:55:46 +02:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2023-05-05 11:34:55 +02:00
Moritz Halbritter 4d14d0e437 Merge branch '3.0.x'
Closes gh-35321
2023-05-05 11:31:54 +02:00
Moritz Halbritter 8a14f6d017 Clarify conditional support when using AOT
Closes gh-35262
2023-05-05 11:31:17 +02:00
Moritz Halbritter e356a483b6 Add subject alt to JKS store and re-enable OkHttp SSL tests
Closes gh-35106
2023-05-05 11:17:24 +02:00
Stephane Nicoll 984481e150 Start building against Spring WS 4.0.4 snapshots
See gh-35304
2023-05-05 11:03:19 +02:00
Moritz Halbritter c4deae3906 Document that Spring Boot by default calls 'docker compose stop' 2023-05-05 10:21:09 +02:00
Stephane Nicoll e95c0496c1 Start building against Spring Data Bom 2022.0.6 snapshots
See gh-35301
2023-05-05 09:40:50 +02:00
Stephane Nicoll d9f28c513d Start building against Spring Batch 5.0.2 snapshots
See gh-35300
2023-05-05 09:40:49 +02:00
Stephane Nicoll 968006cc19 Start building against Reactor Bom 2022.0.7 snapshots
See gh-35299
2023-05-05 09:40:49 +02:00
Stephane Nicoll 28024b2d7f Start building against Micrometer 1.10.7 snapshots
See gh-35298
2023-05-05 09:40:49 +02:00
Stephane Nicoll 2b03e51a19 Start building against Spring WS 3.1.7 snapshots
See gh-35295
2023-05-05 09:33:00 +02:00
Stephane Nicoll d614d1336e Start building against Spring Integration 5.5.18 snapshots
See gh-35294
2023-05-05 09:32:59 +02:00
Stephane Nicoll f32923da1a Start building against Spring Data Bom 2021.2.12 snapshots
See gh-35292
2023-05-05 09:32:59 +02:00
Stephane Nicoll b4715f5e1e Start building against Reactor Bom 2020.0.32 snapshots
See gh-35291
2023-05-05 09:32:59 +02:00
Stephane Nicoll ec72bcc9a8 Start building against Micrometer 1.9.11 snapshots
See gh-35290
2023-05-05 09:32:58 +02:00
Phillip Webb 56af1569d3 Refine @ImportTestcontainers support
Refine logic so that bean names are no longer generated based on their
type and containers are started early.

See gh-35245
2023-05-04 15:40:12 -07:00
Scott Frederick 1143396531 Add smoke tests to verify Couchbase SSL connections
See gh-34811
2023-05-04 17:09:52 -05:00
Scott Frederick d4107a8185 Add smoke tests to verify Cassandra SSL connections
See gh-25602
2023-05-04 16:11:28 -05:00
Andy Wilkinson 4f9616c2f9 Change DockerComposeProperties shut down default to stop
Closes gh-35239
2023-05-04 21:09:16 +01:00
Andy Wilkinson 6a39b497ad Make Oracle Docker Compose integration tests more robust
Closes gh-35285
2023-05-04 19:40:29 +01:00
Andy Wilkinson c78cc4408a Disable more s-b-testcontainers tests when Docker is unavailable
See gh-35245
2023-05-04 16:58:46 +01:00
Andy Wilkinson d224f69c7b Upgrade to R2DBC MySQL 1.0.1
Closes gh-35284
2023-05-04 16:58:45 +01:00
Andy Wilkinson 9169a9daa2 Upgrade to Netty 4.1.92.Final
Closes gh-35283
2023-05-04 16:58:45 +01:00
Andy Wilkinson 8cd3741e16 Upgrade to Mockito 5.3.1
Closes gh-35282
2023-05-04 16:58:45 +01:00
Andy Wilkinson 38ba2b98bc Upgrade to MariaDB 3.1.4
Closes gh-35281
2023-05-04 16:58:44 +01:00
Andy Wilkinson 8de41b43ae Upgrade to JUnit Jupiter 5.9.3
Closes gh-35279
2023-05-04 16:58:43 +01:00
Andy Wilkinson 6f816d196d Upgrade to Jakarta Activation 2.1.2
Closes gh-35278
2023-05-04 16:58:43 +01:00
Andy Wilkinson c4da29e1ab Upgrade to Jackson Bom 2.15.0
Closes gh-35277
2023-05-04 16:58:43 +01:00
Andy Wilkinson bae40eeffe Upgrade to Infinispan 14.0.9.Final
Closes gh-35276
2023-05-04 16:58:42 +01:00
Andy Wilkinson 306dc637a0 Upgrade to Hibernate 6.2.2.Final
Closes gh-35275
2023-05-04 16:58:42 +01:00
Andy Wilkinson c52c48e444 Upgrade to Elasticsearch Client 8.7.1
Closes gh-35274
2023-05-04 16:58:41 +01:00
Andy Wilkinson 7477ec135d Switch Bomr's upgrade policy to same minor version 2023-05-04 16:58:41 +01:00
Stephane Nicoll e6afc490b0 Expose ApplicationContext when using SpringApplication#from
This commit returns the running application context when running an
application via SpringApplication#from so that it is consistent with
the regular SpringApplication#run.

Closes gh-35203
2023-05-04 17:10:10 +02:00
Andy Wilkinson 10fd7517a8 Disable ImportTestcontainersTests when Docker is unavailable
See gh-35245
2023-05-04 15:40:27 +01:00
Andy Wilkinson 19d7973776 Add bootTestRun to run app using test source set output and classpath
Closes gh-35248
2023-05-04 15:27:10 +01:00
Stephane Nicoll a14b1d6807 Merge branch '3.0.x'
Closes gh-35272
2023-05-04 16:08:55 +02:00
Thebora Kompanioni 319f98680b Add reference to Tor Spring Boot Starter
See gh-35256
2023-05-04 16:08:18 +02:00
Andy Wilkinson e43998615c Add a test-run goal to the Maven plugin
Closes gh-35202
2023-05-04 15:06:03 +01:00
Moritz Halbritter 5f84588b5d Merge branch '3.0.x'
Closes gh-35270
2023-05-04 13:24:07 +02:00
Moritz Halbritter ea4521acdb Merge branch '2.7.x' into 3.0.x
Closes gh-35269
2023-05-04 13:23:44 +02:00
Moritz Halbritter 6ca9f91a8b Fix NPE when gracefully shutting down netty
Closes gh-35264
2023-05-04 11:54:05 +02:00
Jonatan Ivanov 5142e8e157
Support Brave's joint spans
Brave has a feature called joint spans that was enabled by default with
Spring Cloud Sleuth (and Boot 2.x). This has changed with
Micrometer Tracing and Boot 3.x. In order to make migration simpler,
joint spans should be set through a property.
This is a Brave+B3-only feature, W3C is not supported by Brave and
OTel does not have this capability.

See gh-35165
2023-05-03 17:22:12 -07:00
Andy Wilkinson 8494ad82cd Merge branch '3.0.x'
Closes gh-35255
2023-05-03 17:45:17 +01:00
Andy Wilkinson 0776d01f16 Merge branch '2.7.x' into 3.0.x
Closes gh-35254
2023-05-03 17:44:49 +01:00
Andy Wilkinson fad24d5ced Fix handling of default port in mail health indicator
Fixes gh-35247
2023-05-03 17:33:37 +01:00
Moritz Halbritter 243b337954 Remove copyright from the anchor-rewrite.properties 2023-05-03 16:11:53 +02:00
Moritz Halbritter 46fedfc4ef Move JAR unpacking section and add AOT on JVM section
Closes gh-32905
2023-05-03 16:01:19 +02:00
Moritz Halbritter bdca30e85b Polish 2023-05-03 14:33:07 +02:00
Moritz Halbritter 71f4247340 Improve headings
See gh-32779
2023-05-03 14:31:43 +02:00
Moritz Halbritter 56b8e419be Update getting started with alternative gradle instructions
Closes gh-32779
2023-05-03 14:29:02 +02:00
Moritz Halbritter 9b5a2643cc Polish "Add service connection from Testcontainers Zipkin"
See gh-35107
2023-05-03 13:09:50 +02:00
Eddú Meléndez ad4f6ffeb7 Add service connection from Testcontainers Zipkin
See gh-35107
2023-05-03 13:09:49 +02:00
Phillip Webb 8427e813af Support import of idomatic testcontainer declaration classes
Add an `@ImportTestcontainers` annotation which can be used to import
idomatic testcontainer declaration classes.

Closes gh-35245
2023-05-03 00:28:36 -07:00
Phillip Webb 26566d4a30 Allow testcontainer beans to also contribute properties
Allow `Container` bean definitions to inject a `DynamicPropertyRegistry`
so that they can contribute environment properties.

Closes gh-35201
2023-05-03 00:27:13 -07:00
Phillip Webb e9578fe745 Swallow BeanCurrentlyInCreationException exceptions
Update `TestcontainersLifecycleBeanPostProcessor` to that initialization
doesn't fail if a `BeanCurrentlyInCreationException` is thrown.

Prior to this commit, if the first bean being post-processed was a
configuration class declaring a bean that the `Container` depended on
all initialization would fail.

See gh-35223
2023-05-03 00:24:30 -07:00
Phillip Webb 3997771f6c Polish 2023-05-02 23:40:30 -07:00
Phillip Webb d86e82d026 Merge branch '3.0.x' 2023-05-02 15:42:05 -07:00
Phillip Webb 2c27ec5b7b Merge branch '2.7.x' into 3.0.x 2023-05-02 15:42:00 -07:00
Phillip Webb b3226c55d2 Polish 2023-05-02 15:41:55 -07:00
Phillip Webb 8e18862582 Merge branch '3.0.x' 2023-05-02 15:41:26 -07:00
Phillip Webb 8d1fb3be4f Fix index error on test
See gh-35241
2023-05-02 15:41:07 -07:00
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb 6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Phillip Webb cd5f0dff21 Merge branch '3.0.x'
Closes gh-35242
2023-05-02 14:51:24 -07:00
Phillip Webb 722cbc66c6 Merge branch '2.7.x' into 3.0.x
Closes gh-35241
2023-05-02 14:51:13 -07:00
Phillip Webb 5ef0ee0ed4 Prevent early initialization of SessionRepository beans
Replace `SessionRepositoryFilterConfiguration` filter registration bean
with a `DelegatingFilterProxyRegistrationBean` so that
`SessionRepository` beans are not initialized early.

Fixes gh-35240
2023-05-02 14:47:15 -07:00
Scott Frederick 23ae91b008 Add native image manifest entry
A manifest entry `Spring-Boot-Native-Processed: true` is added to the
jar manifest by the Maven or Gradle plugin when the jar has been built
for use in a native image. With the Gradle plugin, this is done in
reaction to the GraalVM Native Image Plugin being applied to the
project. With the Maven plugin, this is done when the `native` profile
is applied to the build.
2023-05-02 15:11:49 -05:00
Scott Frederick 5ac6a3d90b Add smoke test to verify MongoDB SSL connections
See gh-35042
2023-05-02 15:11:09 -05:00
Scott Frederick 3bb271e320 Add smoke test to verify Redis SSL connection
See gh-34815
2023-05-02 13:52:50 -05:00
Andy Wilkinson 161b54b1d4 Set Logback's root log level to INFO as early as possible
Closes gh-35238
2023-05-02 18:29:52 +01:00
Andy Wilkinson aafe343ce6 Merge branch '3.0.x'
Closes gh-35237
2023-05-02 16:19:54 +01:00
Andy Wilkinson 9a39bf284b Merge branch '2.7.x' into 3.0.x
Closes gh-35235
2023-05-02 16:19:30 +01:00
Andy Wilkinson 7c2c2ebb1b Make ApplicationAvailabilityBean receive events with lazy init
Fixes gh-35161
2023-05-02 16:19:08 +01:00
Moritz Halbritter 9d50d92b9c Merge branch '3.0.x' 2023-05-02 16:36:49 +02:00
Moritz Halbritter 1f4a337ad2 Merge branch '2.7.x' into 3.0.x 2023-05-02 16:17:50 +02:00
Moritz Halbritter 091d6204cb Disable build image integration tests on aarch64 linux and mac
See gh-35229
2023-05-02 15:38:42 +02:00
Moritz Halbritter 7c725a7560 Polish DockerImageNames 2023-05-02 15:01:45 +02:00
Moritz Halbritter 2586150eaf Disable ARM incompatible integration tests 2023-05-02 14:59:49 +02:00
Moritz Halbritter 735c43ce9b Merge branch '2.7.x' into 3.0.x 2023-05-02 14:38:48 +02:00
Moritz Halbritter 312f0c17ed Set initial ElasticSearch heap size in integration tests 2023-05-02 14:37:13 +02:00
Moritz Halbritter 944d77491b Set initial heap size for ElasticSearch integration tests 2023-05-02 14:25:35 +02:00
Moritz Halbritter 9a545727b9 Disable SQL server and Oracle database compose tests on ARM
See gh-35229
2023-05-02 14:16:56 +02:00
Moritz Halbritter 1ce88f25b4 Merge branch '3.0.x' 2023-05-02 14:08:37 +02:00
Moritz Halbritter 037cb8c5b0 Merge branch '2.7.x' into 3.0.x 2023-05-02 13:57:37 +02:00
Moritz Halbritter c1cef099d2 Limit maximum heap of ElasticSearch in tests 2023-05-02 13:40:59 +02:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Moritz Halbritter 9f109fe785 Disable Couchbase integration tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson 419d8c22b2 Merge branch '3.0.x'
Closes gh-35231
2023-05-02 11:58:58 +01:00
Andy Wilkinson 8f291abc2b Merge branch '2.7.x' into 3.0.x
Closes gh-35230
2023-05-02 11:58:33 +01:00
Juhan Aasaru 3b70286747 Correct list of annotations equivalent to @SpringBootApplication
See gh-35180
2023-05-02 11:57:18 +01:00
Andy Wilkinson d24167371e Merge branch '3.0.x'
Closes gh-35226
2023-05-02 09:17:28 +01:00
Andy Wilkinson 8f3f74ffd5 Merge branch '2.7.x' into 3.0.x
Closes gh-35225
2023-05-02 09:03:17 +01:00
Andy Wilkinson 695e58f418 Align buildSrc's Framework version with the main build's version
Closes gh-35224
2023-05-02 08:59:58 +01:00
Andy Wilkinson b1d0433d74 Handle Kafka servers as strings and rely on Kafka's parsing
Closes gh-34770
2023-05-02 08:38:40 +01:00