fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,541 Commits 22 Branches 339 Tags
Commit Graph

4533 Commits

Author SHA1 Message Date
Moritz Halbritter
f9a1eb000e Merge branch '3.1.x' 
Closes gh-38658
 2023-12-05 11:51:03 +01:00
Lars Uffmann
5981a3fd33 Build against UCP and JDBC driver for Oracle Database variant ucp11 
See gh-38654
 2023-12-05 11:40:35 +01:00
Brian Clozel
0321a8a05b Configure ObservationRegistry on JmsListener 
Prior to this commit, we set in gh-37388 the ObservationRegistry on the
auto-configured JmsTemplate bean. This enables observations and context
propagation when sending JMS messages.

This commit applies the same to the `DefaultJmsListenerContainerFactory`
and the `DefaultJmsListenerContainerFactoryConfigurer`, in order to
enable observations on `@JmsListener` annotated methods.

This commit also refactors the support implemented in gh-37388 to avoid
relying on a bean post processor and instead set the observation
registry directly in the main auto-configuration: while Micrometer core
is an actuator-only dependency, Micrometer Observation API is a compile
dependnecy for spring-jms itself and there is no need to separate
concerns there.

Fixes gh-38613
 2023-12-01 09:36:00 +01:00
Moritz Halbritter
fdbd65a2f5 Only apply awaitTerminationPeriod if awaitTermination is set 
See gh-38528
 2023-11-30 10:29:12 +01:00
Moritz Halbritter
6744cc2887 Apply awaitTerminationPeriod to SimpleAsyncTaskScheduler 
Closes gh-38530
 2023-11-30 10:25:33 +01:00
Moritz Halbritter
e454470bf9 Apply awaitTerminationPeriod to SimpleAsyncTaskExecutor 
Closes gh-38528
 2023-11-30 09:25:49 +01:00
Andy Wilkinson
3e4e59a8f0 Restore compatibility with Liquibase 4.23 
Closes gh-38522
 2023-11-28 17:41:47 +00:00
Johnny Lim
f9f73aa146 Polish 
See gh-38508
 2023-11-23 09:39:01 +01:00
Phillip Webb
9f031b04e5 Merge branch '3.1.x' 
Closes gh-38507
 2023-11-22 11:13:12 -08:00
Phillip Webb
bc504a8a03 Fix @ConditionalOnBean with annotation early FactoryBean initialization 
Update `OnBeanCondition` with a variant of `getBeanNamesForAnnotation`
that does not cause early `FactoryBean` initialization.

Fixes gh-38473
 2023-11-22 11:10:59 -08:00
Moritz Halbritter
b1da6f941f Merge branch '3.1.x' 2023-11-22 10:29:28 +01:00
Moritz Halbritter
eddb17473b Fix deprecation clause on MongoPropertiesClientSettingsBuilderCustomizer 2023-11-22 10:29:12 +01:00
Johnny Lim
175b6473c7 Polish 
See gh-38389
 2023-11-22 10:16:19 +01:00
Lars Uffmann
adb841c45e Update JobLauncherApplicationRunner to use getIdentifyingParameters 
See gh-38327
 2023-11-13 12:12:34 +01:00
Moritz Halbritter
c66322491d Merge branch '3.1.x' 
Closes gh-38339
 2023-11-13 11:50:57 +01:00
Moritz Halbritter
24cb05cb59 Merge branch '3.0.x' into 3.1.x 
Closes gh-38338
 2023-11-13 11:49:51 +01:00
Lars Uffmann
e41b36273f Remove unnecessary JobOperator bean definition 
See gh-38325
 2023-11-13 11:46:38 +01:00
Brian Clozel
67c5d10051 Process multipart properties for PartEvent support 
Prior to this commit, some properties in the `spring.webflux.multipart`
namespace were ignored for the streaming use case because those were not
supported in streaming mode with `PartEvent`.

As of Spring Framework 6.1, the `max-parts` and
`max-disk-usage-per-part` properties can be supported and this commit
maps those properties accordingly.

Fixes gh-37642
 2023-11-10 11:36:13 +01:00
Andy Wilkinson
9247104830 Merge branch '3.1.x' 
Closes gh-38286
 2023-11-09 20:31:53 +00:00
Andy Wilkinson
b6a9c67719 Avoid adding Jetty's upgrade filter to non-Jetty servers 
Fixes gh-38181
 2023-11-09 20:30:35 +00:00
Claudio Nave
4a6564c0a9 Add Liquibase show-summary and show-summary-output properties 
Update `LiquibaseProperties` and `LiquibaseAutoConfiguration` to
support the recently added `setShowSummary` and
`setShowSummaryOutput` methods.

See gh-38274
 2023-11-09 11:48:36 -08:00
Claudio Nave
61aecdedd6 Remove Liquibase javax.activation excludes 
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487) so we
can now remove our exclusions.

See gh-38274
 2023-11-09 11:44:31 -08:00
