899da7891a
Merge branch '3.1.x' into 3.2.x
...
See gh-39340
2024-01-31 17:44:07 +00:00
dd082c6c21
Revert "Upgrade to Commons Compress 1.25.0"
...
This reverts commit 1c2a622f7f
2024-01-31 17:35:57 +00:00
8c18d75b12
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39340
2024-01-30 13:50:13 +00:00
1c2a622f7f
Upgrade to Commons Compress 1.25.0
...
Closes gh-39148
2024-01-30 13:49:37 +00:00
35eba69996
Merge branch '3.1.x'
...
Closes gh-38759
2023-12-12 15:43:10 -06:00
823054f543
Allow native spring-boot-image-tests to run without an existing snapshot
...
Closes gh-38757
2023-12-12 15:42:37 -06:00
f9c9f3228d
Merge branch '3.1.x'
2023-11-08 10:35:48 +00:00
dfe6b50a59
Merge branch '3.0.x' into 3.1.x
2023-11-08 10:35:40 +00:00
eb8e8dd366
Merge branch '3.1.x'
...
Closes gh-38265
2023-11-08 10:35:30 +00:00
bb761e54f6
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38264
2023-11-08 10:35:08 +00:00
e4fe2d86c0
Update Tomcat version used for deployment tests
2023-11-08 10:34:50 +00:00
c19827772f
Reinstate deployment tests for servers that now support EE 9/10
...
Closes gh-38232
2023-11-08 10:34:00 +00:00
b5d4983829
Polish
...
See gh-37984
2023-10-23 11:15:27 +02:00
361f737086
Fix launcher path in Paketo system tests
...
See gh-37667
2023-10-04 13:33:24 -05:00
c22548982a
Relocate launcher classes
...
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.
This update is designed to improve compatibility with future
changes in the loader.
Closes gh-37667
2023-10-03 14:53:04 -07:00
9004966353
Merge branch '3.1.x'
2023-09-26 19:10:01 -05:00
bfc034f9e9
Merge branch '3.0.x' into 3.1.x
2023-09-26 19:09:54 -05:00
e8a15327da
Fix formatting
2023-09-26 19:09:37 -05:00
7c23c0b3c2
Merge branch '3.1.x'
2023-09-26 18:51:03 -05:00
5ae4ba83a7
Merge branch '3.0.x' into 3.1.x
2023-09-26 18:19:48 -05:00
7e29a3c70b
Use latest available Gradle version for Paketo system tests
...
This ensures that the tests will run with the latest Java versions.
See gh-37507
2023-09-26 18:19:25 -05:00
845c4dd057
Merge branch '3.1.x'
...
Closes gh-37556
2023-09-22 14:24:14 -05:00
742dae5c3f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37555
2023-09-22 14:24:06 -05:00
d57f9b8643
Enable Paketo Builder Tests on Java 21
...
Closes gh-37507
2023-09-22 14:23:27 -05:00
c5e221143f
Ignore AOT-related deprecation warnings in Paketo system tests
...
Closes gh-37433
2023-09-21 12:33:02 -05:00
63a891790c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37518
2023-09-21 12:14:20 -05:00
e5e04d9fbc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37517
2023-09-21 12:05:00 -05:00
bd855135b0
Use Paketo Jammy builder in Paketo system tests
...
Closes gh-37516
2023-09-21 11:56:35 -05:00
7d019c612e
Merge branch '3.1.x'
2023-06-28 15:12:06 -06:00
c2146deeda
Merge branch '3.0.x' into 3.1.x
2023-06-28 15:11:58 -06:00
80e72836ef
Disable Paketo builder native system test on Java 20
...
See gh-35897
2023-06-28 15:11:32 -06:00
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -07:00
0fd1c89889
Polish
2023-06-16 13:53:33 -07:00
aafaf0fab9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35898
2023-06-14 15:49:21 -05:00
244bf4801b
Enable Paketo builder system tests on Java 20
...
Closes gh-35897
2023-06-14 15:49:07 -05:00
779ac09417
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35895
2023-06-14 13:49:54 -05:00
504d9fc50b
Fix validation of process args metadata in Paketo system tests
...
Fixes gh-35894
2023-06-14 13:49:11 -05:00
21406e7567
Merge branch '3.0.x'
...
Closes gh-35356
2023-05-08 12:50:53 -05:00
0b2e16e575
Adapt Paketo system tests to changes in the native buildpack
...
Closes gh-35355
2023-05-08 12:50:43 -05:00
ae86c2f30e
Avoid using Jackson 2.15 in system tests that invoke Gradle
...
Closes gh-35273
2023-05-04 15:39:57 +01:00
ca26789a82
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35151
2023-04-24 16:44:11 -05:00
963542e7fc
Adapt Paketo system tests to changes in the Tomcat buildpack
...
Closes gh-35148
2023-04-24 16:18:56 -05:00
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
359076e213
Remove EnabledForJreRange.min in PaketoBuilderTests
...
See gh-33976
2023-01-31 10:14:47 +01:00
2faede6245
Polish 'Migrate from soon to be deprecate SnakeYAML constructor'
...
See gh-33663
2023-01-19 11:51:39 -08:00
a095a3a888
Migrate from soon to be deprecate SnakeYAML constructor
...
Update `LayersIndex` to use constructor that accepts
`LoaderOptions`.
See gh-33663
2023-01-19 11:50:18 -08:00
2ddb490290
Polish Paketo builder integration test native app
2023-01-11 15:33:05 -06:00
f588793445
Update copyright year of changed files
2022-12-22 01:00:42 -08:00
d88f968d22
Merge branch '2.7.x'
...
Closes gh-33403
2022-11-28 20:20:24 +00:00
39ad955969
Update Paketo tests for Platform API 0.10
...
See gh-32949
2022-11-08 10:32:25 -06:00
b97324493c
Update Paketo tests for Platform API 0.10
...
When CNB Platform API 0.10 is used, buildpacks will set the process
command as a list of strings instead of a single string.
See gh-32949
2022-11-07 18:40:09 -06:00
4be3218cb6
Merge branch '2.7.x'
2022-10-25 15:48:26 -07:00
e6c37d698f
Reinstate support for read timeouts with RestTemplateBuilder
...
Refactor the way `ClientHttpRequestFactory` instances are created in
order to support setting read timeouts.
Prior to this commit, the reflection based approach would call
`setReadTimeout`. As of Spring Framework 6.0, the
`HttpComponentsClientHttpRequestFactory` class no longer supports this
approach. The timeout must be set on the `HttpClientConnectionManager`
used in the `HttpClient` which can be passed in to the constructor.
In order to support this approach, the `ClientHttpRequestFactory` can
now be created using a `Function` rather than a `Supplier`. The
function accepts a `ClientHttpRequestFactorySettings` which provides
the timeout settings to apply.
The `ClientHttpRequestFactories` utility class provides methods to
create `ClientHttpRequestFactory` instances that respect the settings.
Whenever possible, these are created without using reflection.
Fixes gh-32857
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2022-10-25 14:41:19 -07:00
c22e76632c
Add Build-Jdk-Spec to jar and war manifest when building with Gradle
...
This commit adds a `Build-Jdk-Spec` attribute to the manifest in a
jar or war file built with the Spring Boot Gradle plugin. This
aligns the Gradle plugin's behavior with the default Maven plugin
behavior.
This removes the need to set a `BP_JVM_VERSION` environment variable
when invoking Cloud Native Buildpacks, as the Paketo buildpacks will
honor `Build-Jdk-Spec` in a jar or war manifest to determine the
default JVM version.
Fixes gh-32829
2022-10-25 15:48:05 -05:00
99edda735e
Polish
2022-10-25 12:57:58 +01:00
3eb61bf010
Use Paketo early access buildpack in Paketo native system tests
...
Closes gh-32828
2022-10-20 17:29:33 -05:00
3ea18f07fa
Polish "Use NBT plugin version from gradle.properties in image tests"
...
See gh-32643
2022-10-13 15:05:06 -05:00
42ab82c0b1
Use NBT plugin version from gradle.properties in image tests
...
See gh-32643
2022-10-13 15:05:06 -05:00
a0735eb3fb
Migrate remaining usage of httpclient API
...
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.
Closes gh-32461
2022-09-29 18:55:42 +02:00
5fb2a50ad0
Adapt build dependencies to httpclient5
...
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.
See gh-32461
2022-09-29 18:55:41 +02:00
b191bf1c09
Merge branch '2.7.x'
...
Closes gh-32508
2022-09-26 14:19:22 -05:00
4ecc6656f3
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32507
2022-09-26 14:18:47 -05:00
81598b51f9
Use task outputs in distZip Paketo system tests
...
Using the outputs from `distZip` and `bootDistZip` as input to the
`bootBuildImage` task instead of indirectly using the output file
path prevents Gradle warnings about implicit task dependencies.
Fixes gh-32506
2022-09-26 14:18:17 -05:00
d7537bf66a
Use latest Native Build Tools Plugin version
...
See gh-32474
2022-09-22 10:11:47 +02:00
f9c341c75a
Revert "Generate the AutoConfiguration.imports file from annotations"
...
This reverts commit da4de7d67d
2022-09-21 14:50:15 -05:00
c9829c4232
Add native image test to Paketo system tests
...
Closes gh-32413
2022-09-16 17:40:55 -05:00
f90ee2bdd9
Merge branch '2.7.x'
...
Closes gh-32411
2022-09-16 15:27:36 -05:00
8d0ca4e640
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32410
2022-09-16 15:27:17 -05:00
057ad72945
Enable Paketo builder system tests on Java 18
...
Closes gh-32296
2022-09-16 15:26:56 -05:00
144fdaa703
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32283
2022-09-09 15:14:40 +01:00
78f4242e46
Build with Gradle 7.5 while still supporting Gradle 6.8+
...
Closes gh-32281
2022-09-09 15:13:43 +01:00
da4de7d67d
Generate the AutoConfiguration.imports file from annotations
...
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.
Closes gh-31228
2022-09-02 15:10:22 -05:00
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
256b7b1bed
Merge branch '2.7.x'
2022-03-22 13:43:30 -05:00
e99b13e009
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30374
2022-03-22 13:42:02 -05:00
7a8bde5f7b
Enable Paketo system tests for Java versions supported by buildpacks
...
Closes gh-30373
2022-03-22 13:41:24 -05:00
040afdeafe
Merge branch '2.7.x'
2022-03-11 15:20:38 -06:00
93622d18eb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30195
2022-03-11 15:20:15 -06:00
35a9a7fee2
Ignore deprecation warnings in Paketo system tests
...
Closes gh-30194
2022-03-11 15:19:53 -06:00
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
1a3841f74e
Polish
2022-02-23 21:44:14 -08:00
df549190b5
Merge branch '2.7.x'
2022-02-23 17:56:55 -06:00
ee4e7bb923
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29982
2022-02-23 17:56:34 -06:00
59ffe28639
Ignore buildpack deprecation warnings in Paketo system tests
...
Fixes gh-29885
2022-02-23 17:56:21 -06:00
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
42808ff13c
Merge branch '2.7.x'
...
# Conflicts:
# spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
2022-02-17 09:17:23 +01:00
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
54c4ec18c6
Merge branch '2.7.x'
2021-12-14 15:51:18 -06:00
00c8b85364
Add validation of SBOM to Paketo system tests
...
Fixes gh-29027
2021-12-14 15:42:44 -06:00
8a3fbed6eb
Downgrade Wildfly to work around basic auth bug
...
As described in https://issues.redhat.com/browse/WFLY-15478 , Wildfly
25.0.0.Final rejects all requests that use basic auth with a 401
response. 25.0.0.Final is, at the time of writing, the latest available
Wildfly Docker image so we need to downgrade to 24.0.0.Final.
Closes gh-28956
2021-12-09 20:44:40 +00:00
Andy Wilkinson
Scott Frederick
Andy Wilkinson
Johnny Lim
Scott Frederick
Phillip Webb
Andrey Somov
Brian Clozel
Stephane Nicoll
Moritz Halbritter