Commit Graph

42411 Commits

Author SHA1 Message Date
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
95a8c11773 Merge branch '3.0.x' 2023-05-02 08:44:45 +01:00
Andy Wilkinson
c208a4482d Merge branch '2.7.x' into 3.0.x 2023-05-02 08:41:35 +01:00
Andy Wilkinson
d0a354352d Polish buildSrc's build.gradle 2023-05-02 08:41:20 +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
eabce52b93 Fix TestSampleSessionRedisApplication
Update the `@ServiceConnection` annotation to include the
service connection name.

See gh-35168
2023-05-01 22:13:49 -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
3287e61cd0 Merge branch '3.0.x'
Closes gh-35219
2023-05-01 20:43:38 +01:00
Andy Wilkinson
c7cbdd9b0a Merge branch '2.7.x' into 3.0.x
Closes gh-35218
2023-05-01 20:43:16 +01:00
Andy Wilkinson
e7578f0595 Add Docker Hub credentials to system tests task
Closes gh-35213
2023-05-01 20:42:06 +01: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
51a28af347 Merge branch '3.0.x'
See gh-35176
2023-04-27 17:11:05 -05:00
Scott Frederick
e8c82060db Upgrade CI to Docker 23.0.5
See gh-35175
2023-04-27 17:10:53 -05:00
Scott Frederick
a6d9ab164b Merge branch '3.0.x'
Closes gh-35176
2023-04-27 17:07:12 -05:00
Scott Frederick
24618b8b8b Merge branch '2.7.x' into 3.0.x
Closes gh-35175
2023-04-27 17:05:45 -05:00
Scott Frederick
79673e61e9 Upgrade CI to Docker 23.0.5
Closes gh-35177
2023-04-27 17:03:56 -05: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