Commit Graph

852 Commits

Author SHA1 Message Date
Phillip Webb
736ff7e3e2 Merge branch '3.4.x' 2025-04-28 12:20:19 -07:00
Phillip Webb
f172c2ca8f Merge branch '3.3.x' into 3.4.x 2025-04-28 12:20:08 -07:00
Phillip Webb
b2e691be02 Update copyright year of changed files 2025-04-28 12:20:02 -07:00
Phillip Webb
ba690d24d4 Merge branch '3.4.x' 2025-04-28 12:18:40 -07:00
Phillip Webb
708062ec1d Merge branch '3.3.x' into 3.4.x 2025-04-28 12:15:47 -07:00
Phillip Webb
428fa6d941 Fix copyright headers to consistently start with project inception year 2025-04-28 12:15:32 -07:00
Phillip Webb
848494d61c Polish 'Introduce 'spring.test.print-condition-evaluation-report' property'
See gh-45268
2025-04-24 22:14:59 -07:00
Dmytro Nosan
4ea54dae85 Introduce 'spring.test.print-condition-evaluation-report' property
Add the `spring.test.print-condition-evaluation-report` property
to enable or disable the conditional evaluation report
when ApplicationContext fails to start.

See gh-45268

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-04-24 22:14:20 -07:00
Andy Wilkinson
231396e6ba Restructure OAuth2 client auto-configuration
Previously, OAuth2 client auto-configuration was managed by a single
class:

- OAuth2ClientAutoConfiguration for servlet apps
- ReactiveOAuth2ClientAutoConfiguration for reactive apps

OAuth2ClientAutoConfiguration being for servlet apps meant that
a blocking OAuth2 client was not availabile in a non-web application.

The auto-configuration classes did two things:

- Auto-configured beans that are specific to server-side web security
  that uses an OAuth2 client
- Auto-configured OAuth2 client beans that may be used client- or
  server-side

Combining these two things into a single auto-configuration class
meant that you could not choose to use one or the other. For example,
you may want to make use of an OAuth2 client in a web application
without also using OAuth2 client-based web security.

This commit restructures the auto-configuration to address these
problems. There are now two auto-configurations for non-reactive apps:

- OAuth2ClientAutoConfiguration
- OAuth2ClientWebSecurityAutoConfiguration

and two auto-configurations for reactive apps:

- ReactiveOAuth2ClientAutoConfiguration
- ReactiveOAuth2ClientWebSecurityAutoConfiguration

This separation allows one to be used without the other. Furthermore,
the conditions have been updated so that, for example, the blocking
OAuth2 client is available in a non-web application.

Closes gh-40997
Closes gh-44906

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2025-04-22 15:31:35 +01:00
Phillip Webb
4bbbc0d687 Merge branch '3.4.x'
Closes gh-45193
2025-04-14 16:18:50 -07:00
Phillip Webb
b80bdbb182 Merge branch '3.3.x' into 3.4.x
Closes gh-45192
2025-04-14 16:18:41 -07:00
Johnny Lim
08c67cc353 Replace deprecated Project.task()
See gh-45009

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-04-14 16:17:53 -07:00
DimaVilda
31daa0f0d6 Remove unnecessary excludes on javax.xml.bind:jaxb-api
See gh-45025

Signed-off-by: DimaVilda <dimavilda@gmail.com>
2025-04-08 11:42:34 -07:00
Phillip Webb
39ef5ae2d5 Merge branch '3.4.x' 2025-04-03 18:06:48 -07:00
Phillip Webb
fc9937d05a Merge branch '3.3.x' into 3.4.x 2025-04-03 18:06:33 -07:00
Phillip Webb
88e8c17369 Update copyright year of changed files 2025-04-03 18:06:14 -07:00
Phillip Webb
bc91c35644 Merge branch '3.4.x'
Closes gh-44993
2025-04-03 18:05:13 -07:00
Phillip Webb
c96835bc9d Merge branch '3.3.x' into 3.4.x
Closes gh-44992
2025-04-03 18:02:57 -07:00
Phillip Webb
f2d367a130 Update 'for removal in' comments since 3.5 will be the last 3.x release
Closes gh-44959
2025-04-03 17:52:22 -07:00
Phillip Webb
951e7abfbc Merge branch '3.4.x' 2025-03-14 17:24:51 -07:00
Brian Clozel
83f678a8b1 Separate transports in GraphQL auto-configurations
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.

