Commit Graph

25597 Commits

Author SHA1 Message Date
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
Andy Wilkinson 8676cc6256 Deprecate Gson lenient property and introduce strictness replacement
Closes gh-41430
2024-07-12 10:55:51 +01: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 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
Phillip Webb c3ad8b0521 Add `APPLICATION_NAME` and `APPLICATION_GROUP` logging properties
Add `APPLICATION_NAME` and `APPLICATION_GROUP` properties that contain
verbatim values rather than formatted strings. Formatting of the values
is now handled by new `EnclosedInSquareBracketsConverter` classes for
both Logback and Log4J2.

The existing `LOGGED_APPLICATION_NAME` variable is now considered
deprecated. The `LOGGED_APPLICATION_GROUP` variable and related
logback converter have been removed since they never made it to a GA
release.

Closes gh-41444
2024-07-11 10:25:01 -07:00
Phillip Webb db5830a2e0 Polish logging related code 2024-07-11 10:25:01 -07:00
Andy Wilkinson 653443adc1 Revert "Merge pull request #41213 from timpeeters"
This reverts commit b4017f0ef4, reversing
changes made to 156237227c.

See gh-41213
2024-07-11 18:01:12 +01:00
Andy Wilkinson 6f17ff5cb2 Merge branch '3.3.x'
Closes gh-41449
2024-07-11 13:17:12 +01:00
Andy Wilkinson ecbbe6a9cb Merge branch '3.2.x' into 3.3.x
Closes gh-41448
2024-07-11 13:16:59 +01:00
Andy Wilkinson 8bc45a20d7 Polish "Fix typos in BootstrapContext javadoc"
See gh-41443
2024-07-11 13:16:38 +01:00
John Blum 47fc9111cb Fix typos in BootstrapContext javadoc
See gh-41443
2024-07-11 13:16:10 +01:00
Andy Wilkinson 870739955b Polish "Group Kafka back-off properties"
See gh-41335
2024-07-11 13:09:39 +01:00
Travis Riegler 14c9893371 Group Kafka back-off properties
Kafka back-off policy properties "delay", "max-delay", "multiplier",
and "random-back-off" are now defined in a common "backoff" group:

- spring.kafka.retry.topic.backoff.delay
- spring.kafka.retry.topic.backoff.maxDelay
- spring.kafka.retry.topic.backoff.multiplier
- spring.kafka.retry.topic.backoff.random

See gh-41335
2024-07-11 13:09:39 +01:00
Andy Wilkinson d07fe47102 Merge branch '3.3.x'
Closes gh-41447
2024-07-11 13:09:26 +01:00
Andy Wilkinson 784c8d2df4 Avoid duplicate junit-platform.properties files caused by Kafka
Gradle doesn't support excluding a dependency that's declared with a
classifier. Instead, this commit replaces the test-qualified
kafka-server-common dependency with the plain dependency. The plain
dependency was already present so this is equivalent to excluding
the test-qualified dependency.

Closes gh-41446
2024-07-11 13:08:58 +01:00
Scott Frederick 09c0714730 Register ProtocolResolvers with the application context by default
Any ProtocolResolvers that are registered in a spring.factories file
will be added to the application context using an
ApplicationContextInitializer.

Closes gh-41433
2024-07-10 15:29:29 -05:00
Andy Wilkinson a349170073 Upgrade to Reactor Bom 2024.0.0-M4
Closes gh-41438
2024-07-10 14:34:34 +01:00
Andy Wilkinson 2f962f7aa3 Upgrade to Reactor Bom 2023.0.8
Closes gh-41436
2024-07-10 14:24:49 +01:00
Andy Wilkinson d9cebc4b17 Stop BaggagePropagationIntegrationTests from being flaky
Depending on what tests had already run, Otel tests in
BaggagePropagationIntegrationTests could fail due to missing baggage
related entries in the MDC. The entries were missing if Otel's
ContextStorageWrappers had been marked as initialized without an
EventPublishingContextWrapper containing event publisher that will
publish to Slf4JBaggageEventListener.

ContextStorageWrappers uses a static so this commit avoids to problem
by forking a new classpath in BaggagePropagationIntegrationTests. This
ensures that any previous static state in ContextStorageWrappers has
no effect upon BaggagePropagationIntegrationTests.
2024-07-10 14:10:43 +01:00
Andy Wilkinson 375b3b16a0 Remove APIs that were deprecated for removal in 3.4.0
Closes gh-41435
2024-07-10 13:31:21 +01:00
Andy Wilkinson 6cb35f7209 Adapt to changes in Oracle Database 23.4.0.24.05
See gh-41147
2024-07-09 18:48:31 +01:00
Andy Wilkinson 17f2c31ef7 Revert "Upgrade to Elasticsearch Client 8.14.2"
This reverts commit 12d2eba796.

