Commit Graph

3554 Commits

Author SHA1 Message Date
Andy Wilkinson
b7099094b9 Merge branch '3.0.x' into 3.1.x
Closes gh-36268
2023-07-06 19:42:47 +01:00
Andy Wilkinson
4d70b83e80 Improve javadoc of ClientHttpRequestFactories
Closes gh-36267
2023-07-06 19:42:17 +01:00
Andy Wilkinson
ffad1b1dca Merge branch '3.0.x' into 3.1.x
Closes gh-36145
2023-06-30 14:47:34 +01:00
Andy Wilkinson
70406452df Merge branch '2.7.x' into 3.0.x
Closes gh-36144
2023-06-30 14:47:20 +01:00
Andy Wilkinson
b06e7e60f9 Polish "Fix asymmetry of equals when element has trailing dashes"
See gh-34804
2023-06-30 14:38:31 +01:00
Eyðun Nielsen
a86429a62a Fix asymmetry of equals when element has trailing dashes
See gh-34804
2023-06-30 14:37:47 +01:00
Scott Frederick
0a51c466f4 Merge branch '3.0.x' into 3.1.x
Closes gh-36123
2023-06-29 16:54:45 -06:00
Scott Frederick
884489e73a Apply system properties to RestTemplate HttpClient
Fixes gh-35815
2023-06-29 16:31:09 -06:00
Andy Wilkinson
28af839dff Merge branch '3.0.x' into 3.1.x
Closes gh-36097
2023-06-27 20:13:57 +01:00
Andy Wilkinson
b3c321e40c Polish javadoc of RestTemplateBuilder.requestFactory(Function)
Closes gh-36046
2023-06-27 20:13:11 +01:00
Andy Wilkinson
a1a336ddd8 Merge branch '3.0.x' into 3.1.x
Closes gh-36095
2023-06-27 20:08:39 +01:00
Andy Wilkinson
b2bc114d6f Update javadoc to link to non-deprecated ConstructorBinding
Closes gh-36045
2023-06-27 20:08:03 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Phillip Webb
31f218c4e0 Merge branch '3.0.x' into 3.1.x 2023-06-22 00:27:51 -07:00
Phillip Webb
9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Andy Wilkinson
b770ffc160 Fully prepare connection when using SSL bundle
Fixes gh-36007
2023-06-21 19:05:44 +01:00
Phillip Webb
5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Phillip Webb
0fd1c89889 Polish 2023-06-16 13:53:33 -07:00
Phillip Webb
691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Sébastien Deleuze
db8dee5aac Refine SpringApplication.Augmented.with Kotlin extension
This commit allows to specify multiple Kotlin classes.

See gh-35784
2023-06-16 14:22:18 +02:00
Andy Wilkinson
1652c27b3c Apply additional sources once when using SpringApplication.from()
Previously, when using SpringApplication.from() any additional
sources configured using with() would be applied to every
SpringApplication that was created within the scope of the call to
run(). This caused problems with Spring Cloud's bootstrap context
where the additional sources would be applied to both the user's
application and to the boostrap context's application.

This commit updates the hook that's used to apply the additional
sources so that it's only applied once. This results in the
additional sources only being added to the first SpringApplication
that is run.

Closes gh-35873
2023-06-16 10:39:20 +01:00
Phillip Webb
c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
2023-06-15 14:26:55 -07:00
Phillip Webb
4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb
137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Andy Wilkinson
3d9a308053 Merge branch '3.0.x' into 3.1.x
Closes gh-35913
2023-06-15 15:50:07 +01:00
Andy Wilkinson
eeea065595 Merge branch '2.7.x' into 3.0.x
Closes gh-35912
2023-06-15 15:49:36 +01:00
Andy Wilkinson
e779fb0bc4 Validate constructor bound config props that implement Validator
Closes gh-33669
2023-06-15 15:29:20 +01:00
Scott Frederick
767ec4e22e Support encrypted PKCS8 private keys in SSL bundles
Properties `ssl.bundle.pem.mybundle.keystore.private-key-password`
and `ssl.bundle.pem.mybundle.truststore.private-key-password` have
been added for configuring the password required to decrypt an
encrypted private key.

