Phillip Webb
5732782043
Merge branch '3.2.x' into 3.3.x
2024-10-16 13:08:44 -07:00
Phillip Webb
41ae973d16
Update copyright year of changed files
2024-10-16 13:08:37 -07: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
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
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
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
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
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
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
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
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
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
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
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
Phillip Webb
1d337b7c76
Merge branch '3.2.x' into 3.3.x
2024-08-19 16:46:51 -07:00
Phillip Webb
f1987e6f8b
Update copyright year of changed files
2024-08-19 16:45:34 -07:00
Moritz Halbritter
2a84fe5760
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41857
2024-08-14 16:47:52 +02:00
Moritz Halbritter
1d45016d8c
Upgrade to spring-javaformat 0.0.43
...
Closes gh-41853
2024-08-14 16:32:41 +02:00
Stéphane Nicoll
ff4b39a096
Merge branch '3.2.x' into 3.3.x
2024-08-13 10:19:39 +02:00
Stéphane Nicoll
68ce174980
Adapt LoaderIntegrationTests to Java 23
...
See gh-41698
2024-08-13 10:18:37 +02:00
Stéphane Nicoll
a6567c7d47
Disable Infinispan tests on Java 23
...
Infinispan 14 does not work on Java 23, an upgrade to 15 is required.
This commit therefore disables those tests when running against a Java
version higher than 22.
Unfortunately, the version of JUnit that we use has no value for Java
23, so we have to use OTHER for that purpose.
2024-08-07 17:32:52 +02:00
Andy Wilkinson
c642f6d268
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41613
2024-07-25 16:16:35 +01:00
Andy Wilkinson
784c8d2df4
Avoid duplicate junit-platform.properties files caused by Kafka
...
Gradle doesn't support excluding a dependency that's declared with a
classifier. Instead, this commit replaces the test-qualified
kafka-server-common dependency with the plain dependency. The plain
dependency was already present so this is equivalent to excluding
the test-qualified dependency.
Closes gh-41446
2024-07-11 13:08:58 +01:00
Andy Wilkinson
b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson
fda6f19c5b
Update spring-boot-smoke-test-session-webflux-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:32 +01:00
Andy Wilkinson
5e332b8785
Update spring-boot-smoke-test-session-webflux-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:28 +01:00
Andy Wilkinson
2890067e3a
Update spring-boot-smoke-test-session-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:25 +01:00
Andy Wilkinson
b3f3501e2b
Update spring-boot-smoke-test-session-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:22 +01:00
Andy Wilkinson
da28e03670
Update spring-boot-smoke-test-pulsar to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:19 +01:00
Andy Wilkinson
bc57d30a1f
Update spring-boot-smoke-test-kafka to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:15 +01:00
Andy Wilkinson
957e73044b
Update spring-boot-smoke-test-data-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:12 +01:00
Andy Wilkinson
9662bec9c7
Update spring-boot-smoke-test-data-r2dbc-liquibase to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:08 +01:00
Andy Wilkinson
b52023966b
Update spring-boot-smoke-test-data-r2dbc-flyway to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:04 +01:00
Andy Wilkinson
0d2d3e7d71
Update spring-boot-smoke-test-data-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:01 +01:00
Andy Wilkinson
28396b1ff3
Update spring-boot-smoke-test-data-couchbase to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:58 +01:00