Moritz Halbritter
9d50d92b9c
Merge branch '3.0.x'
2 years ago
Moritz Halbritter
1f4a337ad2
Merge branch '2.7.x' into 3.0.x
2 years ago
Moritz Halbritter
091d6204cb
Disable build image integration tests on aarch64 linux and mac
...
See gh-35229
2 years ago
Moritz Halbritter
7c725a7560
Polish DockerImageNames
2 years ago
Moritz Halbritter
2586150eaf
Disable ARM incompatible integration tests
2 years ago
Moritz Halbritter
735c43ce9b
Merge branch '2.7.x' into 3.0.x
2 years ago
Moritz Halbritter
312f0c17ed
Set initial ElasticSearch heap size in integration tests
2 years ago
Moritz Halbritter
944d77491b
Set initial heap size for ElasticSearch integration tests
2 years ago
Moritz Halbritter
9a545727b9
Disable SQL server and Oracle database compose tests on ARM
...
See gh-35229
2 years ago
Moritz Halbritter
1ce88f25b4
Merge branch '3.0.x'
2 years ago
Moritz Halbritter
037cb8c5b0
Merge branch '2.7.x' into 3.0.x
2 years ago
Moritz Halbritter
c1cef099d2
Limit maximum heap of ElasticSearch in tests
2 years ago
Moritz Halbritter
d7a9f87b64
Disable Neo4j tests on aarch64 linux and mac
...
See gh-35228
2 years ago
Moritz Halbritter
9f109fe785
Disable Couchbase integration tests on aarch64 linux and mac
...
See gh-35228
2 years ago
Andy Wilkinson
419d8c22b2
Merge branch '3.0.x'
...
Closes gh-35231
2 years ago
Andy Wilkinson
8f291abc2b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35230
2 years ago
Juhan Aasaru
3b70286747
Correct list of annotations equivalent to @SpringBootApplication
...
See gh-35180
2 years ago
Andy Wilkinson
d24167371e
Merge branch '3.0.x'
...
Closes gh-35226
2 years ago
Andy Wilkinson
8f3f74ffd5
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35225
2 years ago
Andy Wilkinson
695e58f418
Align buildSrc's Framework version with the main build's version
...
Closes gh-35224
2 years ago
Andy Wilkinson
b1d0433d74
Handle Kafka servers as strings and rely on Kafka's parsing
...
Closes gh-34770
2 years ago
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
2 years ago
Phillip Webb
14bc354f7f
Apply initializer automatically for context tests
...
Update `ServiceConnectionContextCustomizer` so that is applies the
`TestcontainersLifecycleApplicationContextInitializer` to all
application contexts.
Closes gh-35222
2 years ago
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
2 years ago
Phillip Webb
25e3291d86
Broaden exceptions that include ServiceConnection name hint
...
See gh-35168
2 years ago
Phillip Webb
2c0edfd0b5
Merge branch '3.0.x'
...
Closes gh-35221
2 years ago
Phillip Webb
67abe3f88e
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35220
2 years ago
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
2 years ago
Andy Wilkinson
8fe20c5d63
Derive LiquibaseConnectionDetails from JdbcConnectionDetails
...
Closes gh-35141
2 years ago
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
2 years ago
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
2 years ago
Phillip Webb
c21cf31853
Switch order of ContainerConnectionDetailsFactory generics
...
Switch `ContainerConnectionDetailsFactory` so that `Container`
is before `ConnectionDetails`.
2 years ago
Phillip Webb
fc5339f81c
Polish
2 years ago
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
2 years ago
Phillip Webb
e7357ba805
Increase timeout in OracleR2dbcContainerConnectionDetailsFactoryTests
2 years ago
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
2 years ago
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
2 years ago
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
2 years ago
Scott Frederick
d913472919
Add Kotlin samples and polish SSL bundle documentation
...
Closes gh-35105
2 years ago
Andy Wilkinson
ce7bf0d0af
Merge branch '3.0.x'
...
Closes gh-35197
2 years ago
Andy Wilkinson
4581c25e20
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35196
2 years ago
Andy Wilkinson
de2df9311c
Test Gradle plugin against Gradle 8.1.1
...
Closes gh-35195
2 years ago
Andy Wilkinson
09527995d1
Polish
2 years ago
Andy Wilkinson
a75f55aaa5
Try to stabilize SQL Server tests on CI
2 years ago
Moritz Halbritter
4131e7338d
Fix LogMessage format
2 years ago
Moritz Halbritter
75207db6be
Polish docker compose code
2 years ago
Moritz Halbritter
8abebd75fb
Use shutdownHandlers parameter in constructor
2 years ago
Moritz Halbritter
176cc20c36
Polish FlywayConfiguration
2 years ago
Moritz Halbritter
27ab98b49d
Polish ConnectionDetailsFactories
2 years ago
Andy Wilkinson
cec159110d
Do not block indefinitely when querying SQL database
2 years ago
Andy Wilkinson
d7da77bda8
Remove support for service connections to InfluxDB
...
Closes gh-35189
2 years ago
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
2 years ago
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
2 years ago
Andy Wilkinson
8bbe894665
Add Docker Compose service connection support for Oracle using JDBC
...
Closes gh-35145
2 years ago
Andy Wilkinson
5e73047164
Align SQL Server-related class names with existing precedents
...
Closes gh-35181
2 years ago
Andy Wilkinson
1e785e81f8
Add Docker Compose support for Oracle Database using R2DBC
...
Closes gh-35143
2 years ago
Andy Wilkinson
8fd36d04e1
Improve MsSqlServerR2dbcDockerComposeConnectionDetailsFactory tests
...
See gh-35144
2 years ago
Andy Wilkinson
963da20493
Reinstate dependency management for io.r2dbc:r2dbc-mssql
...
Closes gh-35159
2 years ago
Andy Wilkinson
b5178afa21
Add Docker Compose support for MS SQL Server using JDBC
...
Closes gh-35146
2 years ago
Andy Wilkinson
9a0b5e0178
Merge branch '3.0.x'
...
Closes gh-35173
2 years ago
Andy Wilkinson
7ee1622995
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35172
2 years ago
Andy Wilkinson
b03f1e47d0
Merge branch '3.0.x'
...
Closes gh-35171
2 years ago
Andy Wilkinson
d6e3db9c36
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35170
2 years ago
Andy Wilkinson
6b9bc012a5
Check that BPP and BFPP bean methods won't cause eager initialization
...
Closes gh-35164
2 years ago
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
2 years ago
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
2 years ago
Scott Frederick
e9a85b91a8
Polish
2 years ago
Andy Wilkinson
472afafd4b
Stop WebFilterChainPostProcessor from causing eager init
...
Fixes gh-35163
2 years ago
Scott Frederick
43b42eca49
Add Docker Compose service connection support for Cassandra
...
Closes gh-35136
2 years ago
Scott Frederick
2bec82ab2f
Delete disabled docker compose tests
2 years ago
Stephane Nicoll
d55cd3b46f
Merge branch '3.0.x'
...
Closes gh-35160
2 years ago
Stephane Nicoll
b286e5a0bb
Prevent ServletComponentScan to run again with AOT
...
Closes gh-34563
2 years ago
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
2 years ago
Stephane Nicoll
facf48e423
Polish "Prevent container to be closed twice"
...
See gh-35120
2 years ago
Yanming Zhou
5df6913f18
Prevent container to be closed twice
...
See gh-35120
2 years ago
Andy Wilkinson
fd6214e7e3
Remove accidentally committed test classes
2 years ago
Phillip Webb
e0b03661d4
Merge branch '3.0.x'
2 years ago
Phillip Webb
8a43710173
Merge branch '2.7.x' into 3.0.x
2 years ago
Phillip Webb
a707c5e83e
Polish "Fix support for default values in banner placeholders"
...
Reorder methods and add a test to ensure that getPropertyResolvers
can be mutated.
See gh-34764
2 years ago
Andy Wilkinson
dee5217cf0
Add Docker Compose support for MS SQL Server using R2DBC
...
Closes gh-35144
2 years ago
Phillip Webb
0f032c290a
Allow for predicate based checking of image names
...
Update `DockerComposeConnectionDetailsFactory` to accept a `Predicate`
based check to determine if the source should be accepted.
The existing name based checks have also been improved to allow names
outside of official docker images. The `ImageReference` and `ImageName`
classes have been mainly copied from
`org.springframework.boot.buildpack.platform.docker.type`.
Closes gh-35154
2 years ago
Phillip Webb
19221f00f3
Deprecate `spring.cassandra.ssl` configuration property
...
Deprecate the `spring.cassandra.ssl` configuration property in favor
of `spring.cassandra.ssl.enabled`.
See gh-25602
2 years ago
Scott Frederick
ff35cc80d7
Allow Couchbase SSL to be enabled without custom trust material
...
Closes gh-35147
2 years ago
Scott Frederick
1d44b45b5d
Deprecate Couchbase SSL keyStore properties
...
The properties `spring.couchbase.env.ssl.key-store`
and `spring.couchbase.env.ssl.key-store-password`
are deprecated in favor of configuring an SSL bundle with
`spring.couchbase.env.ssl.bundle`. The older properties
have somewhat confusing names, since they are used to
configure a trust store in Couchbase, and they don't
provide all the options that an SSL bundle provides.
Closes gh-35135
2 years ago
Andy Wilkinson
9cd04c55fb
Merge branch '3.0.x'
...
Closes gh-35132
2 years ago
Andy Wilkinson
598e090e8f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35131
2 years ago
Andy Wilkinson
90952a2dd9
Do not turn a null Flyway-specific password into an empty string
...
It prevents using PGPASS for authentication with Postgres.
Fixes gh-35110
2 years ago
Andy Wilkinson
7ffacf43f3
Use main DataSource when there are no migration-specific conn details
...
Fixes gh-35109
2 years ago
Stephane Nicoll
363dc9368d
Merge branch '3.0.x'
...
Closes gh-35130
2 years ago
Stephane Nicoll
7f0402f869
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35129
2 years ago
Ivan Dimitrov
f4db73ead9
Harmonize references to application.yaml files in reference docs
...
See gh-34628
2 years ago
Lukasz Jernas
d38a68ebcd
Fix typo in testing docs
...
See gh-35128
2 years ago
Phillip Webb
a0b854024b
Add a 'Docker Compose Support' section to the reference docs
...
Update the reference documentation with details about the recently
introduced Docker Compose Support.
Closes gh-35026
2 years ago
Phillip Webb
e19aa81813
Polish formatting
2 years ago
Phillip Webb
6ea2547de4
Add SSL bundle support to WebClient auto-configuration
...
Introduce `WebClientSsl` interface and auto-configuration to allow a
WebClient builder to have custom SSL configuration applied.
The previous `ClientHttpConnectorConfiguration` has been been changed
to now create `ClientHttpConnectorFactory` instances which can be used
directly or by `AutoConfiguredWebClientSsl`.
Closes gh-18556
2 years ago
Phillip Webb
c59c8cc674
Change SslOptions to use null for defaults rather than empty sets
...
Update `SslOptions` so that `null` is used for default values rather
than empty sets. Most libraries use `null` to indicate defaults so
aligning our class makes things easier.
See gh-34814
2 years ago
Phillip Webb
77c468c956
Add test to check SSL RestTemplate requests work against server
...
Add a test to `AbstractClientHttpRequestFactoriesTests` to ensure
that SSL configuration works when calling a real Tomcat server.
See gh-34810
2 years ago
Phillip Webb
72c1f667f5
Fix @Since javadoc in RestTemplateBuilder
...
See gh-34810
2 years ago
Scott Frederick
b6befd133c
Add SSL bundle support to RestTemplateBuilder auto-configuration
...
Update RestTemplateBuilder auto-configuration so that an SSL can be
configured via an SSL bundle.
Closes gh-34810
2 years ago
Scott Frederick
fd5fd1491a
Add SSL bundle support to MongoDB auto-configuration
...
Update MongoDB auto-configuration so that an SSL can be configured
via an SSL bundle.
Closes gh-35042
2 years ago