Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,436 Commits 23 Branches 0 Tags
d7fb899c84bfdac8408d50a189e7fc4ba2bcb56c
Commit Graph

17011 Commits

Author SHA1 Message Date
Andy Wilkinson
b6b4b3b5b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31732
 2022-07-14 15:39:15 +01:00
Andy Wilkinson
9443713c53 Disable Log4j2's shutdown hook with 2.18 and later 
Closes gh-31719
 2022-07-14 15:38:19 +01:00
Stephane Nicoll
585a7ca71f Upgrade to Spring Framework 5.3.22 
Closes gh-31613
 2022-07-14 16:10:37 +02:00
Stephane Nicoll
77194eed29 Upgrade to Spring Framework 5.3.22 
Closes gh-31610
 2022-07-14 16:09:35 +02:00
Jonas
6afd041bb2 Fix typo 
See gh-31518
 2022-07-13 16:18:53 +02:00
Stephane Nicoll
3e4a5703c6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31706
 2022-07-13 14:11:44 +02:00
Stephane Nicoll
628a7b0c5c Update copyright year of changed files 
See gh-31516
 2022-07-13 14:08:22 +02:00
“Jakub
ed7b333138 Add missing descriptions for HTTP Server and Data repositories metrics 
See gh-31516
 2022-07-13 13:55:36 +02:00
Stephane Nicoll
b8647551cb Merge branch '2.6.x' into 2.7.x 
Closes gh-31704
 2022-07-13 13:50:17 +02:00
Johnny Lim
b17cb9b92b Polish gh-31231 
See gh-31540
 2022-07-13 13:49:13 +02:00
Andy Wilkinson
1664ce0f20 Uses tabs consistently for indentation in spring-boot-dependencies 2022-07-12 15:47:54 +01:00
Andy Wilkinson
1c2b0ae705 Merge branch '2.6.x' into 2.7.x 
Closes gh-31693
 2022-07-12 14:28:10 +01:00
Andy Wilkinson
7c55639167 Depend on log4j-api directly rather than via Elastic's transitives 
Closes gh-31692
 2022-07-12 14:27:56 +01:00
Stephane Nicoll
cb2844d527 Merge branch '2.6.x' into 2.7.x 
Closes gh-31690
 2022-07-12 14:51:33 +02:00
Stephane Nicoll
a368919600 Polish "Fix deprecation metadata for grid-fs-database" 
See gh-31689
 2022-07-12 14:42:49 +02:00
Felix Scheinost
d5e18e61c5 Fix deprecation metadata for grid-fs-database 
See gh-31689
 2022-07-12 14:42:36 +02:00
Stephane Nicoll
c7d8323158 Upgrade to Reactor 2020.0.21 
Closes gh-31608
 2022-07-12 14:34:21 +02:00
Stephane Nicoll
793586f898 Upgrade to Reactor 2020.0.21 
Closes gh-31607
 2022-07-12 14:33:38 +02:00
Andy Wilkinson
eb13f80ff4 Upgrade to Micrometer 1.9.2 
Closes gh-31614
 2022-07-11 21:05:47 +01:00
Andy Wilkinson
fe19984147 Upgrade to Micrometer 1.8.8 
Closes gh-31612
 2022-07-11 21:04:15 +01:00
Andy Wilkinson
c6d5652dcc Start building against Spring GraphQL 1.0.1 snapshots 
See gh-31616
 2022-07-08 09:58:24 +01:00
Andy Wilkinson
28b4938c9b Startin building against Spring Data 2021.2.2 snapshots 
See gh-31615
 2022-07-08 09:57:38 +01:00
Andy Wilkinson
2c74a9376a Start building against Micrometer 1.9.2 snapshots 
See gh-31614
 2022-07-08 09:56:52 +01:00
Andy Wilkinson
292d351b16 Start building against Reactor 2020.0.21 snapshots 
See gh-31608
 2022-07-08 09:55:52 +01:00
Andy Wilkinson
55aa17eb11 Start building against Spring Framework 5.3.22 snapshots 
See gh-31613
 2022-07-08 09:55:15 +01:00
Andy Wilkinson
b94527de3b Start building against Micrometer 1.8.8 snapshots 
See gh-31612
 2022-07-07 17:04:02 +01:00
Andy Wilkinson
f417b4b9b2 Start building against Spring Data 2021.1.6 snapshots 
See gh-31611
 2022-07-07 17:04:02 +01:00
Andy Wilkinson
ece51636fd Start building against Spring Framework 5.3.22 snapshots 
See gh-31610
 2022-07-07 17:04:01 +01:00
Andy Wilkinson
c38a3c0da4 Start building against Reactor 2020.0.21 snapshots 
See gh-31607
 2022-07-07 16:37:55 +01:00
Moritz Halbritter
d4b1c219ab Move test imports from main to test resources 
They shouldn't have been in main resources in the first place, this was
an accident.
 2022-07-07 15:15:34 +02:00
Scott Frederick
e24c49a09a Merge branch '2.6.x' into 2.7.x 
Closes gh-31558
 2022-06-30 14:58:28 -05:00
Scott Frederick
17bdc526f6 Avoid adding layers for buildpacks that exist in the builder 
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.

Fixes gh-31233
 2022-06-30 14:35:34 -05:00
Andy Wilkinson
5299e849b9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31556
 2022-06-30 20:11:28 +01:00
Andy Wilkinson
6411f88f28 Upgrade to Dependency Management Plugin 1.0.12.RELEASE 
Closes gh-31555
 2022-06-30 19:45:40 +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
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
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
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
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