Andy Wilkinson
7e01e78b7f
Merge branch '3.3.x'
2024-06-27 13:58:14 +01:00
Andy Wilkinson
7b65176180
Move Redis Bitname compose file into correct directory
...
See gh-41257
2024-06-27 13:57:40 +01:00
Andy Wilkinson
13ab5618a6
Merge branch '3.3.x'
2024-06-27 13:08:38 +01:00
Andy Wilkinson
0df946ccad
Fix botched merge of spring-boot-maven-plugin's build.gradle
2024-06-27 13:06:44 +01:00
Andy Wilkinson
97612d5445
Merge branch '3.2.x'
2024-06-27 12:59:19 +01:00
Andy Wilkinson
d01c44a66a
Merge branch '3.2.x' into 3.3.x
2024-06-27 12:58:46 +01:00
Andy Wilkinson
d2f74426f7
Work around bug in Gradle's Eclipse model
...
The model incorrectly marks the Gradle API and all of its
dependencies as test dependencies, making them unavailable in Eclipse
to code in src/main/java. We work around this by modifying the
classpath container to remove the test attribute from the
dependencies that should be available to main code.
See gh-41228
2024-06-27 12:58:36 +01:00
Andy Wilkinson
b28ed2f8fb
Merge branch '3.3.x'
2024-06-27 10:59:18 +01:00
Andy Wilkinson
adad8a3515
More LDAP compose file into correct source set
...
See gh-41257
2024-06-27 10:59:03 +01:00
Moritz Halbritter
09650c8df5
Merge branch '3.3.x'
2024-06-27 11:45:05 +02:00
Moritz Halbritter
b2ddea74ee
Merge branch '3.2.x' into 3.3.x
2024-06-27 11:36:30 +02:00
Moritz Halbritter
3e98a932e0
Polish BaggagePropagationIntegrationTests
2024-06-27 11:30:04 +02:00
Andy Wilkinson
5b7365b63b
Merge branch '3.3.x'
...
Closes gh-41258
2024-06-27 10:25:32 +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
4515c882c7
Merge branch 'gh-41228' into 3.2.x
...
Closes gh-41228
2024-06-27 09:55:59 +01:00
Phillip Webb
00ed053ceb
Merge branch '3.3.x'
...
Closes gh-41253
2024-06-26 16:27:56 -07:00
Phillip Webb
1a699aee24
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb
962936370a
Don't report already migrated properties
...
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.
In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.
Fixes gh-35774
2024-06-26 16:24:32 -07:00
Scott Frederick
9da2d1e089
Revert "Use Paketo tiny builder by default for JVM and native apps"
...
This reverts commit 6d2ebc0713
.
2024-06-26 15:25:37 -05:00
Scott Frederick
8623c92a29
Change spring-boot-buildpack-platform api deps to implementation
...
Closes gh-40935
2024-06-26 14:12:43 -05:00
Scott Frederick
267956cf5c
Replace JNI domain sockets implementation with one that uses JDK support
...
Closes gh-41050
2024-06-26 14:09:19 -05: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
843de3adbc
Update spring-boot-test-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:41 +01:00
Andy Wilkinson
ba053dbaac
Update spring-boot-actuator to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:37 +01:00
Andy Wilkinson
9f166f2c85
Update spring-boot-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:33 +01:00
Andy Wilkinson
89a06608d2
Update spring-boot-maven-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:29 +01:00
Andy Wilkinson
7d5a761d51
Update spring-boot-gradle-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:25 +01:00
Andy Wilkinson
d5ef5e9c9d
Update spring-boot-buildpack-platform to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:08 +01:00
Andy Wilkinson
6fbf08fa9a
Update spring-boot-docker-compose to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:03 +01:00
Andy Wilkinson
3f1f801461
Update spring-boot-testcontainers to use docker-test plugin
...
See gh-41228
2024-06-26 19:45:52 +01:00
Scott Frederick
6d2ebc0713
Use Paketo tiny builder by default for JVM and native apps
...
Closes gh-40859
2024-06-26 13:42:23 -05:00
Andy Wilkinson
61ac0e32a1
Merge branch '3.3.x'
...
Closes gh-41250
2024-06-26 17:01:14 +01:00
Andy Wilkinson
2dd6c1c3a0
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41249
2024-06-26 17:00:58 +01:00
Andy Wilkinson
07442f8366
Exclude plexus-utils in favor of Maven's build-in version
...
Closes gh-41248
2024-06-26 16:59:23 +01:00
Andy Wilkinson
6f6eba0bb9
Merge branch '3.3.x'
...
Closes gh-41247
2024-06-26 14:29:36 +01:00
Andy Wilkinson
81c8a9706f
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41246
2024-06-26 14:29:14 +01:00
Andy Wilkinson
270f364aef
Polish "Make conversion mechanism plural"
...
See gh-41244
2024-06-26 14:26:51 +01:00
Mateus Scheper
068b159799
Make conversion mechanism plural
...
Fixing typo for the "mechanism" word and improving readability by
adding ".".
See gh-41244
2024-06-26 14:26:00 +01:00
Phillip Webb
0bbaa77530
Merge branch '3.3.x'
2024-06-25 22:16:16 -07:00
Phillip Webb
26ea4f9fb1
Merge branch '3.2.x' into 3.3.x
2024-06-25 22:16:10 -07:00
Phillip Webb
712d935c8e
Fix checkstyle violation
...
See gh-35786
2024-06-25 22:16:03 -07:00
Phillip Webb
3c329cacfb
Merge branch '3.3.x'
...
Closes gh-41239
2024-06-25 22:08:50 -07:00
Phillip Webb
87e0262896
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41238
2024-06-25 22:08:44 -07:00
Phillip Webb
eef4c3c2c0
Allow TestcontainersLifecycleBeanPostProcessor to detect scoped beans
...
Update `TestcontainersLifecycleBeanPostProcessor` so that scoped beans
are included.
Fixes gh-35786
2024-06-25 22:00:34 -07:00
Phillip Webb
28e6af5652
Merge branch '3.3.x'
...
Closes gh-41237
2024-06-25 17:08:35 -07:00
Phillip Webb
a3377b0672
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41236
2024-06-25 17:08:29 -07:00
Phillip Webb
8bcdb4b06b
Improve error message when spring.config.import fails to resolve
...
Update `StandardConfigDataLocationResolver` to give a better error
message when a location cannot be resolved. Prior to this commit, a
location with a misspelling in the prefix would only give an error
about the file extension being not known.
Fixes gh-36243
2024-06-25 17:08:24 -07:00
Phillip Webb
f5eb6e95ce
Merge branch '3.3.x'
...
Closes gh-41235
2024-06-25 12:43:15 -07:00
Phillip Webb
eb9f16e7e6
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41234
2024-06-25 12:42:53 -07:00
Phillip Webb
85f6641a7e
Allow 'npipe://' prefix in Docker host address
...
Update `LocalHttpClientTransport` to support explicit `npipe://` prefix
in the host name. This is the format used in the Docker config from
v4.31.1 onward.
Fixes gh-41199
2024-06-25 12:40:11 -07:00