Commit Graph

21053 Commits

Author SHA1 Message Date
Andy Wilkinson ca36c0b3ae Upgrade to Spring WS 4.0.4
Closes gh-35304
2023-05-11 18:27:26 +01:00
Andy Wilkinson 9f55d5de18 Revert "Start building against Spring WS 3.1.7 snapshots"
This reverts commit 2b03e51a19.

See gh-35295
2023-05-11 18:14:35 +01:00
Andy Wilkinson 2ca787f78c Merge branch '3.0.x'
Closes gh-35400
2023-05-11 13:47:55 +01:00
Andy Wilkinson acafb907f6 Generate hints for all methods that JavaBeanBinder may call
Fixes gh-35397
2023-05-11 13:34:43 +01:00
Andy Wilkinson c254610e4d Improve testing of BindableRuntimeHintsRegistrar
Closes gh-35398
2023-05-11 13:33:47 +01:00
Andy Wilkinson 88866d7baf Merge branch '3.0.x'
Closes gh-35399
2023-05-11 12:11:29 +01:00
Andy Wilkinson 2d08ba18c1 Improve testing of BindableRuntimeHintsRegistrar
Closes gh-35398
2023-05-11 11:59:34 +01:00
Moritz Halbritter e930801eb1 Separate tag in the Docker API tag call
Closes gh-35358
2023-05-11 09:52:52 +02:00
Moritz Halbritter d00e070cdb Separate tag in the Docker API tag call
Closes gh-35358
2023-05-11 09:52:45 +02:00
Moritz Halbritter 4eef8d5a53 Separate tag in the Docker API tag call
Closes gh-35358
2023-05-11 09:52:41 +02:00
Phillip Webb 60930c0285 Merge branch '2.5.x' into 2.6.x 2023-05-10 23:33:42 -07:00
Phillip Webb 9af19370a6 Backport build and CI concerns
Backport build and CI concerns primarily related to repo.spring.io
changes and Docker config.
2023-05-10 23:29:30 -07:00
Scott Frederick 271cbb76c1 Improve documentation for including Docker Compose support in a build
Closes gh-35384
2023-05-10 13:42:36 -05:00
Scott Frederick 8377306668 Improve error when Docker Compose file not found
Fixes gh-35383
2023-05-10 13:26:59 -05:00
Steve Riesenberg 10feecbd08 Fix redirect to login page for token requests
Fixes an issue where auto-configuration for Spring Authorization Server
was overriding the default exception handling (AuthenticationEntryPoint)
resulting in anonymous requests to the token endpoint being redirected
to the Spring Security login page instead of returning 401 Unauthorized.

Auto-configuration now registers a defaultAuthenticationEntryPointFor
that is added to any other entry points already configured.

