Commit Graph

64 Commits (be5099a9ce486486dc242adef372bf79cfac33cc)

Author SHA1 Message Date
Scott Frederick 39ad955969 Update Paketo tests for Platform API 0.10
See gh-32949
2 years ago
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
2 years ago
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2 years ago
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>
2 years ago
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
2 years ago
Andy Wilkinson 99edda735e Polish 2 years ago
Scott Frederick 3eb61bf010 Use Paketo early access buildpack in Paketo native system tests
Closes gh-32828
2 years ago
Scott Frederick 3ea18f07fa Polish "Use NBT plugin version from gradle.properties in image tests"
See gh-32643
2 years ago
Johnny Lim 42ab82c0b1 Use NBT plugin version from gradle.properties in image tests
See gh-32643
2 years ago
Brian Clozel 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
2 years ago
Brian Clozel 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
2 years ago
Scott Frederick b191bf1c09 Merge branch '2.7.x'
Closes gh-32508
2 years ago
Scott Frederick 4ecc6656f3 Merge branch '2.6.x' into 2.7.x
Closes gh-32507
2 years ago
Scott Frederick 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
2 years ago
Stephane Nicoll d7537bf66a Use latest Native Build Tools Plugin version
See gh-32474
2 years ago
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2 years ago
Scott Frederick c9829c4232 Add native image test to Paketo system tests
Closes gh-32413
2 years ago
Scott Frederick f90ee2bdd9 Merge branch '2.7.x'
Closes gh-32411
2 years ago
Scott Frederick 8d0ca4e640 Merge branch '2.6.x' into 2.7.x
Closes gh-32410
2 years ago
Scott Frederick 057ad72945 Enable Paketo builder system tests on Java 18
Closes gh-32296
2 years ago
Andy Wilkinson 144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2 years ago
Andy Wilkinson 78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2 years ago
Scott Frederick 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
2 years ago
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 3 years ago
Andy Wilkinson 3d203d0215 Polish 3 years ago
Scott Frederick 256b7b1bed Merge branch '2.7.x' 3 years ago
Scott Frederick e99b13e009 Merge branch '2.6.x' into 2.7.x
Closes gh-30374
3 years ago
Scott Frederick 7a8bde5f7b Enable Paketo system tests for Java versions supported by buildpacks
Closes gh-30373
3 years ago
Scott Frederick 040afdeafe Merge branch '2.7.x' 3 years ago
Scott Frederick 93622d18eb Merge branch '2.6.x' into 2.7.x
Closes gh-30195
3 years ago
Scott Frederick 35a9a7fee2 Ignore deprecation warnings in Paketo system tests
Closes gh-30194
3 years ago
Phillip Webb 5454e2e26a Merge branch '2.7.x' 3 years ago
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 1a3841f74e Polish 3 years ago
Scott Frederick df549190b5 Merge branch '2.7.x' 3 years ago
Scott Frederick ee4e7bb923 Merge branch '2.6.x' into 2.7.x
Closes gh-29982
3 years ago
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
3 years ago
Moritz Halbritter d42f675959 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 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
3 years ago
Moritz Halbritter 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
3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 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
3 years ago
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Scott Frederick 54c4ec18c6 Merge branch '2.7.x' 3 years ago
Scott Frederick 00c8b85364 Add validation of SBOM to Paketo system tests
Fixes gh-29027
3 years ago
Andy Wilkinson 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
3 years ago
Andy Wilkinson 8f3659c147 Merge branch '2.5.x' into 2.6.x
Closes gh-28941
3 years ago