fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,435 Commits 22 Branches 339 Tags
Commit Graph

20686 Commits

Author SHA1 Message Date
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