Andy Wilkinson
82c9ab4cbd Merge branch '3.1.x' 
Closes gh-38268
 2023-11-08 17:10:19 +00:00
Andy Wilkinson
1e1effe131 Merge branch '3.0.x' into 3.1.x 
Closes gh-38267
 2023-11-08 16:59:15 +00:00
Andy Wilkinson
6d46c24db7 Merge branch '2.7.x' into 3.0.x 
Closes gh-38266
 2023-11-08 15:58:40 +00:00
Andy Wilkinson
7c73a034b6 Improve backwards- and forwards-compatibility of Flyway auto-config 
Closes gh-38164
 2023-11-08 15:17:49 +00:00
Moritz Halbritter
d59b385304 Merge branch '3.1.x' 
Closes gh-38226
 2023-11-06 10:27:50 +01:00
Moritz Halbritter
3560a13d57 Merge branch '3.0.x' into 3.1.x 
Closes gh-38225
 2023-11-06 10:27:42 +01:00
Yanming Zhou
d7ab153559 Use switch expression where feasible 
See gh-38217
 2023-11-06 10:27:04 +01:00
Moritz Halbritter
a944815e3c Merge branch '3.1.x' 
Closes gh-38221
 2023-11-06 08:58:16 +01:00
Eddú Meléndez
674f8fbb8d Polish RabbitAutoConfiguration 
See gh-38216
 2023-11-06 08:57:19 +01:00
Scott Frederick
55ab56f8d9 Polish "Add observationEnabled properties for Apache Kafka" 
See gh-38057
 2023-11-02 17:05:17 -05:00
Zhiyang.Wang1
ff9d9de1ee Add observationEnabled properties for Apache Kafka 
See gh-38057
 2023-11-02 17:05:17 -05:00
Scott Frederick
99986a2fdd Polish SSL internals 2023-11-02 14:41:06 -05:00
Moritz Halbritter
d3f177be71 Polish SSL 2023-11-02 09:36:06 +01:00
Phillip Webb
9b71ef4114 Polish and refactor some SSL internals 
Polish and refactor some of the internal SSL code to make it easier to
add additional functionality in the future.
 2023-11-01 16:14:59 -07:00
Phillip Webb
30a7426e86 Apply key property to the keystore and not to the truststore 
Update `PropertiesSslBundle` so that key properties are now
only applied to the keystore and not the truststore.

Closes gh-38125
 2023-11-01 16:10:51 -07:00
Phillip Webb
5dc5c2a4bc Rename KeyVerifier to CertificateMatcher 
Rename `KeyVerifier` to `CertificateMatcher` and refactor some
of the internals. This commit also adds test helper classes to
help simplify some of the tests.

See gh-38173
 2023-11-01 16:10:31 -07:00
Phillip Webb
1b61bc1f20 Move PEM verification to spring-boot-autoconfigure 
Move `KeyVerifier` to spring-boot-autoconfigure to reduce the
public API required in `PemSslStoreBundle`.

This commit also moves the verify property so that is can be set
per store.

Closes gh-38173
 2023-11-01 16:10:16 -07:00
Phillip Webb
2c6fca8df7 Allow alias and password to be configured on a per PEM store basis 
Closes gh-38124
 2023-11-01 16:02:33 -07:00
Andy Wilkinson
8f2ec22738 Merge branch '3.1.x' 
Closes gh-38152
 2023-10-31 11:50:42 +00:00
Andy Wilkinson
1fcf1fcc20 Merge branch '3.0.x' into 3.1.x 
Closes gh-38151
 2023-10-31 11:50:32 +00:00
Andy Wilkinson
8f4ea6834d Merge branch '2.7.x' into 3.0.x 
Closes gh-38150
 2023-10-31 11:50:18 +00:00
Andy Wilkinson
020c2b364e Fix handling of value that overflows an int 
Closes gh-38146
 2023-10-31 11:47:14 +00:00
Andy Wilkinson
d2325d1110 Upgrade to Oracle Database 23.3.0.23.09 
Closes gh-38121
 2023-10-30 20:42:24 +00:00
Andy Wilkinson
5765f9410c Upgrade to Liquibase 4.24.0 
Closes gh-38120
 2023-10-30 20:41:49 +00:00
Andy Wilkinson
4f7e4712dd Merge branch '3.1.x' 
Closes gh-38019
 2023-10-25 10:45:07 +01:00
Andy Wilkinson
4faabcfcdd Merge branch '3.0.x' into 3.1.x 
Closes gh-38018
 2023-10-25 10:44:38 +01:00
Andy Wilkinson
b33ee84146 Merge branch '2.7.x' into 3.0.x 
Closes gh-38017
 2023-10-25 10:44:03 +01:00
Andy Wilkinson
8778884f5d Clarify role of WebMvcRegistrations and WebMvcConfigurer 
Closes gh-31232
 2023-10-25 10:42:25 +01:00