Commit Graph

49627 Commits

Author SHA1 Message Date
Phillip Webb
5d4a777d27 Align test with upstream Spring Security change
Closes gh-41488
2024-07-15 06:53:09 +01:00
Stéphane Nicoll
110855a127 Merge branch '3.3.x'
Closes gh-41486
2024-07-14 11:40:20 +02:00
Stéphane Nicoll
d7f780a589 Merge branch '3.2.x' into 3.3.x
Closes gh-41485
2024-07-14 11:40:06 +02:00
Stéphane Nicoll
db9b62e628 Upgrade to Spring Retry 2.0.7
Closes gh-41484
2024-07-14 11:35:26 +02:00
Stéphane Nicoll
2975a8ce3f Fix javadoc warning
The `@deprecated` tag cannot be used on module-info. This commit adapts
the deprecation notice accordingly.

Closes gh-41481
2024-07-14 11:33:46 +02:00
Brian Clozel
c693b2bd8c Add support for webjars-locator-lite
This is a follow-up to spring-projects/spring-framework#27619
This commit adds support for "org.webjars:webjars-locator-lite" for
enabling the statis resources chain.

As of this commit, support for "org.webjars:webjars-locator-core" is
deprecated for obvious performance reasons.

Closes gh-40146
2024-07-12 19:17:17 +02:00
Andy Wilkinson
f8d06d568b Merge branch '3.3.x'
Closes gh-41475
2024-07-12 16:03:33 +01:00
Andy Wilkinson
b175d1b6f9 Merge branch '3.2.x' into 3.3.x
Closes gh-41474
2024-07-12 16:03:23 +01:00
Andy Wilkinson
b76b7b7bd9 Upgrade to AspectJ 1.9.22.1
Closes gh-41470
2024-07-12 16:02:54 +01:00
Andy Wilkinson
3d6571c63c Merge branch '3.3.x' 2024-07-12 16:02:25 +01:00
Andy Wilkinson
be35e5e997 Merge branch '3.2.x'
Closes gh-41473
2024-07-12 16:00:40 +01:00
Andy Wilkinson
eef8bacd22 Merge branch '3.2.x' into 3.3.x
Closes gh-41472
2024-07-12 16:00:27 +01:00
Andy Wilkinson
7398c6c2a4 Fix upgrade detection when number of numeric components changes
Fixes gh-41471
2024-07-12 15:53:02 +01:00
Stéphane Nicoll
b3a882c651 Merge branch '3.3.x'
See gh-41459
2024-07-12 16:06:32 +02:00
Stéphane Nicoll
1de73218db Merge branch '3.2.x' into 3.3.x
See gh-41457
2024-07-12 16:05:51 +02:00
Stéphane Nicoll
f6cbbe7948 Add missing input for java distribution
See gh-41463
2024-07-12 16:04:35 +02:00
Andy Wilkinson
1c9064c3df Merge branch '3.3.x'
Closes gh-41469
2024-07-12 14:14:58 +01:00
Andy Wilkinson
14314a59c3 Upgrade to Antora UI Spring 0.4.16
Closes gh-41468
2024-07-12 14:14:39 +01:00
Andy Wilkinson
fae3cca9dc Merge branch '3.3.x'
Closes gh-41467
2024-07-12 14:05:46 +01:00
Andy Wilkinson
1cb8be007e Merge pull request #41464 from sdeleuze
* gh-41464:
  Refine CDS how-to guide

Closes gh-41464
2024-07-12 14:04:56 +01:00
Andy Wilkinson
e053f13191 Merge pull request #41464 from sdeleuze
* gh-41464:
  Refine CDS how-to guide

Closes gh-41464
2024-07-12 14:04:41 +01:00
Sébastien Deleuze
75e642e396 Refine CDS how-to guide
As explained in gh-41348, the BP_SPRING_AOT_ENABLED flag should
not be promoted as it can't work by design with our current
support when combined with CDS for various use cases and provides
little added value as the same behavior can be achieved by adding
-Dspring.aot.enabled=true to JAVA_TOOL_OPTIONS and
CDS_TRAINING_JAVA_TOOL_OPTIONS.

See gh-41464
2024-07-12 14:04:15 +01:00
Andy Wilkinson
d32d69ceb5 Merge pull request #39864 from wanger26
* gh-39864:
  Polish "Deprecate @MockBean and @SpyBean"
  Deprecate @MockBean and @SpyBean

