Stephane Nicoll
bb16ed1245
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36427
2023-07-17 15:24:58 +02:00
Stephane Nicoll
3586bfb629
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36426
2023-07-17 15:22:43 +02:00
Stephane Nicoll
09e5d38348
Polish "Replace @CsvSource with @ValueSource where feasible"
...
See gh-36062
2023-07-17 15:16:27 +02:00
Yanming Zhou
acb7acd5d9
Replace @CsvSource with @ValueSource where feasible
...
@ValueSource is more appropriate for single parameter.
See gh-36062
2023-07-17 15:16:26 +02:00
Andy Wilkinson
fc8a8d363f
Polish
2023-07-05 15:50:32 +01:00
Andy Wilkinson
ce8253ea95
Merge branch '3.1.x'
...
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson
c9f8d92656
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36237
2023-07-05 09:47:43 +01:00
Johnny Lim
0fa58c04e7
Use Stream.toList()
...
See gh-36167
2023-07-05 09:38:19 +01:00
Andy Wilkinson
8ed160a144
Merge branch '3.1.x'
...
Closes gh-36228
2023-07-05 08:53:33 +01:00
Andy Wilkinson
480049ef5b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36227
2023-07-05 08:53:15 +01:00
Andy Wilkinson
cbc0f7117f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36226
2023-07-05 08:52:55 +01:00
Andy Wilkinson
fe08c70973
Test Gradle plugin against Gradle 8.2
...
Closes gh-36207
2023-07-05 08:13:24 +01:00
Andy Wilkinson
9985c845f2
Adapt to Framework changes missed due to predictive test selection
...
See gh-36198
2023-07-04 12:39:52 +01:00
Andy Wilkinson
5a9ca67fba
Start building against Spring Framework 6.2.0-M2 snapshots
...
See gh-36198
2023-07-04 10:20:33 +01:00
Phillip Webb
1bf334ae0f
Polish config metadata changelog generator
...
See gh-21486
2023-07-01 00:30:26 +01:00
Andy Wilkinson
32b7b312f0
Add config metadata changelog generator to main build
...
Closes gh-21486
2023-06-30 10:26:33 +01:00
Andy Wilkinson
6d8ca7286a
Merge branch '3.1.x'
...
Closes gh-36128
2023-06-30 08:26:26 +01:00
Andy Wilkinson
a268c6433e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36127
2023-06-30 08:26:12 +01:00
Andy Wilkinson
93f8bd2170
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36126
2023-06-30 08:25:53 +01:00
Andy Wilkinson
b32697b3ce
Add support to @ClassPathExclusions for excluding packages
...
Closes gh-36120
2023-06-29 16:53:36 +01:00
Scott Frederick
c32877493c
Merge branch '3.1.x'
...
Closes gh-36055
2023-06-23 15:47:00 -06:00
Scott Frederick
b9b314622f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36054
2023-06-23 15:46:44 -06:00
Scott Frederick
4a3abdd7c3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36053
2023-06-23 15:46:27 -06:00
Johnny Lim
59d4bf97a1
Add Javadoc since to ImageReference.inTaglessForm()
...
See gh-36048
2023-06-23 15:45:29 -06:00
Scott Frederick
90dd7449bb
Merge branch '3.1.x'
...
Closes gh-36051
2023-06-23 15:20:25 -06:00
Scott Frederick
92b2573a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36050
2023-06-23 15:20:06 -06:00
Scott Frederick
eeeb2ad72a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36049
2023-06-23 15:19:44 -06:00
Johnny Lim
4a2c9d99dc
Remove redundant Files.delete() calls in tests
...
See gh-35986
2023-06-23 15:14:59 -06:00
Andy Wilkinson
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson
fc403f4f18
Merge branch '3.1.x'
2023-06-21 13:15:06 +01:00
Andy Wilkinson
d3522a78a8
Merge branch '3.0.x' into 3.1.x
2023-06-21 13:14:46 +01:00
Andy Wilkinson
641f00f24c
Disable test when Java version is too high
...
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.
See gh-35931
2023-06-21 13:12:20 +01:00
Andy Wilkinson
b394553b30
Merge branch '3.1.x'
2023-06-21 12:11:06 +01:00
Andy Wilkinson
660dbb9afd
Fix Maven-built native images with Docker Compose dependency
...
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.
This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.
Fixes gh-35676
2023-06-21 11:44:30 +01:00
Andy Wilkinson
818f096890
Merge branch '3.1.x'
2023-06-21 10:46:35 +01:00
Andy Wilkinson
853caf9a59
Do not exclude DevTools from Maven AOT processing classpath
...
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.
Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.
Fixes gh-35853
2023-06-21 10:36:38 +01: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
8afbff3f28
Merge branch '3.1.x'
2023-06-16 16:17:59 -07:00
Phillip Webb
3d6c6a6611
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35934
2023-06-16 16:15:04 -07:00
Phillip Webb
af846da69b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb
23eb7ec1f8
Merge branch '3.1.x'
2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4
Merge branch '2.7.x' into 3.0.x
2023-06-16 14:34:54 -07:00
Scott Frederick
fe927f0e06
Merge branch '3.1.x'
2023-06-16 16:11:00 -05:00
Scott Frederick
e8301a065f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35932
2023-06-16 16:10:48 -05:00
Scott Frederick
fbba2df7bf
Enable Gradle plugin tests on Java 20
...
Closes gh-35931
2023-06-16 16:10:24 -05:00
Andy Wilkinson
b9c2c289b3
Start working on Spring Boot 3.2
...
This commit also disables the creation of forward merge issues
when merging into main. Forward merge issues will be re-enabled
once 3.1.1 has been released.
2023-06-08 17:22:21 +01:00
Andy Wilkinson
cdcebe452c
Polish "Test Gradle plugin against Gradle 8.2-rc-1"
...
See gh-35708
2023-06-05 10:59:30 +01:00
Andy Wilkinson
45ce18e1c7
Polish "Test Gradle plugin against Gradle 8.2-rc-1"
...
See gh-35708
2023-06-02 15:35:34 +01:00
Andy Wilkinson
d6192a0fa1
Merge branch '3.0.x'
...
Closes gh-35708
2023-06-02 15:18:13 +01:00
Andy Wilkinson
5a793a6d49
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35707
2023-06-02 15:17:35 +01:00
Andy Wilkinson
5623fe3b94
Test Gradle plugin against Gradle 8.2-rc-1
...
Closes gh-35699
2023-06-02 13:23:36 +01:00
kitbolourchi
1ac6e9ebe1
Upgrade Kafka image used in integration tests
...
See gh-35625
2023-05-24 16:12:08 -05:00
Stephane Nicoll
dcb97594c3
Merge branch '3.0.x'
...
Closes gh-35618
2023-05-24 13:30:54 +02:00
Stephane Nicoll
44c2090092
Polish "Fix description of build-image[-no-fork] Maven plugin goals"
...
See gh-35609
2023-05-24 13:28:01 +02:00
Thomas Kåsene
e84025b1b8
Fix description of build-image[-no-fork] Maven plugin goals
...
See gh-35609
2023-05-24 13:24:37 +02:00
Phillip Webb
1ec78e5437
Add devtools and docker-compose to test maven repository
...
See gh-35548
2023-05-18 15:15:16 -07:00
Phillip Webb
c2961a1e4a
Exclude docker-compose and devtools during AOT processing
...
Update `ProcessAotMojo` so that `spring-boot-docker-compose` and
`spring-boot-devtools` are not included on the classpath.
Fixes gh-35548
2023-05-18 11:21:13 -07:00
Phillip Webb
ae90add7c7
Polish
2023-05-16 14:04:48 -07:00
Andy Wilkinson
37cc6b6a70
Merge branch '3.0.x'
...
Closes gh-35444
2023-05-16 09:27:30 +01:00
Andy Wilkinson
c39a37cd23
Exclude developmentOnly dependences from AOT processing classpaths
...
Fixes gh-35433
2023-05-16 09:26:20 +01:00
Phillip Webb
e3ed87d165
Merge branch '3.0.x'
2023-05-12 13:21:52 -07:00
Phillip Webb
92e420a098
Merge branch '2.7.x' into 3.0.x
2023-05-12 13:14:12 -07:00
Phillip Webb
57e45dfb21
Update copyright year of changed files
2023-05-12 13:01:43 -07:00
Phillip Webb
ef4b09718c
Fix loading of PKCS#8 PEM encoded EC and DSA keys for buildpack
...
Polish and port support for PKCS#8 PEM encoded EC and DSA keys to
the buildpack code.
See gh-35322
2023-05-12 13:01:30 -07:00
Phillip Webb
e9c4a5d663
Polish
2023-05-12 13:01:30 -07:00
Moritz Halbritter
e930801eb1
Separate tag in the Docker API tag call
...
Closes gh-35358
2023-05-11 09:52:52 +02:00
Moritz Halbritter
d00e070cdb
Separate tag in the Docker API tag call
...
Closes gh-35358
2023-05-11 09:52:45 +02:00
Moritz Halbritter
4eef8d5a53
Separate tag in the Docker API tag call
...
Closes gh-35358
2023-05-11 09:52:41 +02:00
Johnny Lim
ff9fd1abeb
Polish
...
See gh-35185
2023-05-10 08:31:36 +02:00
Moritz Halbritter
05add58976
Merge branch '3.0.x'
...
Closes gh-35373
2023-05-10 08:23:35 +02:00
Moritz Halbritter
42cc84070b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35372
2023-05-10 08:23:27 +02:00
Moritz Halbritter
52789cb191
Fix anchors in Maven plugin documentation
...
Closes gh-35371
2023-05-10 08:21:44 +02:00
Andy Wilkinson
93c3116b3a
Fix failsGracefullyWhenNoTestMainMethodIsFound on Windows
2023-05-09 16:56:18 +01:00
Moritz Halbritter
a4092fb396
Remove HTML tags from TestRunMojo javadoc
...
Closes gh-35349
2023-05-09 10:14:55 +02:00
Scott Frederick
cf180fa1cc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick
5d91c24f63
Update Couchbase image tag used in tests
...
Closes gh-35228
2023-05-05 14:45:58 -05:00
Andy Wilkinson
07a11045d9
Merge branch '3.0.x'
...
Closes gh-35328
2023-05-05 17:35:50 +01:00
Andy Wilkinson
fd864c35aa
Improve mapping of resolved artifacts to dependency coordinates
...
Closes gh-31216
2023-05-05 17:32:59 +01:00
Moritz Halbritter
441ed30ee4
Polish "Replace Mockito argument captors with assertArg"
...
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
See gh-35015
2023-05-05 15:41:31 +02:00
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02:00
Scott Frederick
1143396531
Add smoke tests to verify Couchbase SSL connections
...
See gh-34811
2023-05-04 17:09:52 -05:00
Andy Wilkinson
19d7973776
Add bootTestRun to run app using test source set output and classpath
...
Closes gh-35248
2023-05-04 15:27:10 +01:00
Andy Wilkinson
e43998615c
Add a test-run goal to the Maven plugin
...
Closes gh-35202
2023-05-04 15:06:03 +01:00
Moritz Halbritter
9b5a2643cc
Polish "Add service connection from Testcontainers Zipkin"
...
See gh-35107
2023-05-03 13:09:50 +02:00
Phillip Webb
d86e82d026
Merge branch '3.0.x'
2023-05-02 15:42:05 -07:00
Phillip Webb
2c27ec5b7b
Merge branch '2.7.x' into 3.0.x
2023-05-02 15:42:00 -07:00
Phillip Webb
b3226c55d2
Polish
2023-05-02 15:41:55 -07:00
Scott Frederick
23ae91b008
Add native image manifest entry
...
A manifest entry `Spring-Boot-Native-Processed: true` is added to the
jar manifest by the Maven or Gradle plugin when the jar has been built
for use in a native image. With the Gradle plugin, this is done in
reaction to the GraalVM Native Image Plugin being applied to the
project. With the Maven plugin, this is done when the `native` profile
is applied to the build.
2023-05-02 15:11:49 -05:00
Scott Frederick
5ac6a3d90b
Add smoke test to verify MongoDB SSL connections
...
See gh-35042
2023-05-02 15:11:09 -05:00
Scott Frederick
3bb271e320
Add smoke test to verify Redis SSL connection
...
See gh-34815
2023-05-02 13:52:50 -05:00
Moritz Halbritter
9d50d92b9c
Merge branch '3.0.x'
2023-05-02 16:36:49 +02:00
Moritz Halbritter
1f4a337ad2
Merge branch '2.7.x' into 3.0.x
2023-05-02 16:17:50 +02:00
Moritz Halbritter
091d6204cb
Disable build image integration tests on aarch64 linux and mac
...
See gh-35229
2023-05-02 15:38:42 +02:00
Moritz Halbritter
7c725a7560
Polish DockerImageNames
2023-05-02 15:01:45 +02:00
Andy Wilkinson
ce7bf0d0af
Merge branch '3.0.x'
...
Closes gh-35197
2023-04-28 18:06:37 +01:00
Andy Wilkinson
4581c25e20
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35196
2023-04-28 18:06:12 +01:00
Andy Wilkinson
de2df9311c
Test Gradle plugin against Gradle 8.1.1
...
Closes gh-35195
2023-04-28 18:05:06 +01:00
Andy Wilkinson
b64adbc34b
Fix disabled conditions on AbstractDockerComposeIntegrationTests
2023-04-20 16:12:36 +01:00
Andy Wilkinson
d4f857683d
Polish formatting of DockerImageNames
2023-04-19 14:22:12 +01:00