Andy Wilkinson
1e33e6bc0d
Merge branch '3.3.x'
...
Closes gh-42714
2024-10-16 12:18:22 +01:00
Andy Wilkinson
4b89ba7d20
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42713
2024-10-16 12:15:34 +01:00
Andy Wilkinson
2c982260df
Use platform dependencies instead of the dependency management plugin
...
Closes gh-42712
2024-10-16 12:08:44 +01:00
Phillip Webb
7af238a192
Merge branch '3.3.x'
...
Closes gh-42706
2024-10-15 18:03:00 -07:00
Phillip Webb
d3061439b2
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42705
2024-10-15 18:02:54 -07:00
Phillip Webb
51ff8d411c
Fix Oracle JDK download URLs
...
Closes gh-42704
2024-10-15 18:02:40 -07:00
Stéphane Nicoll
06127d60b6
Adapt Kafka SSL smoke test with changes in Testcontainers
...
See gh-42670
2024-10-15 17:56:23 +02:00
Stéphane Nicoll
e0152097f3
Polish "Upgrade to Testcontainers 1.20.2"
...
This commit review the original upgrade to retain compatiblity with the
deprecated Cassandra and ConfluentKafka containers.
This commit also fixes the SSL Cassandra tests. The new container uses
a custom wait strategy that uses plain text and does not work with an
SSL container.
Closes gh-42670
Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2024-10-15 14:45:15 +02:00
Stéphane Nicoll
a66d3d2f00
Merge branch '3.3.x'
...
Closes gh-42689
2024-10-15 10:42:41 +02:00
Stéphane Nicoll
056e2b6029
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42688
2024-10-15 10:42:33 +02:00
Stéphane Nicoll
b0dd42e9b9
Transform Maven settings with proper plugin repository tag
...
This commit adapts d44e7c9
to transforms plugin repositories using the
correct root tag. Previously, they were transformed with the regular
<repository> tag, which is invalid.
Closes gh-42687
2024-10-15 10:39:59 +02:00
Stéphane Nicoll
a40ae49a76
Upgrade to Testcontainers 1.20.2
...
Closes gh-42670
2024-10-14 16:25:57 +02:00
Phillip Webb
8aee3e1e92
Allow structure logging JSON to be customized
...
Introduce a new `StructureLoggingJsonMembersCustomizer` interface as
well as additional properties that can be used to customize the JSON
produced with structured logging.
Closes gh-42486
2024-10-10 23:52:34 -07:00
Phillip Webb
54dcd9894c
Remove remaining use of loader classic
...
Closes gh-42495
2024-10-01 18:23:35 -07:00
Phillip Webb
430753e4a8
Merge branch '3.3.x'
2024-10-01 17:50:26 -07:00
Phillip Webb
9ece00bda4
Merge branch '3.2.x' into 3.3.x
2024-10-01 17:50:21 -07:00
Phillip Webb
c88a2dc116
Attempt to fix ant smoke test
...
See gh-42333
2024-10-01 17:49:24 -07:00
Phillip Webb
e529769b0c
Merge branch '3.3.x'
2024-10-01 17:20:14 -07:00
Phillip Webb
9f34899454
Merge branch '3.2.x' into 3.3.x
2024-10-01 17:20:10 -07:00
Phillip Webb
d342eefa27
Use Sync task rather than Copy
...
See gh-42333
2024-10-01 17:19:52 -07:00
Phillip Webb
7de0b21089
Merge branch '3.3.x'
2024-10-01 16:57:06 -07:00
Phillip Webb
85ec3b1728
Merge branch '3.2.x' into 3.3.x
2024-10-01 16:57:00 -07:00
Phillip Webb
e5b03a7741
Second attempt to fix spring-boot-smoke-test-ant
...
Fix error introduced in commit d44e7c9af2
See gh-42333
2024-10-01 16:56:37 -07:00
Phillip Webb
07d2b5180c
Merge branch '3.3.x'
2024-10-01 16:26:37 -07:00
Phillip Webb
212e67b1cb
Merge branch '3.2.x' into 3.3.x
2024-10-01 16:26:32 -07:00
Phillip Webb
1dce2cd62e
Fix spring-boot-smoke-test-ant
...
Fix error introduced in commit d44e7c9af2
See gh-42333
2024-10-01 16:25:50 -07:00
Phillip Webb
bc5a718cfa
Merge branch '3.3.x'
2024-09-27 17:35:23 -07:00
Phillip Webb
3b8ae47096
Merge branch '3.2.x' into 3.3.x
2024-09-27 17:35:01 -07:00
Phillip Webb
d44e7c9af2
Dynamically populate repositories used in Ant/Maven integration tests
...
Update build scripts and tests so that repository settings are copied
dynamically from the build.
See gh-42333
2024-09-27 17:33:00 -07:00
Phillip Webb
8282a90268
Merge branch '3.3.x'
2024-09-27 10:34:32 -07:00
Phillip Webb
055064f16b
Merge branch '3.2.x' into 3.3.x
2024-09-27 10:33:30 -07:00
Phillip Webb
9836011ffd
Create extension to configure Spring maven repositories
...
Create a small Groovy script that can be used in `settings.gradle`
files to extend `repositories` to support the various maven
repositories required for our build.
See gh-42333
2024-09-27 10:30:20 -07:00
Phillip Webb
7b3077280c
Merge branch '3.3.x'
...
Closes gh-42441
2024-09-24 14:32:48 -07:00
Phillip Webb
100bedc07d
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b
Apply conventions plugin to all subprojects
...
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb
0c1a042173
Merge branch '3.3.x'
2024-09-24 13:51:58 -07:00
Phillip Webb
de2e5eeb22
Merge branch '3.2.x' into 3.3.x
2024-09-24 13:51:53 -07:00
Phillip Webb
54c3ccb4df
Fix checkstyle violations in testng smoke test
...
Add conventions plugin and fix surfaced checkstyle errors.
2024-09-24 13:51:16 -07:00
Phillip Webb
72f379a5b2
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb
eafe61c4ca
Backport upgrade to Gradle 8.10.1
...
Cherry-pick commits d756bf4e86
, 083ac67d13
and 162c929a80
to
upgrade to Gradle 8.10.1.
Closes gh-42433
2024-09-24 12:55:29 -07:00
Andy Wilkinson
c6c4651337
Merge branch '3.3.x'
...
Closes gh-42385
2024-09-19 19:05:25 +01:00
Andy Wilkinson
7b427f4d3b
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42384
2024-09-19 19:05:12 +01:00
Andy Wilkinson
87c647cf65
Reduce log output of SampleJettyApplicationTests
...
Closes gh-42376
2024-09-19 19:04:59 +01:00
Johnny Lim
94e8c5db36
Polish gh-39957 and gh-41444
...
See gh-42359
2024-09-19 11:37:11 +02:00
Phillip Webb
f5b6514bef
Allow additional context interfaces to be defined for testing
...
Update `AssertableApplicationContext` and `ApplicationContextRunner`
implementations to support additional `ApplicationContext` interfaces.
Closes gh-42369
2024-09-18 23:47:13 -07:00
Stéphane Nicoll
3651ff87cd
Reinstate auto-configuration support for embedded ActiveMQ
...
This commit restores auto-configuration for using an Embedded broker
with ActiveMQ classic.
Contrary to its 2.7.x version, "spring-boot-starter-activemq" no longer
adds the broker for consistency with Artemis, and to keep the existing
3.x behavior. Rather than "inMemory", a "s.a.embedded.enabled"
property has been reintroduced that matches the name used by Artemis.
The documentation has been updated to mention that the broker
dependency must be added to use it.
Closes gh-38404
2024-09-06 11:34:35 +02:00
Scott Frederick
e7faca3bbb
Add support for Testcontainer Redis
...
Add support for the official `com.redis:testcontainers-redis` container.
See gh-41450
2024-08-29 19:23:40 -07:00
Andy Wilkinson
4b0b5c263d
Ensure that building test apps produces Java 17 bytecode
...
See gh-41980
2024-08-23 15:11:55 +01:00
Andy Wilkinson
4258953190
Ensure that building the SNI test apps produces Java 17 bytecode
...
See gh-41980
2024-08-23 14:56:20 +01:00
Andy Wilkinson
d756bf4e86
Upgrade build to Gradle 8.10
...
Closes gh-41980
2024-08-23 12:41:05 +01:00