Commit Graph

42457 Commits

Author SHA1 Message Date
Moritz Halbritter
27169bde8b Merge branch '3.0.x' 2023-05-03 13:07:12 +02:00
Moritz Halbritter
c2dd20f4ea Merge branch '2.7.x' into 3.0.x 2023-05-03 13:07:00 +02:00
Moritz Halbritter
f5eb76074b Disable loader integration tests on aarch64 linux and mac
See gh-35229
2023-05-03 11:32:39 +02:00
Moritz Halbritter
f3d0bc7a99 Disable launch script integration tests on aarch64 linux and mac
See gh-35229
2023-05-03 11:32:33 +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
a4b81e4326 Polish smoke tests
See gh-35042
2023-05-02 16:34:56 -05: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
3a122b67c6 Merge branch '3.0.x' 2023-05-02 14:39:02 +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
Andy Wilkinson
c768307d79 Merge pull request #35180 from aasaru
* gh-35180:
  Correct list of annotations equivalent to @SpringBootApplication

Closes gh-35180
2023-05-02 11:57:41 +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
95a8c11773 Merge branch '3.0.x' 2023-05-02 08:44:45 +01:00