Closes gh-39864
2024-07-12 13:51:26 +01:00
Andy Wilkinson
cddf92e047 Polish "Deprecate @MockBean and @SpyBean"
See gh-39864
2024-07-12 13:49:11 +01:00
Jakob Wanger
24763940a0 Deprecate @MockBean and @SpyBean
- Deprecate Deprecate @MockBean and @SpyBean in favor of Spring
  Framework 6.2's @MockitoBean and @MockitoSpy
- Migrate usages of @MockBean and @SpyBean to @MockitoBean and
  @MockitoSpy

Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>

See gh-39864
2024-07-12 12:18:01 +01:00
Andy Wilkinson
acdaa6dc35 Tolerate multiple identical configurations in Logback AOT contribution
Fixes gh-36997
2024-07-12 11:51:38 +01:00
Stéphane Nicoll
b605b86b32 Merge branch '3.3.x' 2024-07-12 12:09:47 +02:00
Stéphane Nicoll
129d146e41 Merge branch '3.2.x' into 3.3.x 2024-07-12 12:09:37 +02:00
Stéphane Nicoll
f4b55a6f28 Harmonize GitHub Actions settings
Closes gh-41463
2024-07-12 12:08:11 +02:00
Andy Wilkinson
e0a8ec9401 Merge branch '3.3.x' 2024-07-12 11:05:39 +01:00
Andy Wilkinson
549a12683d Specify the repository when running Deploy Docs workflow
See gh-41461
2024-07-12 11:00:06 +01:00
Andy Wilkinson
8676cc6256 Deprecate Gson lenient property and introduce strictness replacement
Closes gh-41430
2024-07-12 10:55:51 +01:00
Andy Wilkinson
291fe282e4 Merge branch '3.3.x'
Closes gh-41462
2024-07-12 10:29:20 +01:00
Andy Wilkinson
dec6a8d1ba Move Trigger Docs Build into a separate job
Closes gh-41461
2024-07-12 10:27:34 +01:00
Stéphane Nicoll
6584476eac Merge branch '3.3.x'
Closes gh-41459
2024-07-12 09:13:34 +02:00
Stéphane Nicoll
fc5fc7f5c3 Harmonize GitHub Actions structure
This commit harmonizes the order of elements, in particular the settings
of the deploy step. It also adds the ability to build against a
different distribution than liberica.

Closes gh-41457
2024-07-12 09:12:57 +02:00
Andy Wilkinson
c563c501e9 Merge branch '3.3.x'
Closes gh-41456
2024-07-12 07:32:56 +01:00
Andy Wilkinson
8617c981cf Merge branch '3.2.x' into 3.3.x
Closes gh-41455
2024-07-12 07:31:58 +01:00
Andy Wilkinson
f702230c12 Test Gradle plugin against Gradle 8.9
Closes gh-41454
2024-07-12 07:31:24 +01:00
Scott Frederick
ea544822f6 Merge branch '3.3.x' 2024-07-11 18:39:45 -05:00
Scott Frederick
d79ae11925 Fix formatting problem
See gh-41350
2024-07-11 18:39:33 -05:00
Scott Frederick
73294ba86c Merge branch '3.3.x'
Closes gh-41453
2024-07-11 17:47:40 -05:00
Scott Frederick
24dbee40ff Add CDS test case to Paketo system tests
Closes gh-41350
2024-07-11 17:47:05 -05:00
Scott Frederick
7b8364d248 Fix LifecycleTests on Windows
See gh-gh-41352
2024-07-11 17:07:23 -05:00
Scott Frederick
224b06982e Add support for untrusted CNB builders
A `trustBuilder` configuration option has been added to the Maven and
Gradle CNB integration image building goal and task. A known set of
builders published by Paketo, Heroku, and Google are trusted by default,
all other builders are untrusted by default.

Closes gh-41352
2024-07-11 13:51:54 -05:00
Andy Wilkinson
c848a5e3ed Upgrade to Spring Framework 6.2.0-M5
Closes gh-41308
2024-07-11 18:30:56 +01:00
Andy Wilkinson
d0b1a0dbe2 Merge branch '3.3.x' 2024-07-11 18:30:32 +01:00
Andy Wilkinson
faa0b9c3b5 Upgrade to Spring Framework 6.1.11
Closes gh-41301
2024-07-11 18:30:18 +01:00
Andy Wilkinson
9850512454 Merge branch '3.2.x' into 3.3.x 2024-07-11 18:29:43 +01:00
Andy Wilkinson
85070411d1 Upgrade to Spring Framework 6.1.11
Closes gh-41295
2024-07-11 18:29:23 +01:00