See gh-35368
2023-05-10 11:32:06 +02:00
Christoph Dreis 6086e81ccd Fix configuring replica set via PropertiesMongoConnectionDetails
See gh-35370
2023-05-10 11:23:19 +02:00
Moritz Halbritter 9f787050b4 Merge branch '3.0.x'
Closes gh-35381
2023-05-10 11:08:33 +02:00
Moritz Halbritter 53d2a9fb34 Merge branch '2.7.x' into 3.0.x
Closes gh-35380
2023-05-10 10:58:03 +02:00
Moritz Halbritter ec4d52e381 Add ReactiveResponseConsumer classpath check to http5 auto-configuration
Closes gh-34964
2023-05-10 10:47:08 +02:00
Moritz Halbritter 0ebb32e7f0 Merge branch '3.0.x'
Closes gh-35379
2023-05-10 10:28:57 +02:00
Moritz Halbritter 7e50485b23 Merge branch '2.7.x' into 3.0.x
Closes gh-35378
2023-05-10 10:28:47 +02:00
Moritz Halbritter 947ac8df73 Map MinIdle and MaxValidationTime to R2DBC pools
Closes gh-34724
2023-05-10 10:16:43 +02:00
Stephane Nicoll d488759cae Start building against Spring WS 4.0.4 snapshots
See gh-35318
2023-05-10 09:19:06 +02:00
Stephane Nicoll e3c126ae54 Start building against Spring Batch 5.0.2 snapshots
See gh-35309
2023-05-10 09:19:06 +02:00
Stephane Nicoll 157e0d5b20 Start building against Spring Kafka 3.0.7 snapshots
See gh-35376
2023-05-10 09:19:06 +02:00
Stephane Nicoll a9e7b902b5 Start building against Spring Kafka 3.0.7 snapshots
See gh-35375
2023-05-10 08:41:41 +02:00
Stefano Cordio d802ca017b Small assertions improvements
See gh-34796
2023-05-10 08:38:07 +02:00
Johnny Lim ff9fd1abeb Polish
See gh-35185
2023-05-10 08:31:36 +02:00
Yanming Zhou 1cddb2a55f Fix typo
See gh-35369
2023-05-10 08:27:33 +02:00
Moritz Halbritter 05add58976 Merge branch '3.0.x'
Closes gh-35373
2023-05-10 08:23:35 +02:00
Moritz Halbritter 42cc84070b Merge branch '2.7.x' into 3.0.x
Closes gh-35372
2023-05-10 08:23:27 +02:00
Moritz Halbritter 52789cb191 Fix anchors in Maven plugin documentation
Closes gh-35371
2023-05-10 08:21:44 +02:00
Andy Wilkinson 93c3116b3a Fix failsGracefullyWhenNoTestMainMethodIsFound on Windows 2023-05-09 16:56:18 +01:00
Christoph Dreis 2d1a403605 Fix javadoc in OAuth2AuthorizationServerPropertiesMapper
See gh-35366
2023-05-09 16:38:45 +01:00
Moritz Halbritter 0f1870ee98 Merge branch '3.0.x'
Closes gh-35367
2023-05-09 14:56:30 +02:00
Moritz Halbritter 077f61bd5d Allow loading of YAML files bigger than 3 MB
Closes gh-34743
2023-05-09 14:56:09 +02:00
Stephane Nicoll 2b7bed8bf7 Upgrade to Reactor Bom 2022.0.7
Closes gh-35307
2023-05-09 14:54:06 +02:00
Stephane Nicoll dad68573c7 Upgrade to Micrometer Tracing 1.1.0
Closes gh-35306
2023-05-09 14:54:06 +02:00
Stephane Nicoll 33cc926669 Upgrade to Micrometer 1.11.0
Closes gh-35305
2023-05-09 14:54:05 +02:00
Stephane Nicoll 568e168aeb Upgrade to Reactor Bom 2022.0.7
Closes gh-35299
2023-05-09 14:53:52 +02:00
Stephane Nicoll 47c37c1014 Upgrade to Micrometer Tracing 1.0.5
Closes gh-35363
2023-05-09 14:53:52 +02:00
Stephane Nicoll 3635bead5c Upgrade to Micrometer 1.10.7
Closes gh-35298
2023-05-09 14:53:52 +02:00
Stephane Nicoll 21cca4f30d Upgrade to Reactor Bom 2020.0.32
Closes gh-35291
2023-05-09 14:53:43 +02:00
Stephane Nicoll e47738b84d Upgrade to Micrometer 1.9.11
Closes gh-35290
2023-05-09 14:53:43 +02:00
Moritz Halbritter 0391860ec3 Merge branch '3.0.x'
Closes gh-35365
2023-05-09 14:38:16 +02:00
Moritz Halbritter 086d654f0b Add support for Ed25519 EC keys
See gh-35364
2023-05-09 14:18:08 +02:00
Moritz Halbritter 69ac9bbe6d Merge branch '2.7.x' into 3.0.x
Closes gh-35364
2023-05-09 14:13:04 +02:00
Moritz Halbritter c238049729 Fix loading of PKCS#8 PEM encoded EC and DSA keys
Closes gh-35322
2023-05-09 13:54:23 +02:00
Andy Wilkinson 2b6b178560 Merge branch '3.0.x'
Closes gh-35362
2023-05-09 12:24:04 +01:00
Andy Wilkinson 6c1c8fb405 Merge branch '2.7.x' into 3.0.x
Closes gh-35361
2023-05-09 12:23:49 +01:00
Andy Wilkinson 7427e2d527 Polish "Fix test for backing off when a TransactionManager is already defined"
See gh-35336
2023-05-09 12:04:38 +01:00
davin111 cf5500fc78 Fix test for backing off when a TransactionManager is already defined
See gh-35336
2023-05-09 12:03:06 +01:00
Moritz Halbritter c00e6ebbdf Merge branch '3.0.x'
Closes gh-35360
2023-05-09 11:23:05 +02:00
Moritz Halbritter 1c87fcb806 Add property to disable DisableObservabilityContextCustomizer
Closes gh-35009
2023-05-09 11:21:53 +02:00
Moritz Halbritter a4092fb396 Remove HTML tags from TestRunMojo javadoc
Closes gh-35349
2023-05-09 10:14:55 +02:00
Moritz Halbritter 1504e3043d Document devtools when using testcontainers at dev time
See gh-35200
2023-05-09 08:31:24 +02:00
Stephane Nicoll 9c37a8e819 Upgrade to Neo4j Java Driver 5.8.0
Closes gh-35352
2023-05-08 16:40:49 +02:00
Stephane Nicoll 5b510f94ec Upgrade to Groovy 4.0.12
Closes gh-35351
2023-05-08 16:27:18 +02:00
Stephane Nicoll 3532c64d8b Upgrade to Couchbase Client 3.4.6
Closes gh-35350
2023-05-08 16:27:14 +02:00
Stephane Nicoll ad2ecd3923 Upgrade to Neo4j Java Driver 5.8.0
Closes gh-35347
2023-05-08 15:34:15 +02:00
Stephane Nicoll 3403be09b3 Upgrade to JUnit Jupiter 5.9.3
Closes gh-35346
2023-05-08 15:34:15 +02:00
Stephane Nicoll ed3cf8fd1f Upgrade to Jakarta Activation 2.1.2
Closes gh-35345
2023-05-08 15:34:15 +02:00
Stephane Nicoll 173d24840f Upgrade to Jackson Bom 2.14.3
Closes gh-35344
2023-05-08 15:34:15 +02:00
Stephane Nicoll 7eda3ed669 Upgrade to Infinispan 14.0.9.Final
Closes gh-35343
2023-05-08 15:34:14 +02:00
Stephane Nicoll a87193716e Upgrade to Groovy 4.0.12
Closes gh-35342
2023-05-08 15:34:14 +02:00
Stephane Nicoll 2992e5808b Upgrade to Couchbase Client 3.4.6
Closes gh-35341
2023-05-08 15:34:14 +02:00
Stephane Nicoll bc63c511e7 Merge branch '3.0.x' 2023-05-08 15:33:52 +02:00
Stephane Nicoll 9d56b419cd Adapt to change in Spring Framework snapshots
Binding to an HashMap now consistently return a LinkedHashMap.
2023-05-08 15:08:02 +02:00
Stephane Nicoll 40a392f65b Upgrade to Johnzon 1.2.20
Closes gh-35340
2023-05-08 14:13:15 +02:00
Stephane Nicoll 96c792050e Upgrade to Elasticsearch 7.17.10
Closes gh-35339
2023-05-08 14:13:10 +02:00
Scott Frederick a474e54cf3 Merge branch '3.0.x'
Closes gh-35244
2023-05-05 16:20:41 -05:00
Scott Frederick cf180fa1cc Merge branch '2.7.x' into 3.0.x
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick 5d91c24f63 Update Couchbase image tag used in tests
Closes gh-35228
2023-05-05 14:45:58 -05:00
Andy Wilkinson fd4b7d7f7a Merge branch '3.0.x'
Closes gh-35330
2023-05-05 18:22:20 +01:00
Andy Wilkinson ce96cc3026 Merge branch '2.7.x' into 3.0.x
Closes gh-35329
2023-05-05 18:22:05 +01:00
Andy Wilkinson 6dc84b1645 Ignore non-singleton factory beans when resetting mocks
Closes gh-35324
2023-05-05 18:21:04 +01:00
Andy Wilkinson 07a11045d9 Merge branch '3.0.x'
Closes gh-35328
2023-05-05 17:35:50 +01:00
Andy Wilkinson fd864c35aa Improve mapping of resolved artifacts to dependency coordinates
Closes gh-31216
2023-05-05 17:32:59 +01:00
Moritz Halbritter 441ed30ee4 Polish "Replace Mockito argument captors with assertArg"
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

