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

2804 Commits

Author SHA1 Message Date
Stephane Nicoll
85729d2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-24943
 2021-01-20 13:57:18 +01:00
Stephane Nicoll
10b4cb8cb5 Deprecate Spring Data Solr support 
Closes gh-24942
 2021-01-20 13:56:50 +01:00
Andy Wilkinson
294231efe7 Merge branch '2.4.x' 
Closes gh-24883
 2021-01-19 13:22:32 +00:00
Andy Wilkinson
7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0 
Closes gh-24875
 2021-01-19 13:22:00 +00:00
Stephane Nicoll
7592c98d5c Merge branch '2.4.x' 
Closes gh-24871
 2021-01-18 14:45:02 +01:00
izeye
21db14227c Fix property name for spring.dao.exceptiontranslation.enabled 
See gh-24867
 2021-01-18 14:41:41 +01:00
Stephane Nicoll
742983fc5e Update copyright of changed file 
See gh-24866
 2021-01-18 14:38:58 +01:00
izeye
41fcc427c6 Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation() 
See gh-24866
 2021-01-18 14:37:34 +01:00
Stephane Nicoll
dcc0ca0df9 Polish contribution 
See gh-24862
 2021-01-18 11:03:27 +01:00
izeye
3aea8b37a0 Polish 
See gh-24862
 2021-01-18 10:58:27 +01:00
Stephane Nicoll
bcc1331f85 Restore missing deprecated metadata for Bitronix 
See gh-24806
 2021-01-18 10:29:21 +01:00
izeye
e7350503b8 Polish 
See gh-24837
 2021-01-15 14:37:33 +01:00
Stephane Nicoll
2c2c160579 Remove deprecated code 
See gh-24806
 2021-01-15 14:14:33 +01:00
Stephane Nicoll
a18f01addf Remove bitronix support 
See gh-24806
 2021-01-15 14:14:27 +01:00
Stephane Nicoll
a788ef4958 Merge branch '2.4.x' 
Closes gh-24842
 2021-01-14 18:03:38 +01:00
Stephane Nicoll
2072e7242a Merge branch '2.3.x' into 2.4.x 
Closes gh-24841
 2021-01-14 18:02:28 +01:00
Stephane Nicoll
283ed48d63 Unwrap Datasource against an actual interface 
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
 2021-01-14 18:00:35 +01:00
Andy Wilkinson
31fe24c451 Merge branch '2.4.x' 
Closes gh-24791
 2021-01-12 16:04:04 +00:00
Andy Wilkinson
5cae1a2842 Merge branch '2.3.x' into 2.4.x 
Closes gh-24790
 2021-01-12 16:03:48 +00:00
Andy Wilkinson
7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available 
Fixes gh-24624
 2021-01-12 15:47:33 +00:00
Phillip Webb
66598ed4ad Merge branch '2.4.x' 2021-01-11 16:42:17 -08:00
Phillip Webb
bd21c43d71 Simplify resource registration 
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
 2021-01-11 16:40:42 -08:00
Phillip Webb
a8f291b252 Merge branch '2.4.x' 
Closes gh-24749
 2021-01-11 15:24:25 -08:00
Phillip Webb
f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x 
Closes gh-24748
 2021-01-11 14:53:57 -08:00
Phillip Webb
72dd3b5628 Merge branch '2.2.x' into 2.3.x 
Closes gh-24747
 2021-01-11 14:21:56 -08:00
Phillip Webb
f9e3e0d532 Register default resource path using a Resource 
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
 2021-01-11 14:20:46 -08:00
Phillip Webb
21a08ed37d Merge branch '2.4.x' 
Closes gh-24746
 2021-01-11 13:58:48 -08:00
Phillip Webb
53a6fa2fed Respect spring.dao.exceptiontranslation setting 
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
 2021-01-11 13:57:47 -08:00
Phillip Webb
3fc1d319fe Merge branch '2.4.x' 2021-01-11 13:40:32 -08:00
Phillip Webb
cff3e4c831 Fix tests following upstream framework changes 2021-01-11 13:39:21 -08:00
Stephane Nicoll
6bf74e5752 Polish 2021-01-11 14:39:56 +01:00
Stephane Nicoll
0897af0dfa Add customizer for jOOQ's configuration 
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.

Closes gh-24732
 2021-01-11 14:16:34 +01:00
Stephane Nicoll
8a6e79dc8b Configure Couchbase to use the application's ObjectMapper 
Closes gh-24616
 2021-01-10 10:10:42 +01:00
Scott Frederick
bd4c6e51fa Merge branch '2.4.x' 
Closes gh-24687
 2021-01-07 10:36:06 -06:00
Scott Frederick
ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans 
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
 2021-01-07 10:29:13 -06:00
Stephane Nicoll
8cd07dbc60 Polish 
See gh-21286
 2020-12-24 11:10:37 +01:00
Stephane Nicoll
e4618cfb8d Delete ErrorProperties.IncludeStacktrace 
Closes gh-21286
 2020-12-24 10:35:04 +01:00
Stephane Nicoll
1fd17cf641 Add support for Elasticsearch sniffer 
Closes gh-24174
 2020-12-23 17:11:40 +01:00
Stephane Nicoll
ad6b01d6d0 Add control connection timeout property for Cassandra 
Closes gh-24189
 2020-12-22 15:20:44 +01:00
Stephane Nicoll
5000051891 Merge branch '2.4.x' 
Closes gh-24589
 2020-12-22 12:32:24 +01:00
Stephane Nicoll
0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j" 
See gh-24239
 2020-12-22 12:30:48 +01:00
Gerrit Meier
ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j 
See gh-24239
 2020-12-22 12:15:03 +01:00
Stephane Nicoll
ec683605d4 Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata" 
See gh-24582
 2020-12-22 09:53:53 +01:00
Martín Dacosta
b539e2e749 Allow to configure Kafka Listener's onlyLogRecordMetadata 
See gh-24582
 2020-12-22 09:53:07 +01:00
Stephane Nicoll
490a40af20 Polish 2020-12-22 08:33:59 +01:00
Stephane Nicoll
338c8c4fc8 Polish "Allow to configure ActiveMQ Artemis with a broker url" 
See gh-24302
 2020-12-21 17:53:10 +01:00
Justin Bertram
99b43cb690 Allow to configure ActiveMQ Artemis with a broker url 
See gh-24302
 2020-12-21 17:32:49 +01:00
Stephane Nicoll
a6c6655c82 Polish "Upgrade to Jackson 2.12.0" 
Guard breaking change to PropertyNamingStrategies so that we tolerate
older Jackson versions.

See gh-24415
 2020-12-21 15:51:52 +01:00
Valery Yatsynovich
1f63b82c5b Upgrade to Jackson 2.12.0 
See gh-24415
 2020-12-21 15:27:44 +01:00
Stephane Nicoll
abbdbb07f6 Polish "Upgrade to Embedded Mongo 3.0.0" 
See gh-24254
 2020-12-21 10:45:18 +01:00