root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
37,504 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

37504 Commits

Author SHA1 Message Date
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 77ecdc6ba5 Merge pull request #31689 from felixscheinost 
* pr/31689:
  Polish "Fix deprecation metadata for grid-fs-database"
  Fix deprecation metadata for grid-fs-database

Closes gh-31689
 2022-07-12 14:51:26 +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 77f1f5869b Merge branch '2.6.x' into 2.7.x 2022-07-12 14:34:52 +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 e4a0f3a715 Merge branch '2.6.x' into 2.7.x 
Closes gh-31685
 2022-07-12 10:31:26 +01:00
Andy Wilkinson b11776f07b Upgrade to Gradle Enterprise plugin 3.10.3 
Closes gh-31684
 2022-07-12 10:30:58 +01:00
Andy Wilkinson eb13f80ff4 Upgrade to Micrometer 1.9.2 
Closes gh-31614
 2022-07-11 21:05:47 +01:00
Andy Wilkinson 909f38c214 Merge branch '2.6.x' into 2.7.x 2022-07-11 21:04:55 +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 57160180cb Merge branch '2.6.x' into 2.7.x 2022-07-07 17:43:16 +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
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