See gh-35015
2023-05-05 15:41:31 +02:00
Stephane Nicoll 414c260bc0 Start building against Spring HATEOAS 2.0.4 snapshots
See gh-35325
2023-05-05 15:12:34 +02:00
Stephane Nicoll 0649605db1 Start building against Spring GraphQL 1.2.0 snapshots
See gh-35312
2023-05-05 14:31:21 +02:00
Stephane Nicoll 4ec4bf0d33 Start building against Spring Session 3.1.0 snapshots
See gh-35317
2023-05-05 14:31:20 +02:00
Stephane Nicoll cb0c677080 Start building against Spring Security 6.1.0 snapshots
See gh-35316
2023-05-05 14:31:20 +02:00
Stephane Nicoll c738f04c05 Start building against Spring LDAP 3.1.0 snapshots
See gh-35315
2023-05-05 14:31:20 +02:00
Stephane Nicoll 2fa6bd28ce Start building against Spring Integration 6.1.0 snapshots
See gh-35314
2023-05-05 14:31:20 +02:00
Stephane Nicoll fc9c4a61f3 Start building against Spring HATEOAS 2.1.0 snapshots
See gh-35313
2023-05-05 14:31:19 +02:00
Stephane Nicoll 1b582ac302 Start building against Spring Data Bom 2023.0.0 snapshots
See gh-35310
2023-05-05 14:31:19 +02:00
Stephane Nicoll 8e3b465de7 Start building against Spring Authorization Server 1.1.0 snapshots
See gh-35308
2023-05-05 14:31:19 +02:00
Stephane Nicoll ee2cd5c251 Start building against Micrometer Tracing 1.1.0 snapshots
See gh-35306
2023-05-05 14:31:18 +02:00
Stephane Nicoll 7d6ddb74f1 Start building against Micrometer 1.11.0 snapshots
See gh-35305
2023-05-05 14:31:18 +02:00
Moritz Halbritter afa929cd6b Polish documentation 2023-05-05 13:38:27 +02:00
Moritz Halbritter cf38c2fd37 Update all keystores with new keys and certificates
See gh-35106
2023-05-05 13:30:22 +02:00
Stephane Nicoll c01680e9a8 Start building against Spring GraphQL 1.1.4 snapshots
See gh-35303
2023-05-05 12:11:17 +02:00
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
Phillip Webb dc4efaf276 Initialize containers first and destroy them last
Update `TestcontainersLifecycleBeanPostProcessor` so that on
initialization of the first bean all `Container` instances are started.

