Commit Graph

4123 Commits

Author SHA1 Message Date
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
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
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
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
d28f5ba113 Upgrade to Reactor Bom 2024.0.0-M3
Closes gh-41422
2024-07-09 16:07:04 +01:00
Andy Wilkinson
11672b9bcd Upgrade to AssertJ 3.26.0
Closes gh-41401
2024-07-09 16:06:54 +01:00
Moritz Halbritter
ee8a706e1f Merge branch '3.3.x'
Closes gh-41317
2024-07-04 11:10:22 +02:00
Alexis Couvreur
47c8a859ea Support NestedConfigurationProperty for record types
Add ElementType.RECORD_COMPONENT to NestedConfigurationProperty and
implement isMarkedAsNested for RecordParameterPropertyDescriptor.

This will allow nested records to be properly harvested for their
properties.

See gh-41251
2024-07-04 10:58:51 +02:00
Moritz Halbritter
de001f5af1 Polish "Add standardized property to distinguish a group of applications"
See gh-39957
2024-07-03 11:54:49 +02:00
Jakob Wanger
8ddb77f628 Add standardized property to distinguish a group of applications
This adds a property to provide some indicator that a set of
applications are part of a larger "business application" so that they
can be viewed in metrics, portals, traces and more.

See gh-39957
2024-07-03 11:06:46 +02:00
Moritz Halbritter
cbce4940aa Polish "Add MemoryInfo to ProcessInfo"
See gh-41262
2024-07-03 09:34:09 +02:00
Jonatan Ivanov
38013b8e6d Add MemoryInfo to ProcessInfo
See gh-41262
2024-07-03 09:34:06 +02:00
Phillip Webb
00ed053ceb Merge branch '3.3.x'
Closes gh-41253
2024-06-26 16:27:56 -07:00
Phillip Webb
1a699aee24 Merge branch '3.2.x' into 3.3.x
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb
962936370a Don't report already migrated properties
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.

In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.

Fixes gh-35774
2024-06-26 16:24:32 -07:00
Phillip Webb
28e6af5652 Merge branch '3.3.x'
Closes gh-41237
2024-06-25 17:08:35 -07:00
Phillip Webb
a3377b0672 Merge branch '3.2.x' into 3.3.x
Closes gh-41236
2024-06-25 17:08:29 -07:00
Phillip Webb
8bcdb4b06b Improve error message when spring.config.import fails to resolve
Update `StandardConfigDataLocationResolver` to give a better error
message when a location cannot be resolved. Prior to this commit, a
location with a misspelling in the prefix would only give an error
about the file extension being not known.

Fixes gh-36243
2024-06-25 17:08:24 -07:00
Phillip Webb
fdf2f20bc2 Merge branch '3.3.x'
Closes gh-41226
2024-06-24 16:05:01 -07:00
Phillip Webb
6d0c68f9f6 Merge branch '3.2.x' into 3.3.x
Closes gh-41225
2024-06-24 16:04:51 -07:00
Andy Wilkinson
98c11bb5df Use consistent current thread context classloader for initialization
Ensure `Thread.currentThread().getContextClassLoader()` returns the same
classloader for all types of initialization.

Prior to this commit, `JettyEmbeddedWebAppContext` would return a
different classloader when initializing Servlet and Filter classes. This
was due to the fact that our `deferredInitialize()` method has called
outside of a `getContext().call(...)`.

Fixes gh-37649

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-24 16:03:00 -07:00
Andy Wilkinson
37879d86be Test that TestBean can override a ConfigurationProperties bean
Closes gh-33969
2024-06-24 18:48:23 +01:00
Andy Wilkinson
7701201bc3 Align cascading of config prop validation with bean validation spec
Closes gh-40345
2024-06-21 12:27:22 +01:00
Stéphane Nicoll
2053e13c09 Adapt to new Placeholder resolution API
See gh-41177
2024-06-20 20:18:07 +01:00
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb
705aad4b31 Merge branch '3.2.x'
Closes gh-41152
2024-06-18 17:01:22 -07:00
Phillip Webb
242263d8d4 Update GitProperties date/time coercion to deal with more patterns
Update `GitProperties` to deal with updated date/time patterns that
are now used by the `git-commit-id` maven plugin. Previous patterns are
still supported as a fallback.

Fixes gh-41109
2024-06-18 17:01:03 -07:00
Phillip Webb
8a9feb0bb6 Merge branch '3.2.x'
Closes gh-41141
2024-06-17 16:51:53 -07:00
Phillip Webb
60b7e6cf23 Allow 'status' and 'error' to be excluded from error response
Update `ErrorAttributeOptions` to allow the `status` and `error`
fields to be excluded from the response without throwing a
NullPointerException.

Fixes gh-30011
2024-06-17 16:48:28 -07:00
Phillip Webb
df087fad9e Merge branch '3.2.x'
Closes gh-41108
2024-06-14 11:03:13 -07:00
Phillip Webb
96586525d5 Make DelegatingFilterProxyRegistrationBeanTests idempotent
Fixes gh-38630
2024-06-14 11:03:09 -07:00
Andy Wilkinson
9817ff5622 Prevent double-processing of <include>s when using AOT
Fixes gh-41081
2024-06-12 20:20:12 +01:00
Phillip Webb
147240aa0c Merge branch '3.2.x'
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2 Polish "Use method references when possible in test code"
See gh-40974
2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c Use method references when possible in test code
See gh-40974
2024-06-11 12:58:00 -07:00
Phillip Webb
41c93c53e5 Merge branch '3.2.x'
Closes gh-41079
2024-06-11 12:31:43 -07:00
Ahmed Ashour
4f6509d5ff Prevent unnecessary unboxing
See gh-40985
2024-06-11 12:24:13 -07:00
Ahmed Ashour
623c395c0c Remove redundant cast
See gh-40985
2024-06-11 12:24:13 -07:00
Phillip Webb
255bcc28e6 Merge branch '3.2.x'
Closes gh-41077
2024-06-11 10:48:52 -07:00
Phillip Webb
ecc9a2352d Polish "Use constructor rather than Collection.addAll"
See gh-41053
2024-06-11 10:02:27 -07:00
Piyal Ahmed
17adcfc180 Use constructor rather than Collection.addAll
See gh-41053
2024-06-11 09:39:45 -07:00
Andy Wilkinson
781d7b0394 Merge branch '3.2.x'
Closes gh-41010
2024-06-07 13:08:34 +01:00
Andy Wilkinson
fe536bf075 Allow SSL to be used with Tomcat's Http11Nio2Protocol
Fixes gh-41007
2024-06-07 12:46:19 +01:00
Andy Wilkinson
45f09df7fe Merge branch '3.2.x'
Closes gh-40996
2024-06-05 14:27:16 +01:00
Andy Wilkinson
d4e9f458a3 Fix path handling and wrapping in LoaderHidingResource
Closes gh-39472
2024-06-05 12:33:21 +01:00