Commit Graph

134 Commits

Author SHA1 Message Date
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
Johnny Lim
42ab82c0b1 Use NBT plugin version from gradle.properties in image tests
See gh-32643
2022-10-13 15:05:06 -05:00
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
2022-09-29 18:55:42 +02:00
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
2022-09-29 18:55:41 +02:00
Scott Frederick
b191bf1c09 Merge branch '2.7.x'
Closes gh-32508
2022-09-26 14:19:22 -05:00
Scott Frederick
4ecc6656f3 Merge branch '2.6.x' into 2.7.x
Closes gh-32507
2022-09-26 14:18:47 -05:00
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
2022-09-26 14:18:17 -05:00
Stephane Nicoll
d7537bf66a Use latest Native Build Tools Plugin version
See gh-32474
2022-09-22 10:11:47 +02:00
Scott Frederick
f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Scott Frederick
c9829c4232 Add native image test to Paketo system tests
Closes gh-32413
2022-09-16 17:40:55 -05:00
Scott Frederick
f90ee2bdd9 Merge branch '2.7.x'
Closes gh-32411
2022-09-16 15:27:36 -05:00
Scott Frederick
8d0ca4e640 Merge branch '2.6.x' into 2.7.x
Closes gh-32410
2022-09-16 15:27:17 -05:00
Scott Frederick
057ad72945 Enable Paketo builder system tests on Java 18
Closes gh-32296
2022-09-16 15:26:56 -05:00
Andy Wilkinson
144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson
78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2022-09-09 15:13:43 +01:00
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
2022-09-02 15:10:22 -05:00
Andy Wilkinson
4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Scott Frederick
256b7b1bed Merge branch '2.7.x' 2022-03-22 13:43:30 -05:00
Scott Frederick
e99b13e009 Merge branch '2.6.x' into 2.7.x
Closes gh-30374
2022-03-22 13:42:02 -05:00
Scott Frederick
7a8bde5f7b Enable Paketo system tests for Java versions supported by buildpacks
Closes gh-30373
2022-03-22 13:41:24 -05:00
Scott Frederick
040afdeafe Merge branch '2.7.x' 2022-03-11 15:20:38 -06:00
Scott Frederick
93622d18eb Merge branch '2.6.x' into 2.7.x
Closes gh-30195
2022-03-11 15:20:15 -06:00
Scott Frederick
35a9a7fee2 Ignore deprecation warnings in Paketo system tests
Closes gh-30194
2022-03-11 15:19:53 -06:00
Phillip Webb
5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb
adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb
1a3841f74e Polish 2022-02-23 21:44:14 -08:00
Scott Frederick
df549190b5 Merge branch '2.7.x' 2022-02-23 17:56:55 -06:00
Scott Frederick
ee4e7bb923 Merge branch '2.6.x' into 2.7.x
Closes gh-29982
2022-02-23 17:56:34 -06:00
Scott Frederick
59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
2022-02-23 17:56:21 -06:00
Moritz Halbritter
d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
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
2022-02-21 10:34:38 +01:00
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
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
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
2022-02-17 09:17:23 +01:00
Moritz Halbritter
fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 13:55:16 +01:00
Scott Frederick
54c4ec18c6 Merge branch '2.7.x' 2021-12-14 15:51:18 -06:00
Scott Frederick
00c8b85364 Add validation of SBOM to Paketo system tests
Fixes gh-29027
2021-12-14 15:42:44 -06:00
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
2021-12-09 20:44:40 +00:00
Andy Wilkinson
8f3659c147 Merge branch '2.5.x' into 2.6.x
Closes gh-28941
2021-12-09 12:44:48 +00:00
Andy Wilkinson
fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
35f2d98de2 Remove deployment tests for servers not Java 17 and EE 9 ready
Closes gh-28815
2021-11-30 15:55:48 +00:00
Scott Frederick
3b12a5efe9 Update system tests for Paketo Java buildpack 6.0.0
Paketo Java buildpack version 6.0.0 adds a buildpack and removes
support for the SBOM in the format that the system tests attempt
to verify.

Fixes gh-28823
2021-11-29 12:24:04 -06:00
Andy Wilkinson
4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot
Closes gh-28817
2021-11-26 13:01:34 +00:00
Andy Wilkinson
0074d621d0 Merge branch '2.5.x'
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Phillip Webb
55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
dreis2211
e1afc91ae2 Polish javadoc comments
See gh-27925
2021-09-10 07:53:49 +02:00
Scott Frederick
f7c901ffe7 Fix deployment test file names
See gh-27499
2021-07-26 15:45:22 -05:00
Scott Frederick
32bb6f6989 Move deployment tests to system tests pipeline
Closes gh-27499
2021-07-26 15:29:56 -05:00
Scott Frederick
a0b32251eb Split gradle test support into a separate module
See gh-25824
2021-07-16 12:52:39 -05:00
Scott Frederick
89b49f5ead Fix system test runtime classpath and build scan notification
See gh-25824
2021-07-09 13:21:48 -05:00
Scott Frederick
d4253150d4 Fix checkstyle violations
See gh-25824
2021-07-08 17:52:08 -05:00
Scott Frederick
18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
2021-07-08 17:02:43 -05:00