With this update all `Container` beans will be started first in the
`preInstantiateSingletons` phase and destroyed last.

Closes gh-35223
2023-05-01 23:59:22 -07:00
Phillip Webb 14bc354f7f Apply initializer automatically for context tests
Update `ServiceConnectionContextCustomizer` so that is applies the
`TestcontainersLifecycleApplicationContextInitializer` to all
application contexts.

Closes gh-35222
2023-05-01 23:59:22 -07:00
Phillip Webb 632c5d7ea5 Implement ServiceConnectionContextCustomizer equals and hashcode for key
Update `ServiceConnectionContextCustomizer` with `equals` and `hashcode`
methods so that it works correctly when part of a context cache key.

Closes gh-35216
2023-05-01 23:59:22 -07:00
Phillip Webb 25e3291d86 Broaden exceptions that include ServiceConnection name hint
See gh-35168
2023-05-01 22:13:50 -07:00
Phillip Webb 2c0edfd0b5 Merge branch '3.0.x'
Closes gh-35221
2023-05-01 15:35:23 -07:00
Phillip Webb 67abe3f88e Merge branch '2.7.x' into 3.0.x
Closes gh-35220
2023-05-01 15:34:59 -07:00
Phillip Webb 4e6148f47b Search for main methods from the bottom of the stack
Update `MainMethod` to search from the bottom of the stack rather than
the start. Prior to this commit, an incorrect `main` method would be
found if more than one `main` was in the stack.

