root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
37,475 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

37475 Commits

Author SHA1 Message Date
Andy Wilkinson 2f01739e0d Polish since date on new SslStoreProvider API 
See gh-31253
 2022-06-26 08:18:21 +01:00
Andy Wilkinson 71526bf44f Polish 
See gh-31253
 2022-06-25 13:47:25 +01:00
Andy Wilkinson 7abc7df7b8 Allow PEM certificates to be used without a key store password 
Closes gh-31253
 2022-06-24 18:01:20 +01:00
Andy Wilkinson dfb8979456 Merge branch '2.6.x' into 2.7.x 2022-06-24 15:03:25 +01:00
Andy Wilkinson c87340e5c1 Remove unnecessary throws 2022-06-24 15:02:58 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Andy Wilkinson a6f11d1f62 Merge branch '2.6.x' into 2.7.x 2022-06-23 13:43:57 +01:00
Spring Builds da834de4e0 Next development version (v2.7.2-SNAPSHOT) 2022-06-23 12:01:59 +00:00
Spring Builds 53da5e87cc Next development version (v2.6.10-SNAPSHOT) 2022-06-23 10:34:43 +00:00
Stephane Nicoll 498f052a7a Fix deprecation warning 2022-06-23 11:53:56 +02:00
Stephane Nicoll bc2d20edf0 Merge branch '2.6.x' into 2.7.x 2022-06-23 08:41:27 +02:00
Stephane Nicoll a94e7d6672 Upgrade to Jetty 9.4.48.v20220622 
Closes gh-31509
 2022-06-23 08:41:23 +02:00
Stephane Nicoll 5976457271 Upgrade to Byte Buddy 1.12.11 
Closes gh-31508
 2022-06-23 08:41:19 +02:00
Stephane Nicoll 6484be2aa5 Upgrade to Jetty 9.4.48.v20220622 
Closes gh-31507
 2022-06-23 08:37:51 +02:00
Phillip Webb 28775c2c53 Merge branch '2.6.x' into 2.7.x 
Closes gh-31503
 2022-06-22 20:31:58 -07:00
Phillip Webb 9e98f694c7 Merge pull request #31238 from ittays 
* pr/31238:
  Polish 'Allow spring.data.cassandra.config file to override default values'
  Allow spring.data.cassandra.config file to override default values

Closes gh-31238
 2022-06-22 20:31:45 -07:00
Phillip Webb 904feb2490 Polish 'Allow spring.data.cassandra.config file to override default values' 
See gh-31238
 2022-06-22 19:51:32 -07:00
Stern, Ittay (is9613) 1c7d99890e Allow spring.data.cassandra.config file to override default values 
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.

This commit changes two things:

1. Any primitive on `CassandraProperties` are replaced with object values.
   This allows distinguishing between defaults values and no-values. Then
   CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
   to ignore those.

2. `CassandraProperties` no longer populate default values on any
   property. With that, the defaults can be applied on top of the file
   spring.data.cassandra.config; i.e. the config file have higher
   precedence than the defaults, but lower that any spring.data.cassandra.*
   property.

See gh-31238
 2022-06-22 19:27:40 -07:00
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb 7017e103f6 Merge pull request #31495 from terminux 
* pr/31495:
  Polish CompositeHandlerExceptionResolver
  Use ExceptionHandler when Spring MVC uses a different management port

Closes gh-31495
 2022-06-22 16:31:28 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port 
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
 2022-06-22 16:13:26 -07:00
Andy Wilkinson 7fcdd9ffd0 Merge branch '2.6.x' into 2.7.x 2022-06-22 21:13:43 +01:00
Andy Wilkinson a784156f66 Revert "Start building against Spring Session 2021.1.4 snapshots" 
This reverts commit 2f40c52d81.
 2022-06-22 21:13:18 +01:00
Andy Wilkinson 83932cfe94 Merge branch '2.6.x' into 2.7.x 
Closes gh-31483
 2022-06-22 20:54:56 +01:00
Andy Wilkinson 17c757c600 Upgrade to Spring Integration 5.5.13 
Closes gh-31482
 2022-06-22 20:38:19 +01:00
Andy Wilkinson 268f13dbd7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31499
 2022-06-22 19:49:38 +01:00
Andy Wilkinson 522ea0a90e Handle malformed JSON more consistently 
Closes gh-31301
 2022-06-22 18:31:16 +01:00
Stephane Nicoll e967d0383b Merge branch '2.6.x' into 2.7.x 2022-06-22 08:16:18 +02:00
Stephane Nicoll 79d3e3080f Polish 2022-06-22 08:15:04 +02:00
Stephane Nicoll f27adeb241 Upgrade to Solr 8.11.2 
Closes gh-31491
 2022-06-22 08:03:53 +02:00
Stephane Nicoll 4f6bc3c2e0 Upgrade to Kotlin Coroutines 1.6.3 
Closes gh-31490
 2022-06-22 08:03:51 +02:00
Stephane Nicoll 7266dd5270 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31489
 2022-06-22 08:03:47 +02:00
Stephane Nicoll 296e88db51 Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31488
 2022-06-22 08:03:45 +02:00
Stephane Nicoll 72257ba302 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31487
 2022-06-22 07:55:16 +02:00
Stephane Nicoll e74163704c Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31486
 2022-06-22 07:55:14 +02:00
Stephane Nicoll 2665880abe Merge branch '2.6.x' into 2.7.x 2022-06-22 07:52:24 +02:00
Stephane Nicoll 1c2e3b731b Upgrade to Spring Kafka 2.8.7 
Closes gh-31377
 2022-06-22 07:52:14 +02:00
Stephane Nicoll 09cd024817 Upgrade to Spring Kafka 2.8.7 
Closes gh-31350
 2022-06-22 07:51:32 +02:00
Phillip Webb 13b2de3bb8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31484
 2022-06-21 19:10:23 -07:00
Phillip Webb 7fc9debf2a Consider super classes when detecting nested property classes 
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.

Fixes gh-21626
 2022-06-21 19:09:32 -07:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
Andy Wilkinson 390554a84f Upgrade to Spring AMQP 2.4.6 
Closes gh-31376
 2022-06-21 16:36:55 +01:00
Andy Wilkinson f055d564f4 Merge branch '2.6.x' into 2.7.x 2022-06-21 16:36:03 +01:00
Andy Wilkinson 49fd727ef0 Upgrade to Spring AMQP 2.4.6 
Closes gh-31348
 2022-06-21 16:34:47 +01:00
Moritz Halbritter ae75d4386c Merge branch '2.6.x' into 2.7.x 2022-06-21 14:01:18 +02:00
Moritz Halbritter b56b95d429 Add Apache HttpClient WebClient support to documentation 2022-06-21 14:00:55 +02:00
Andy Wilkinson 25b6cc0e74 Merge branch '2.6.x' into 2.7.x 2022-06-20 20:46:56 +01:00
Andy Wilkinson d45e42f2e1 Upgrade to Spring Security 5.6.6 
Closes gh-31351
 2022-06-20 20:46:38 +01:00