7ee1622995
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35172
2023-04-26 12:48:16 +01:00
6b9bc012a5
Check that BPP and BFPP bean methods won't cause eager initialization
...
Closes gh-35164
2023-04-26 11:47:03 +01:00
b5c9e7c06a
Polish SslOptions usage
...
Add helper method and tighten usage so that exceptions are thrown when
options cannot be applied.
See gh-34814
2023-04-25 22:39:47 -07:00
d55cd3b46f
Merge branch '3.0.x'
...
Closes gh-35160
2023-04-25 11:26:31 +02:00
b286e5a0bb
Prevent ServletComponentScan to run again with AOT
...
Closes gh-34563
2023-04-25 11:20:14 +02:00
e0b03661d4
Merge branch '3.0.x'
2023-04-24 17:16:52 -07:00
8a43710173
Merge branch '2.7.x' into 3.0.x
2023-04-24 17:16:43 -07:00
a707c5e83e
Polish "Fix support for default values in banner placeholders"
...
Reorder methods and add a test to ensure that getPropertyResolvers
can be mutated.
See gh-34764
2023-04-24 17:15:56 -07:00
c59c8cc674
Change SslOptions to use null for defaults rather than empty sets
...
Update `SslOptions` so that `null` is used for default values rather
than empty sets. Most libraries use `null` to indicate defaults so
aligning our class makes things easier.
See gh-34814
2023-04-21 16:18:44 -07:00
77c468c956
Add test to check SSL RestTemplate requests work against server
...
Add a test to `AbstractClientHttpRequestFactoriesTests` to ensure
that SSL configuration works when calling a real Tomcat server.
See gh-34810
2023-04-21 14:06:55 -07:00
72c1f667f5
Fix @Since javadoc in RestTemplateBuilder
...
See gh-34810
2023-04-21 14:06:46 -07:00
b6befd133c
Add SSL bundle support to RestTemplateBuilder auto-configuration
...
Update RestTemplateBuilder auto-configuration so that an SSL can be
configured via an SSL bundle.
Closes gh-34810
2023-04-21 01:13:10 -07:00
66db13b962
Refactor web server support to use SslBundles
...
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.
See gh-34814
2023-04-21 01:02:47 -07:00
e3677f7ff6
Add SSL bundle support to spring-boot module
...
Add classes to support SSL bundles which can be used to apply SSL
settings in a centralized way. An `SslBundle` can be registered with
an `SslBundleRegistry` and obtained from an `SslBundles` instance. The
`DefaultSslBundleRegistry` provides a default in-memory implementation.
Different client libraries often configure SSL in slightly different
ways. To accommodate this, the `SslBundle` provides a layered approach
of obtaining SSL information:
- `getStores` provides access to the key store and trust stores
as well as any required key store password.
- `getManagers` provides access to the `KeyManagerFactory`,
`TrustManagerFactory` as well as the `KeyManger` and
`TrustManager` arrays that they create.
- `createSslContext` provides a convenient way to obtain a new
`SSLContext` instance.
In addition, the `SslBundle` also provides details about the key being
used, the protocol to use and any options that should be applied to the
SSL engine.
See gh-34814
2023-04-21 01:01:11 -07:00
26c98eded9
Upgrade to Tomcat 10.1.8
...
Closes gh-35095
2023-04-20 12:22:54 +01:00
b80f4cc985
Upgrade to Tomcat 10.1.8
...
Closes gh-35089
2023-04-20 09:54:24 +01:00
28b7c583a9
Ensure shutdown hook is registered when a handler is added
...
Closes gh-34627
2023-04-18 18:20:14 +01:00
7728488541
Allow LogLevel to be used easily with commons logging
...
Add a `LogLevel.log` method that can be used to log a message at
the given level using commons logging.
Closes gh-35024
2023-04-17 01:00:34 -07:00
842e17eced
Add Docker Compose support
...
Add `spring-boot-docker-compose` module with service connection
support.
Closes gh-34747
Co-authored-by: Phillip Webb <pwebb@vmware.com>
Co-authored-by: "Andy Wilkinson <wilkinsona@vmware.com>
2023-04-17 01:00:08 -07:00
e2262284f1
Add SpringApplication.from(...) support
...
Add a `SpringApplication.from(...)` method which can be used
to augment an existing application with addition `@Configuration`.
Closes gh-35019
2023-04-17 00:47:59 -07:00
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
7fea4c84b4
Update copyright year of changed files
2023-04-12 22:16:07 -07:00
0806743966
Merge branch '3.0.x'
...
Closes gh-34935
2023-04-11 15:46:03 +02:00
7ee55817b3
Update copyright header of changed file
...
See gh-34868
2023-04-11 15:39:20 +02:00
6728a08219
Use banner location constant
...
See gh-34868
2023-04-11 15:39:00 +02:00
6cf08a36da
Polish "Add support for additional colors in Log4j2 and Logback"
...
See gh-34749
2023-04-05 15:00:12 +02:00
35994bbd74
Add support for additional colors in Log4j2 and Logback
...
See gh-34749
2023-04-05 14:49:03 +02:00
cd5d923910
Merge branch '3.0.x'
...
Closes gh-34793
2023-03-28 10:22:12 +01:00
b2e6db544b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34792
2023-03-28 10:21:47 +01:00
2d280bb967
Polish "Fix support for default values in banner placeholders"
...
See gh-34764
2023-03-28 09:57:22 +01:00
5c01aa719c
Fix support for default values in banner placeholders
...
See gh-34764
2023-03-28 09:53:52 +01:00
c0f59a1f61
Merge branch '3.0.x'
2023-03-23 23:04:35 -07:00
d3cdaf9d01
Merge branch '2.7.x' into 3.0.x
2023-03-23 23:04:01 -07:00
dcb4f3cf97
Polish
2023-03-23 23:03:46 -07:00
3dbc3a1943
Merge branch '3.0.x'
2023-03-23 23:01:32 -07:00
b6777524f7
Merge branch '2.7.x' into 3.0.x
2023-03-23 23:00:50 -07:00
bece347987
Polish
2023-03-23 22:59:26 -07:00
f13d6e6862
Revert "Merge pull request #33643 from libetl"
...
This reverts commit 25e8f2d575e5bc9a2fcb
2023-03-23 13:39:54 +00:00
73ee97b095
Upgrade to Logback 1.4.6
...
This commit includes a change to stop using an API in Logback that
has been deprecated without replacement. As Logback now only supports
.xml configuration files, it would only ever have thrown an
exception. The call to the API has been replaced with thrown an
exception directly.
Closes gh-34686
2023-03-21 12:04:35 +00:00
f6add35f8b
Upgrade to Tomcat 10.1.7
...
Closes gh-34674
2023-03-21 10:07:21 +00:00
6fdc6fa619
Upgrade to Logback 1.4.6
...
This commit includes a change to stop using an API in Logback that
has been deprecated without replacement. As Logback now only supports
.xml configuration files, it would only ever have thrown an
exception. The call to the API has been replaced with thrown an
exception directly.
Closes gh-34670
2023-03-21 09:36:31 +00:00
4be288f672
Upgrade to Tomcat 9.0.73
...
Closes gh-34655
2023-03-20 21:07:57 +00:00
7f5dc1cde5
Merge branch '3.0.x'
...
Closes gh-34618
2023-03-15 15:10:01 -07:00
dcb41b03a0
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34617
2023-03-15 15:09:44 -07:00
aea57fbd41
Consider the underling file in equals/hashcode
...
Update `StandardConfigDataResource` so that the underlying file is
considered in equals/hashcode. Prior to this commit, if the classpath
included `.` then the same resource could be loaded twice. Once via
a `ClassPathResource` and once via a `FileSystemResource`.
Fixes gh-34212
2023-03-15 13:52:10 -07:00
837ea04cd1
Merge branch '3.0.x'
...
Closes gh-34611
2023-03-14 18:04:39 -07:00
5d21c3616f
Don't treat Kotlin data classes as immutable
...
Unlike records, Kotlin data classes are mutable and so we can't apply
the same constructor detection logic.
Fixes gh-34500
2023-03-14 18:03:15 -07:00
daba3ce52b
Upgrade to Tomcat 10.1.7
...
Closes gh-34582
2023-03-10 19:32:15 +00:00
656a309ea0
Merge branch '3.0.x'
...
Closes gh-34516
2023-03-08 17:42:12 +00:00
3945c48290
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34515
2023-03-08 17:28:10 +00:00
86c988d653
Improve compatibility with SnakeYAML 2.0
...
Closes gh-34405
2023-03-08 17:25:42 +00:00
9f0108496c
Consolidate web server SSL configuration
2023-03-01 16:54:09 -06:00
944862389b
Merge branch '3.0.x'
...
Closes gh-34420
2023-03-01 12:51:23 +01:00
7ea56a2fdb
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34419
2023-03-01 12:51:15 +01:00
277784b17d
Update logger to use GracefulShutdown.class
...
See gh-34220
2023-03-01 12:50:31 +01:00
a7f2be8b14
Merge branch '3.0.x'
...
Closes gh-34411
2023-02-28 14:59:33 -08:00
285097d746
Bind nested record types even if they have an existing value
...
Update logic in `DefaultBindConstructorProvider` introduced in commit
84b13f0748
2023-02-28 14:55:43 -08:00
e21c9090b1
Merge branch '3.0.x'
...
Closes gh-34375
2023-02-24 16:11:40 +00:00
72de4a8937
Use ResourceLoader's ClassLoader to load ConfigDataLoaders
...
Fixes gh-34372
2023-02-24 16:10:49 +00:00
b20b5edf2a
Polish
2023-02-23 13:00:30 -08:00
982e922c0b
Fix formatting
2023-02-23 16:58:03 +00:00
2c0c89454c
Upgrade to Log4j2 2.20.0
...
Closes gh-34349
2023-02-23 16:50:05 +00:00
157091a811
Merge branch '3.0.x'
2023-02-22 18:36:57 -08:00
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
c0cf81dbf0
Merge branch '3.0.x'
2023-02-22 12:40:38 -08:00
1132b5e8a5
Merge branch '2.7.x' into 3.0.x
2023-02-22 12:40:23 -08:00
b126c33195
Enable and fix ImportCandidatesTests
2023-02-22 12:39:00 -08:00
7aba96d132
Merge branch '3.0.x'
...
Closes gh-34341
2023-02-22 19:49:14 +00:00
31b1c3e8ad
Replace property placeholders in Logback component class names
...
Closes gh-34336
2023-02-22 19:47:41 +00:00
eddee5321f
Merge branch '3.0.x'
2023-02-22 00:50:29 -08:00
e04c09ceae
Merge branch '2.7.x' into 3.0.x
2023-02-22 00:50:18 -08:00
891ce3bd1b
Disable recently renamed tests
2023-02-22 00:49:23 -08:00
01e8c42c16
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:55:34 -08:00
bcfb250da2
Merge branch '3.0.x'
2023-02-21 23:52:02 -08:00
66016921c6
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:51:52 -08:00
3651ba348d
Fix checkstyle test violations
2023-02-21 23:49:56 -08:00
b07269a018
Merge branch '3.0.x'
2023-02-21 23:20:07 -08:00
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
7aa27e1167
Merge branch '3.0.x'
...
Closes gh-34320
2023-02-21 16:36:54 +00:00
bc19e398ba
Report Logback configuration errors when running in a native image
...
Closes gh-34315
2023-02-21 16:10:26 +00:00
0e67fbc855
Merge branch '3.0.x'
...
Closes gh-34174
2023-02-13 14:50:48 +00:00
a0de59c209
Fix property binding to Kotlin data class in a native image
...
Fixes gh-34157
2023-02-13 14:49:04 +00:00
b0c376546d
Upgrade to MariaDB 3.1.2
...
Closes gh-34093
2023-02-06 14:46:07 +00:00
f595b46bd3
Upgrade to HttpClient5 5.2.1
...
Closes gh-34086
2023-02-06 14:46:05 +00:00
6ba5329a79
Allow different log level for FILE and CONSOLE appender
...
- java.util.logging isn't supported yet
See gh-32076
2023-01-31 14:31:51 +01:00
6d05cf3efb
Add Nomad to cloud platforms
...
See gh-32880
2023-01-31 14:11:08 +01:00
4f17a9cc9d
Allow JoranConfigurators to be passed ahead of time in logback
...
See gh-33643
2023-01-31 11:13:21 +01:00
23f1c896c9
Merge branch '3.0.x'
...
Closes gh-34015
2023-01-31 10:20:36 +01:00
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2023-01-31 10:20:06 +01:00
390892f11b
Merge branch '3.0.x'
...
Closes gh-33998
2023-01-26 21:45:57 -08:00
f4af93fb03
Use for loop rather than iterator
...
See gh-33987
2023-01-26 20:47:35 -08:00
55a50d565c
Use Comparator.comparing
...
See gh-33987
2023-01-26 20:47:34 -08:00
d3efd7e091
Use try with close
...
See gh-33987
2023-01-26 20:36:38 -08:00
0e68cae57f
Use instanceof patterns
...
See gh-33987
2023-01-26 20:36:25 -08:00
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
a4e7a8bae0
Use bean name for servlet and filter registrations if name is not set
...
If the name is set, it is used. If not, the bean name is used. If that's
not set, the convention based name is taken.
Registration failures now throw an IllegalStateException instead of
being logged. DynamicRegistrationBean.setIgnoreRegistrationFailure
can be used to restore the old behavior.
See gh-33911
2023-01-24 09:14:06 +01:00
0a50b83c75
Add DataSourceBuilderRuntimeHints
...
Add hints for DataSourceBuilderRuntime.
Closes gh-33692
2023-01-19 10:52:34 -08:00
ae79c60619
Remove instance suppliers in bean definitions
...
Remove instance suppliers in bean definitions and depend instead
on reflection. This allows the AOT engine to correctly process
the definitions.
Fixes gh-33763
2023-01-18 19:55:56 -08:00
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00
7c508fa324
Update copyright year of changed files
2023-01-18 15:37:58 -08:00
94f4a4396c
Merge branch '2.7.x'
...
Closes gh-33880
2023-01-18 17:35:52 +01:00
e8d809fe65
Replace 'via' with 'over' or 'through' in the documentation
...
Closes gh-33878
2023-01-18 16:56:42 +01:00
a2f593c15f
Merge branch '2.7.x'
...
Closes gh-33876
2023-01-18 14:02:56 +00:00
b5cebed120
Improve failure description when bean def has no resource description
...
Closes gh-33765
2023-01-18 13:52:56 +00:00
c939e27925
Only set AWT headless property if not already set
...
Closes gh-28803
2023-01-18 14:28:26 +01:00
fad88232b9
Update copyright year of changed files
2023-01-17 10:12:38 -08:00
a889c539ab
Merge branch '2.7.x'
2023-01-17 10:12:25 -08:00
a0fe8241a7
Update copyright year of changed files
2023-01-17 10:07:03 -08:00
47c1aa2724
Merge branch '2.7.x'
...
Closes gh-33771
2023-01-12 09:48:21 +01:00
d6f682da7e
Polish JavaBeanBinder
...
Closes gh-33762
2023-01-12 09:45:36 +01:00
e45b47565c
Use Threadlocal.remove instead of .set(null)
...
See https://github.com/spring-cloud/spring-cloud-sleuth/issues/27 for
reference.
2023-01-11 11:38:48 +01:00
84b13f0748
Refine constructor detection logic when binding to existing values
...
Update `DefaultBindConstructorProvider` so that deduced constructors
are not used if there is an existing value.
Prior to this commit, constructor detection logic was not compatible
with earlier versions of Spring Boot. With Spring Boot 3.0.1, given
a class of the following form:
@ConfigurationProperties(prefix = "example")
public class ExampleProperties {
@NestedConfigurationProperty
private final NestedProperty nested = new NestedProperty(
"Default", "default");
public NestedProperty getNested() {
return nested;
}
}
If `NestedProperty` has a single constructor with arguments, constructor
binding would be used. In Spring Boot 2.x, setter injection would have
been used.
The updated code now only uses constructor injection if an explicit
`@ConstructorBinding` annotation is present, or if there is no existing
value.
Fixes gh-33409
See gh-33710
2023-01-09 16:57:56 -08:00
a2ac38e203
Update copyright year of changed files
2023-01-09 15:46:07 -08:00
80cfcb71ec
Update copyright year of changed files
2023-01-09 15:18:10 -08:00
cf6493f65c
Simplify AssertJ assertions and also make them more readable
...
See gh-33653
2023-01-09 11:10:20 +01:00
2d95e4a31e
Fix JavaDoc typo in LocalServerPort
...
See gh-33683
2023-01-09 10:27:40 +01:00
2e90b71c30
Do not attempt constructor binding for items with an existing value
...
Update `DefaultBindConstructorProvider` so that it no longer detects
constructors when the `Bindable` has an existing value. This update
allows us change `ConfigurationPropertiesBindingPostProcessor` and
related classes so that all instances created from `@Bean` methods
are treated as `JAVA_BEAN` bindings and will not be accidentally
re-created using constructor binding.
Fixes gh-33710
2023-01-06 17:23:03 -08:00
f588793445
Update copyright year of changed files
2022-12-22 01:00:42 -08:00
0254619782
Merge branch '2.7.x'
2022-12-22 00:59:40 -08:00
e4772cf3b7
Update copyright year of changed files
2022-12-22 00:59:32 -08:00
2e7ca6f82d
Warning if <springProfile> is used in phase 2 model elements
...
Add `SpringProfileIfNestedWithinSecondPhaseElementSanityChecker` which
will provide a warning if `<springProfile>` is used within a phase 2
model element. This is similar to Logback's own `<if>` warnings.
The `LogbackLoggingSystem` has also been updated so that warning are
printed when present.
Fixes gh-33610
2022-12-22 00:57:59 -08:00
2ed512ddb5
Use model.deepMarkAsSkipped in SpringProfileModelHandler
...
Switch `model.markAsSkipped` to `model.deepMarkAsSkipped` in
`SpringProfileModelHandler`.
Although the current call doesn't appear to be causing issues,
it seems best to align our <springProfile> support with the way
that Logback implements its own `<if>` support.
Closes gh-33618
2022-12-22 00:54:06 -08:00
c257f2b1d2
Merge branch '2.7.x'
2022-12-21 11:37:41 -08:00
bc6fc33498
Polish
2022-12-21 10:16:25 -08:00
08659baeba
Polish away public modifier on tests
2022-12-16 16:08:44 +01:00
f36e2ecb7b
Use AutoClosables with try-with-resources
...
Closes gh-33538
2022-12-16 15:43:15 +01:00
725337f976
Make fields final
...
Closes gh-33537
2022-12-16 14:28:44 +01:00
47eb3b11b9
Upgrade Tomcat to 10.1.4
...
Closes gh-33167
Closes gh-33071
2022-12-12 11:19:30 +01:00
a4779b7859
Merge branch '2.7.x'
...
Closes gh-33433
2022-12-01 13:33:43 +01:00
16569099ba
Polish "Fix bug in webserver start when loading PKCS#11 KeyStore"
...
See gh-32179
2022-12-01 12:17:34 +01:00
716a839d54
Fix bug in webserver start when loading PKCS#11 KeyStore
...
See gh-32179
2022-12-01 11:53:51 +01:00
276b288891
Prevent repeat configuration of DB init bean dependencies
...
Fixes gh-33374
2022-11-30 12:36:24 +00:00
b3878e84ae
Fix bug where using a YAML with anchors couldn't be loaded
...
Closes gh-33404
2022-11-29 11:21:24 +01:00
c1dab0f9e6
Fix AOT processing of add method with array parameter in Logback model
...
Fixes gh-33387
2022-11-28 14:09:01 +00:00
b9e57c73b5
Consider Kotlin when checking if parameter names are available
...
See gh-33182
2022-11-17 12:05:16 +00:00
a50d1f0bd6
Switch to use BeanUtils.getPropertyDescriptors
...
Update `BindableRuntimeHintsRegistrar` to use
`BeanUtils.getPropertyDescriptors` rather than `BeanInfoFactory`.
Closes gh-33232
2022-11-16 16:28:08 -08:00
2e8d766889
Fix BindableRuntimeHintsRegistrarTests inner class to be static
2022-11-16 13:54:34 -08:00
d6151858f2
Merge pull request #32851 from tumit
...
* pr/32851:
Polish 'Add test for BindableRuntimeHintsRegistrar'
Add tests for BindableRuntimeHintsRegistrar
Closes gh-32851
2022-11-16 13:41:37 -08:00
13a4902018
Polish 'Add test for BindableRuntimeHintsRegistrar'
...
See gh-32851
2022-11-16 13:37:48 -08:00
7e424bdf0c
Add tests for BindableRuntimeHintsRegistrar
...
See gh-32851
2022-11-16 13:37:31 -08:00
421f2fac67
Fail fast when constructor bound and not compiled with -parameters
...
Closes gh-33182
2022-11-16 21:00:55 +00:00
f39b297677
Merge branch '2.7.x'
...
Closes gh-33227
2022-11-16 18:09:35 +00:00
04353e4961
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33226
2022-11-16 16:41:02 +00:00
d9a93a1514
Update copyright year of changed file
...
See gh-33108
2022-11-16 10:00:50 +01:00
6027508cf7
Polish
...
See gh-33108
2022-11-16 10:00:36 +01:00
28dd6b3215
Merge branch '2.7.x'
...
Closes gh-33212
2022-11-15 19:33:04 -08:00
e077060a1b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33211
2022-11-15 19:32:46 -08:00
46acb6fb97
Ignore bridge methods when binding java beans
...
Update `JavaBeanBinder` so that bridge methods are ignored when binding.
Fixes gh-33105
2022-11-15 19:31:06 -08:00
2baac78175
Only contribute hints for matching methods
...
Closes gh-33203
2022-11-15 16:56:09 +01:00
Andy Wilkinson
Phillip Webb
Stephane Nicoll
Scott Frederick
Mortitz Halbritter
kdomo
Abhijeet Mishra
Krzysztof Krason
1993heqiang
Yubao Liu
Luka Hartwig
lionel benychou
Johnny Lim
Kaveh Shamsi
cdanger
tumit