Closes gh-44495
2025-02-28 18:12:31 +01:00
Stéphane Nicoll
11cdc63560 Merge branch '3.4.x'
Closes gh-44408
2025-02-22 18:56:42 +01:00
Stéphane Nicoll
2c4ea4c749 Merge branch '3.3.x' into 3.4.x
Closes gh-44407
2025-02-22 18:56:34 +01:00
Stéphane Nicoll
2a94ee1586 Polish contribution
See gh-44348
2025-02-22 18:53:51 +01:00
Bernie Schelberg
b9438bef9e Consider properties on outer class in nested @DataJpaTest tests
See gh-44348

Signed-off-by: Bernie Schelberg <bernard.schelberg@invicara.com>
2025-02-22 18:53:39 +01:00
Phillip Webb
8ec61b9870 Polish 'Refactor @ConfigurationProperties that only use prefix'
See gh-43917
2025-01-24 14:59:32 -08:00
Yanming Zhou
c1d97ffe16 Refactor @ConfigurationProperties that only use prefix
See gh-43917

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 14:58:36 -08:00
Andy Wilkinson
1e43b0003f Merge branch '3.4.x'
Closes gh-43951
2025-01-24 08:54:50 +00:00
Andy Wilkinson
c7b54dcbb3 Merge branch '3.3.x' into 3.4.x
Closes gh-43950
2025-01-24 08:53:03 +00:00
Yanming Zhou
960c8825e0 Replace @ConditionalOnProperty with …BooleanProperty where feasible
See gh-43868

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:08:26 +00:00
Andy Wilkinson
2f29a49a1d Remove APIs deprecated for removal in 3.5
Closes gh-43788
2025-01-14 13:59:24 +00:00
Phillip Webb
a49719d73e Use consistent exception messages in Assert calls
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
2025-01-11 21:18:47 -08:00
Phillip Webb
86b6171edc Introduce dedicated annotations to deal with boolean properties
Add `@ConditionalOnBooleanProperty` annotation to deal with
boolean properties and primarily for features that users toggle
using `.enabled` properties.

Closes gh-43704
2025-01-08 13:26:11 -08:00
Phillip Webb
170ff4eb23 Update copyright year of changed files 2025-01-06 17:40:24 -08:00
Phillip Webb
4c307d6fda Switch away from using @ConditionalOnProperty prefix
Merge `prefix` into `name` attribute and simplify annotations
where possible.

Closes gh-43703
2025-01-06 14:37:18 -08:00
Johnny Lim
4d15ee5bf0 Polish
See gh-43498
2024-12-13 13:29:20 -08:00
Andy Wilkinson
1e8b23e300 Merge branch '3.3.x'
Closes gh-43072
2024-11-08 11:04:29 +00:00
Andy Wilkinson
1ae9b8ea1b Merge branch '3.2.x' into 3.3.x
Closes gh-43071
2024-11-08 10:55:52 +00:00
Andy Wilkinson
5d63335a5c Polish "Use constants for well-known scope names"
See gh-43065
2024-11-08 10:53:11 +00:00
Yanming Zhou
03841b1229 Use constants for well-known scope names
See gh-43065
2024-11-08 10:01:19 +00:00
Phillip Webb
23607ee4c4 Add nullSafeValue method that accepts a mapper Function
Update `JsonObjectDeserializer` with a `nullSafeValue` method that
accepts a mapper `Function`

Closes gh-42972
2024-11-01 14:08:43 -07:00
Tran Ngoc Nhan
fcbf6b0200 Polish
See gh-42798
2024-10-21 13:23:42 +02:00
Phillip Webb
2f5f224559 Merge branch '3.3.x' 2024-10-18 10:49:15 -07:00
Phillip Webb
223886ff37 Merge branch '3.2.x' into 3.3.x 2024-10-18 10:48:51 -07:00
Phillip Webb
3481107ff7 Update copyright year of changed files 2024-10-18 10:48:29 -07:00
Phillip Webb
168d82e138 Polish 2024-10-18 10:47:52 -07:00
Andy Wilkinson
dcc88cb512 Merge branch '3.3.x'
Closes gh-42786
2024-10-18 15:03:16 +01:00
Andy Wilkinson
34eade32d7 Merge branch '3.2.x' into 3.3.x
Closes gh-42785
2024-10-18 15:02:18 +01:00
Andy Wilkinson
1020793198 Output condition evaluation report when app under test fails to start
Closes gh-42185
2024-10-18 14:52:47 +01:00
Moritz Halbritter
ba1a780147 Merge branch '3.3.x'
Closes gh-42774
2024-10-17 18:06:43 +02:00