Fixes gh-35214
2023-05-01 13:43:40 -07:00
Andy Wilkinson 8fe20c5d63 Derive LiquibaseConnectionDetails from JdbcConnectionDetails
Closes gh-35141
2023-05-01 13:32:44 +01:00
Andy Wilkinson d293df6617 Derive FlywayConnectionDetails from JdbcConnectionDetails
Rather than implementing factories for FlywayConnectionDetails for
each supported SQL database, we instead use a factory to takes
JdbcConnectionDetails as a source and produces
FlywayConnectionDetails.

Closes gh-35138
2023-05-01 13:29:42 +01:00
Phillip Webb b4cd2572d5 Prevent early initialization of Container beans
Update testcontainers auto-configuration so that `Container` bean
instances are no longer needed when registering `ConnectionDetails`
beans. Registration now occurs based on the bean type and the `name`
attribute of `@ServiceConnection`.

Fixes gh-35168
2023-05-01 00:21:47 -07:00
Phillip Webb c21cf31853 Switch order of ContainerConnectionDetailsFactory generics
Switch `ContainerConnectionDetailsFactory` so that `Container`
is before `ConnectionDetails`.
2023-05-01 00:00:43 -07:00
Phillip Webb fc5339f81c Polish 2023-04-30 23:27:06 -07:00
Phillip Webb c13041201d Don't call close methods for reusable testcontainers
Refine `TestcontainersLifecycleApplicationContextInitializer` so that
the `close()` method is not called for reusable containers.

Closes gh-35210
2023-04-30 06:07:05 -07:00
Phillip Webb e7357ba805 Increase timeout in OracleR2dbcContainerConnectionDetailsFactoryTests 2023-04-29 21:10:19 -07:00
Phillip Webb d1084ee6db Refactor ContainerConnectionDetailsFactory classes
Update `ContainerConnectionDetailsFactory` so that they consistently
extend `ContainerConnectionDetails`. The container is also no longer
accessible from the `ContainerConnectionSource` and is never used
during the construction of `ConnectionDetails` instances.

See gh-35168
2023-04-29 21:10:14 -07:00
Phillip Webb 403481ff96 Add 'required' parameter to ConnectionDetailsFactories
Update `ConnectionDetailsFactories` so that callers can now declare if
a result is required or not and improve exception hierarchy.

See gh-35168
2023-04-29 21:10:07 -07:00
Phillip Webb 2b261e6ebd Apply TestTypeExcludeFilter in regular applications
Add `ExcludeFilterApplicationContextInitializer` to register the
`TestTypeExcludeFilter` for regular applications.

Prior to this commit, the filter was only registered using the
`ExcludeFilterContextCustomizerFactory` which meant that test components
were filtered in tests but not when using `SpringApplication.from` with
a test classpath.

Fixes gh-35206
2023-04-29 21:10:02 -07:00
Scott Frederick d913472919 Add Kotlin samples and polish SSL bundle documentation
Closes gh-35105
2023-04-28 14:31:01 -05:00
Andy Wilkinson ce7bf0d0af Merge branch '3.0.x'
Closes gh-35197
2023-04-28 18:06:37 +01:00
Andy Wilkinson 4581c25e20 Merge branch '2.7.x' into 3.0.x
Closes gh-35196
2023-04-28 18:06:12 +01:00
Andy Wilkinson de2df9311c Test Gradle plugin against Gradle 8.1.1
Closes gh-35195
2023-04-28 18:05:06 +01:00
Andy Wilkinson 09527995d1 Polish 2023-04-28 17:56:12 +01:00
Andy Wilkinson a75f55aaa5 Try to stabilize SQL Server tests on CI 2023-04-28 14:07:50 +01:00
Moritz Halbritter 4131e7338d Fix LogMessage format 2023-04-28 13:46:57 +02:00
Moritz Halbritter 75207db6be Polish docker compose code 2023-04-28 13:46:57 +02:00
Moritz Halbritter 8abebd75fb Use shutdownHandlers parameter in constructor 2023-04-28 13:46:56 +02:00
Moritz Halbritter 176cc20c36 Polish FlywayConfiguration 2023-04-28 13:15:39 +02:00
Moritz Halbritter 27ab98b49d Polish ConnectionDetailsFactories 2023-04-28 13:15:39 +02:00
Andy Wilkinson cec159110d Do not block indefinitely when querying SQL database 2023-04-28 09:52:27 +01:00
Andy Wilkinson d7da77bda8 Remove support for service connections to InfluxDB
Closes gh-35189
2023-04-28 09:49:39 +01:00
Scott Frederick 428434c873 Polish SslOptions usage
Change getter methods to return arrays, as this is how most client
library usages need the options.