See gh-41405
2024-07-09 18:07:01 +01:00
Andy Wilkinson 8f2f0f2abc Upgrade to Oracle Database 23.4.0.24.05
Closes gh-41147
2024-07-09 16:19:25 +01:00
Andy Wilkinson ac87dab7dd Upgrade to XmlUnit2 2.10.0
Closes gh-41429
2024-07-09 16:07:08 +01:00
Andy Wilkinson 1d43ba11ed Upgrade to WebJars Locator Core 0.59
Closes gh-41428
2024-07-09 16:07:07 +01:00
Andy Wilkinson 323d0d18fe Upgrade to Versions Maven Plugin 2.17.0
Closes gh-41427
2024-07-09 16:07:07 +01:00
Andy Wilkinson 788ca87ccd Upgrade to SQLite JDBC 3.46.0.0
Closes gh-41426
2024-07-09 16:07:06 +01:00
Andy Wilkinson ede80f75b5 Upgrade to Selenium HtmlUnit 4.22.0
Closes gh-41425
2024-07-09 16:07:06 +01:00
Andy Wilkinson bbc9ee9346 Upgrade to Selenium 4.22.0
Closes gh-41424
2024-07-09 16:07:05 +01:00
Andy Wilkinson 09bf5bfde1 Upgrade to REST Assured 5.5.0
Closes gh-41423
2024-07-09 16:07:05 +01:00
Andy Wilkinson d28f5ba113 Upgrade to Reactor Bom 2024.0.0-M3
Closes gh-41422
2024-07-09 16:07:04 +01:00
Andy Wilkinson 922a1e9a03 Upgrade to Rabbit Stream Client 0.16.0
Closes gh-41421
2024-07-09 16:07:03 +01:00
Andy Wilkinson be0af2a358 Upgrade to MySQL 9.0.0
Closes gh-41420
2024-07-09 16:07:03 +01:00
Andy Wilkinson c849e91a42 Upgrade to Mockito 5.12.0
Closes gh-41419
2024-07-09 16:07:02 +01:00
Andy Wilkinson 1d65792f5c Upgrade to Maven Surefire Plugin 3.3.0
Closes gh-41418
2024-07-09 16:07:02 +01:00
Andy Wilkinson 894f4904dd Upgrade to Maven Shade Plugin 3.6.0
Closes gh-41417
2024-07-09 16:07:01 +01:00
Andy Wilkinson 73af98aa5e Upgrade to Maven Javadoc Plugin 3.7.0
Closes gh-41416
2024-07-09 16:07:01 +01:00
Andy Wilkinson b7b31d9ca7 Upgrade to Maven Invoker Plugin 3.7.0
Closes gh-41415
2024-07-09 16:07:00 +01:00
Andy Wilkinson e84ac94cad Upgrade to Maven Failsafe Plugin 3.3.0
Closes gh-41414
2024-07-09 16:07:00 +01:00
Andy Wilkinson 6dbb680974 Upgrade to Maven Enforcer Plugin 3.5.0
Closes gh-41413
2024-07-09 16:06:59 +01:00
Andy Wilkinson 7238ed9a1d Upgrade to Maven Dependency Plugin 3.7.1
Closes gh-41412
2024-07-09 16:06:59 +01:00
Andy Wilkinson ca8815a344 Upgrade to Maven Clean Plugin 3.4.0
Closes gh-41411
2024-07-09 16:06:59 +01:00
Andy Wilkinson b444ccb195 Upgrade to MariaDB 3.4.0
Closes gh-41410
2024-07-09 16:06:58 +01:00
Andy Wilkinson 8fd3a0b4d1 Upgrade to JBoss Logging 3.6.0.Final
Closes gh-41409
2024-07-09 16:06:58 +01:00
Andy Wilkinson e226abc398 Upgrade to HtmlUnit 4.3.0
Closes gh-41408
2024-07-09 16:06:57 +01:00
Andy Wilkinson e55a730ea0 Upgrade to Gson 2.11.0
Closes gh-41407
2024-07-09 16:06:57 +01:00