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
35,475 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

35475 Commits

Author SHA1 Message Date
Andy Wilkinson ccc924b908 Merge branch '2.7.x' 2022-01-05 11:58:50 +00:00
Andy Wilkinson 508d0af453 Merge branch '2.6.x' into 2.7.x 
Closes gh-29269
 2022-01-05 11:58:33 +00:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x 
Closes gh-29268
 2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new 
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
 2022-01-05 11:49:48 +00:00
Stephane Nicoll bc273d6327 Merge branch '2.7.x' 2022-01-05 09:46:39 +01:00
Stephane Nicoll 8b0ea24ac2 Upgrade to Kotlin Coroutines 1.6.0 
Closes gh-29264
 2022-01-05 09:45:36 +01:00
Stephane Nicoll fed89f98aa Merge branch '2.7.x' 2022-01-05 09:36:07 +01:00
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0 
Closes gh-29249
 2022-01-05 09:18:23 +01:00
Stephane Nicoll 73b7b147a1 Merge branch '2.7.x' 2022-01-05 09:17:25 +01:00
Stephane Nicoll dda46fbe2b Upgrade to Liquibase 4.6.2 
Closes gh-29257
 2022-01-05 09:14:57 +01:00
Phillip Webb 06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 760dcffd8b Merge branch '2.7.x' 2022-01-04 12:22:54 -08:00
Phillip Webb f09bde2b60 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:20:31 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb dc054943bf Merge branch '2.7.x' 
Closes gh-29262
 2022-01-04 12:14:18 -08:00
Phillip Webb c839ebbce4 Merge branch '2.6.x' into 2.7.x 
Closes gh-29261
 2022-01-04 12:13:55 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors 
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
 2022-01-04 12:12:03 -08:00
Andy Wilkinson 712e848ebe Merge branch '2.7.x' 2022-01-04 17:02:52 +00:00
Andy Wilkinson 3e6c8bc78b Merge branch '2.6.x' into 2.7.x 
Closes gh-29260
 2022-01-04 17:02:37 +00:00
Andy Wilkinson 438b7553da Merge branch '2.5.x' into 2.6.x 
Closes gh-29259
 2022-01-04 17:02:09 +00:00
Andy Wilkinson ba121afd87 Upgrade to Gradle 6.9.2 
Closes gh-29258
 2022-01-04 17:01:12 +00:00
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase 
Closes gh-28976
 2022-01-04 16:38:16 +00:00
Stephane Nicoll 799af76c08 Merge branch '2.7.x' 2022-01-04 17:08:37 +01:00
Stephane Nicoll e5cab660cb Upgrade to Infinispan 13.0.5.Final 
Closes gh-29256
 2022-01-04 16:51:58 +01:00
Stephane Nicoll dd289553a5 Merge pull request #29201 from dreis2211 
* pr/29201:
  Update to JDK 17 in launch script tests

Closes gh-29201
 2022-01-04 16:24:26 +01:00
dreis2211 d8deee7cf6 Update to JDK 17 in launch script tests 
See gh-29201
 2022-01-04 16:24:12 +01:00
Stephane Nicoll b214841e2c Merge branch '2.7.x' 2022-01-04 16:14:28 +01:00
Stephane Nicoll ccf6c867db Merge pull request #29090 from jonatan-ivanov 
* pr/29090:
  Polish "Add vendor version to JavaInfo"
  Add vendor version to JavaInfo

Closes gh-29090
 2022-01-04 16:14:19 +01:00
Stephane Nicoll 605ec2fb0e Polish "Add vendor version to JavaInfo" 
See gh-29090
 2022-01-04 16:10:02 +01:00
Jonatan Ivanov c6e6d109ad Add vendor version to JavaInfo 
See gh-29090
 2022-01-04 16:09:45 +01:00
Stephane Nicoll 9bfe3c21e5 Merge branch '2.7.x' 2022-01-04 15:57:21 +01:00
Stephane Nicoll 9ff4ea523d Merge pull request #29089 from garyrussell 
* pr/29089:
  Polish "Add transactionIdPrefix Property to KafkaTemplate"
  Add transactionIdPrefix Property to KafkaTemplate

Closes gh-29089
 2022-01-04 15:57:14 +01:00
Stephane Nicoll 4799d2a71a Polish "Add transactionIdPrefix Property to KafkaTemplate" 
See gh-29089
 2022-01-04 15:54:23 +01:00
Gary Russell 33814a4a42 Add transactionIdPrefix Property to KafkaTemplate 
See gh-29089
 2022-01-04 15:39:31 +01:00
Stephane Nicoll e2f274f01d Merge branch '2.7.x' 2022-01-04 15:36:12 +01:00
Stephane Nicoll af933f24c1 Merge pull request #29003 from raviu 
* pr/29003:
  Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest"
  Include AbstractJdbcConfiguration beans in @DataJdbcTest

Closes gh-29003
 2022-01-04 15:36:05 +01:00
Stephane Nicoll 9b34c31916 Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest" 
See gh-29003
 2022-01-04 15:32:23 +01:00
raviu 7f8dd81947 Include AbstractJdbcConfiguration beans in @DataJdbcTest 
See gh-29003
 2022-01-04 15:30:54 +01:00
Stephane Nicoll e87b4cfb5b Merge branch '2.7.x' 2022-01-04 15:04:33 +01:00
Stephane Nicoll 05fa0e246a Merge pull request #28444 from terminux 
* pr/28927:
  Polish "Add principal resolution in RSocket handler methods"
  Add principal resolution in RSocket handler methods

Closes gh-28444
 2022-01-04 15:04:10 +01:00
Stephane Nicoll c943ef18ca Polish "Add principal resolution in RSocket handler methods" 
See gh-28444
 2022-01-04 15:02:56 +01:00
Guirong Hu cf05964499 Add principal resolution in RSocket handler methods 
See gh-28444
 2022-01-04 14:35:12 +01:00
Stephane Nicoll abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll 988decdd3f Merge pull request #28907 from jonatan-ivanov 
* pr/28907:
  Polish "Expose OS information as an InfoContributor"
  Expose OS information as an InfoContributor

Closes gh-28907
 2022-01-04 14:23:41 +01:00
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor" 
See gh-28907
 2022-01-04 14:08:24 +01:00
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor 
See gh-28907
 2022-01-04 13:58:39 +01:00