Commit Graph

106 Commits

Author SHA1 Message Date
Andy Wilkinson
eb8e8dd366 Merge branch '3.1.x'
Closes gh-38265
2023-11-08 10:35:30 +00:00
Andy Wilkinson
bb761e54f6 Merge branch '3.0.x' into 3.1.x
Closes gh-38264
2023-11-08 10:35:08 +00:00
Andy Wilkinson
c19827772f Reinstate deployment tests for servers that now support EE 9/10
Closes gh-38232
2023-11-08 10:34:00 +00:00
Johnny Lim
b5d4983829 Polish
See gh-37984
2023-10-23 11:15:27 +02:00
Scott Frederick
361f737086 Fix launcher path in Paketo system tests
See gh-37667
2023-10-04 13:33:24 -05:00
Phillip Webb
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
Scott Frederick
9004966353 Merge branch '3.1.x' 2023-09-26 19:10:01 -05:00
Scott Frederick
bfc034f9e9 Merge branch '3.0.x' into 3.1.x 2023-09-26 19:09:54 -05:00
Scott Frederick
e8a15327da Fix formatting 2023-09-26 19:09:37 -05:00
Scott Frederick
7c23c0b3c2 Merge branch '3.1.x' 2023-09-26 18:51:03 -05:00
Scott Frederick
5ae4ba83a7 Merge branch '3.0.x' into 3.1.x 2023-09-26 18:19:48 -05:00
Scott Frederick
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
Scott Frederick
845c4dd057 Merge branch '3.1.x'
Closes gh-37556
2023-09-22 14:24:14 -05:00
Scott Frederick
742dae5c3f Merge branch '3.0.x' into 3.1.x
Closes gh-37555
2023-09-22 14:24:06 -05:00
Scott Frederick
d57f9b8643 Enable Paketo Builder Tests on Java 21
Closes gh-37507
2023-09-22 14:23:27 -05:00
Scott Frederick
c5e221143f Ignore AOT-related deprecation warnings in Paketo system tests
Closes gh-37433
2023-09-21 12:33:02 -05:00
Scott Frederick
63a891790c Merge branch '3.0.x' into 3.1.x
Closes gh-37518
2023-09-21 12:14:20 -05:00
Scott Frederick
e5e04d9fbc Merge branch '2.7.x' into 3.0.x
Closes gh-37517
2023-09-21 12:05:00 -05:00
Scott Frederick
bd855135b0 Use Paketo Jammy builder in Paketo system tests
Closes gh-37516
2023-09-21 11:56:35 -05:00
Scott Frederick
7d019c612e Merge branch '3.1.x' 2023-06-28 15:12:06 -06:00
Scott Frederick
c2146deeda Merge branch '3.0.x' into 3.1.x 2023-06-28 15:11:58 -06:00
Scott Frederick
80e72836ef Disable Paketo builder native system test on Java 20
See gh-35897
2023-06-28 15:11:32 -06:00
Andy Wilkinson
ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Phillip Webb
0fd1c89889 Polish 2023-06-16 13:53:33 -07:00
Scott Frederick
aafaf0fab9 Merge branch '3.0.x' into 3.1.x
Closes gh-35898
2023-06-14 15:49:21 -05:00
Scott Frederick
244bf4801b Enable Paketo builder system tests on Java 20
Closes gh-35897
2023-06-14 15:49:07 -05:00
Scott Frederick
779ac09417 Merge branch '3.0.x' into 3.1.x
Closes gh-35895
2023-06-14 13:49:54 -05:00
Scott Frederick
504d9fc50b Fix validation of process args metadata in Paketo system tests
Fixes gh-35894
2023-06-14 13:49:11 -05:00
Scott Frederick
21406e7567 Merge branch '3.0.x'
Closes gh-35356
2023-05-08 12:50:53 -05:00
Scott Frederick
0b2e16e575 Adapt Paketo system tests to changes in the native buildpack
Closes gh-35355
2023-05-08 12:50:43 -05:00
Andy Wilkinson
ae86c2f30e Avoid using Jackson 2.15 in system tests that invoke Gradle
Closes gh-35273
2023-05-04 15:39:57 +01:00
Scott Frederick
ca26789a82 Merge branch '2.7.x' into 3.0.x
Closes gh-35151
2023-04-24 16:44:11 -05:00
Scott Frederick
963542e7fc Adapt Paketo system tests to changes in the Tomcat buildpack
Closes gh-35148
2023-04-24 16:18:56 -05:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Johnny Lim
359076e213 Remove EnabledForJreRange.min in PaketoBuilderTests
See gh-33976
2023-01-31 10:14:47 +01:00
Phillip Webb
2faede6245 Polish 'Migrate from soon to be deprecate SnakeYAML constructor'
See gh-33663
2023-01-19 11:51:39 -08:00
Andrey Somov
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
Scott Frederick
2ddb490290 Polish Paketo builder integration test native app 2023-01-11 15:33:05 -06:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Andy Wilkinson
d88f968d22 Merge branch '2.7.x'
Closes gh-33403
2022-11-28 20:20:24 +00:00
Scott Frederick
39ad955969 Update Paketo tests for Platform API 0.10
See gh-32949
2022-11-08 10:32:25 -06:00
Scott Frederick
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
Phillip Webb
4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Andy Wilkinson
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
Scott Frederick
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
Andy Wilkinson
99edda735e Polish 2022-10-25 12:57:58 +01:00
Scott Frederick
3eb61bf010 Use Paketo early access buildpack in Paketo native system tests
Closes gh-32828
2022-10-20 17:29:33 -05:00
Scott Frederick
3ea18f07fa Polish "Use NBT plugin version from gradle.properties in image tests"
See gh-32643
2022-10-13 15:05:06 -05:00