Only PKCS8 private keys with encryption are supported. PKCS1 and EC
private keys with encryption are much more complex to decrypt, and
are not supported.

Fixes gh-35652
2023-06-09 11:52:36 -05:00
Moritz Halbritter
49597db77d Merge branch '3.0.x'
Closes gh-35764
2023-06-07 08:28:03 +02:00
Moritz Halbritter
9149fc3e77 Merge branch '2.7.x' into 3.0.x
Closes gh-35763
2023-06-07 08:27:19 +02:00
Moritz Halbritter
2927d50d18 Add JavaVersion.TWENTY
Closes gh-35758
2023-06-07 08:23:05 +02:00
Andy Wilkinson
036b982dd7 Start building against Spring Framework 6.0.10 snapshots
This reverts commit bc63c511 as Framework's previous behavior has
been restored.

See gh-35751
2023-06-06 07:36:37 +01:00
Phillip Webb
1669b81af7 Add 'fromApplication' and 'with' Kotlin extension functions
Update `SpringApplicationExtensions.kt` with `fromApplication` and
`with` functions that make `SpringApplication.from(...)` easier to use
with Kotlin.

Fixes gh-35756
2023-06-05 21:49:41 -07:00
Phillip Webb
ff35ed4be1 Merge branch '3.0.x' 2023-06-05 17:18:18 -07:00
Phillip Webb
f641ce037d Merge branch '2.7.x' into 3.0.x 2023-06-05 17:17:33 -07:00
Phillip Webb
4eda5bd36f Polish 2023-06-05 17:17:07 -07:00
Andy Wilkinson
22e8a41efa Start building against Spring Framework 6.0.10 snapshots
This reverts commit 9d56b419 as Framework's previous behavior has
been restored.

See gh-35739
2023-06-05 20:02:43 +01:00
Andy Wilkinson
f0c40a469b Merge branch '3.0.x'
Closes gh-35654
2023-05-26 18:13:14 +01:00
Andy Wilkinson
a58e98af05 Fix binding to constructor bound lateinit properties
Closes gh-35603
2023-05-26 18:12:21 +01:00
Andy Wilkinson
127004b4c5 Merge branch '3.0.x'
Closes gh-35647
2023-05-26 10:29:53 +01:00
Andy Wilkinson
5ad0d49ec1 Fix hints for @Bean config props that could be constructor bound
Previously, if a `@ConfigurationProperties`-annotated `@Bean` method
returned a type that looked like it could be constructor bound, the
registered runtime hints were incorrect. With only the bean's class
to work with, the hints registrar would incorrectly determine that
the type would be constructor bound and would not register the hints
required for Java bean binding.

This commit updates the registrar to allow the caller to provide a
Bindable which knows both what should be bound and how it should be
bound, thereby allowing the registrar to generate the correct hints.
The tests for the AOT processor have also been updated to remove
duplication of the tests in BindableRuntimeHintsRegistrarTests and
to focus on the contribution creating Bindable instances with the
bind method that is required to produce the correct reflection hints.

Closes gh-35564

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-05-26 10:28:49 +01:00
Andy Wilkinson
1d2a41fd1a Merge branch '3.0.x'
Closes gh-35646
2023-05-26 09:41:55 +01:00
Andy Wilkinson
eb60cf4988 Remove duplication of BindableRuntimeHintsRegistrarTests
There were several tests in CPBFIAPT that were duplicating tests in
BindableRuntimeHintsRegistrarTests. To test the AOT processor, all
that is really necessary is to assert that the expected types are
found and passed to BindableRuntimeHintsRegistrar. The tests for
BindableRuntimeHintsRegistrar are then responsible for asserting
that the expected hints are generated for the various different
types.

Closes gh-35645
2023-05-26 09:41:09 +01:00