Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,539 Commits 23 Branches 0 Tags
29beee61b54bda1774e372355ea2387d43ffd47d
Commit Graph

38539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Bob
29beee61b5 Remove remaining Jolokia references from the documentation 
See gh-31549
 2022-06-30 09:52:57 +02:00
Andy Wilkinson
ac59b5781f Align with breaking changes in spring-test 
See gh-31241
 2022-06-26 09:55:36 +01:00
Andy Wilkinson
eca9343675 Merge branch '2.7.x' 2022-06-26 08:19:34 +01:00
Andy Wilkinson
2f01739e0d Polish since date on new SslStoreProvider API 
See gh-31253
 2022-06-26 08:18:21 +01:00
Andy Wilkinson
543d9c6e66 Merge branch '2.7.x' 2022-06-25 13:47:45 +01:00
Andy Wilkinson
71526bf44f Polish 
See gh-31253
 2022-06-25 13:47:25 +01:00
Andy Wilkinson
a28ca4594b Merge branch '2.7.x' 
Closes gh-31529
 2022-06-24 18:01:31 +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
06281e2d72 Merge pull request #31527 from dreis2211 
* gh-31527:
  Use switch expressions where appropriate

Closes gh-31527
 2022-06-24 16:19:51 +01:00
dreis2211
458f989cf3 Use switch expressions where appropriate 
See gh-31527
 2022-06-24 16:19:28 +01:00
Andy Wilkinson
836b08f49d Merge branch '2.7.x' 2022-06-24 15:03:41 +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
631b1e0d76 Merge branch '2.7.x' 
Closes gh-31526
 2022-06-24 13:10:10 +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
7c5aacc5f9 Adapt to upstream Spring Framework exception changes 2022-06-23 17:05:58 -07:00
Stephane Nicoll
fe39598e81 Adapt to latest API change in Spring Framework 
See https://github.com/spring-projects/spring-framework/issues/28585
 2022-06-23 16:30:34 +02:00
Andy Wilkinson
114b896e3c Merge branch '2.7.x' 2022-06-23 13:44:36 +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
42a437868d Merge branch '2.7.x' 2022-06-23 11:54:18 +02:00
Stephane Nicoll
498f052a7a Fix deprecation warning 2022-06-23 11:53:56 +02:00
Stephane Nicoll
11930724f8 Merge branch '2.7.x' 2022-06-23 08:41:40 +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
2c22f21835 Merge branch '2.7.x' 
Closes gh-31504
 2022-06-22 20:32:23 -07: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
e6352eee32 Fix import that should have been replaced during merge 
See gh-31502
 2022-06-22 16:55:50 -07:00
Phillip Webb
b85469a5a5 Merge branch '2.7.x' 
Closes gh-31502
 2022-06-22 16:33:42 -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
Madhura Bhave
7cb53b3c45 Remove session store type in favor of defined order 
Closes gh-27756
 2022-06-22 15:22:48 -07:00
Andy Wilkinson
6346f21f4e Merge branch '2.7.x' 2022-06-22 21:13:59 +01: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
ed75930dc7 Merge branch '2.7.x' 2022-06-22 21:00:34 +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
a55560669b Remove YamlJsonParser 
Closes gh-31498
 2022-06-22 20:20:28 +01:00
Andy Wilkinson
b07d5b0bb1 Merge branch '2.7.x' 
Closes gh-31500
 2022-06-22 19:50:01 +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