See gh-34814
2023-04-27 16:37:46 -05:00
Scott Frederick 226c3005d4 Add SSL bundle support to Redis auto-configuration
Update Redis auto-configuration with Lettuce and Jedis drivers to
allow SSL configuration with an SSL bundle.

Closes gh-34815
2023-04-27 15:24:55 -05:00
Andy Wilkinson 8bbe894665 Add Docker Compose service connection support for Oracle using JDBC
Closes gh-35145
2023-04-27 11:07:53 +01:00
Andy Wilkinson 5e73047164 Align SQL Server-related class names with existing precedents
Closes gh-35181
2023-04-27 10:33:25 +01:00
Andy Wilkinson 1e785e81f8 Add Docker Compose support for Oracle Database using R2DBC
Closes gh-35143
2023-04-27 10:33:25 +01:00
Andy Wilkinson 8fd36d04e1 Improve MsSqlServerR2dbcDockerComposeConnectionDetailsFactory tests
See gh-35144
2023-04-27 09:31:25 +01:00
Andy Wilkinson 963da20493 Reinstate dependency management for io.r2dbc:r2dbc-mssql
Closes gh-35159
2023-04-27 09:31:25 +01:00
Andy Wilkinson b5178afa21 Add Docker Compose support for MS SQL Server using JDBC
Closes gh-35146
2023-04-27 09:31:24 +01:00
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson b03f1e47d0 Merge branch '3.0.x'
Closes gh-35171
2023-04-26 12:10:34 +01:00
Andy Wilkinson d6e3db9c36 Merge branch '2.7.x' into 3.0.x
Closes gh-35170
2023-04-26 11:59:19 +01:00
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Phillip Webb b5c9e7c06a Polish SslOptions usage
Add helper method and tighten usage so that exceptions are thrown when
options cannot be applied.

See gh-34814
2023-04-25 22:39:47 -07:00
Phillip Webb 423c60acfa Add SSL bundle support to Elasticsearch auto-configuration
Update Elasticsearch RestClient auto-configuration so that an SSL
can be configured via an SSL bundle.

Closes gh-35155
2023-04-25 17:20:05 -07:00
Scott Frederick e9a85b91a8 Polish 2023-04-25 16:20:38 -05:00
Andy Wilkinson 472afafd4b Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35163
2023-04-25 22:08:58 +01:00
Scott Frederick 43b42eca49 Add Docker Compose service connection support for Cassandra
Closes gh-35136
2023-04-25 16:06:34 -05:00
Scott Frederick 2bec82ab2f Delete disabled docker compose tests 2023-04-25 14:51:04 -05:00
Stephane Nicoll d55cd3b46f Merge branch '3.0.x'
Closes gh-35160
2023-04-25 11:26:31 +02:00
Stephane Nicoll b286e5a0bb Prevent ServletComponentScan to run again with AOT
Closes gh-34563
2023-04-25 11:20:14 +02:00
Yanming Zhou b615aef810 Fix dependency management for spring-boot-testcontainers
This commit adds org.testcontainers:testcontainers as an api dependency
of spring-boot-testcontainers so that GenericContainer can be used
without an additional dependency

See gh-35119
2023-04-25 10:04:52 +02:00
Stephane Nicoll facf48e423 Polish "Prevent container to be closed twice"
See gh-35120
2023-04-25 09:59:52 +02:00
Yanming Zhou 5df6913f18 Prevent container to be closed twice
See gh-35120
2023-04-25 09:59:52 +02:00
Andy Wilkinson fd6214e7e3 Remove accidentally committed test classes 2023-04-25 08:31:26 +01:00
Phillip Webb e0b03661d4 Merge branch '3.0.x' 2023-04-24 17:16:52 -07:00
Phillip Webb 8a43710173 Merge branch '2.7.x' into 3.0.x 2023-04-24 17:16:43 -07:00