Commit Graph

35489 Commits

Author SHA1 Message Date
Andy Wilkinson
eba2c8c8fe Merge branch '2.7.x' 2022-01-07 14:04:07 +00:00
Andy Wilkinson
94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll
11e604af41 Merge branch '2.7.x' 2022-01-07 14:43:19 +01:00
Stephane Nicoll
9821cdfd8b Remove deprecated code
Closes gh-29290
2022-01-07 14:42:14 +01:00
Stephane Nicoll
aec6c1ed92 Merge branch '2.7.x' 2022-01-07 10:23:07 +01:00
Stephane Nicoll
c62aa0deab Remove support for Hazelcast 3
Closes gh-29287
2022-01-07 10:22:27 +01:00
Stephane Nicoll
164c2f7164 Polish
See gh-29265
2022-01-07 10:20:11 +01:00
Andy Wilkinson
9a05eb63c4 Use built-in basic auth support as it no longer requires JAX-B
Closes gh-28829
2022-01-06 18:12:14 +00:00
Andy Wilkinson
29c654530c Upgrade to Prometheus Client 0.14.1
Closes gh-29288
2022-01-06 17:38:54 +00:00
Stephane Nicoll
025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll
69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll
a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Andy Wilkinson
35b32bb3ff Update Javadoc to link to Java SE 17 and Jakarta EE 9
Closes gh-29277
2022-01-06 14:39:33 +00:00
Andy Wilkinson
c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9
Closes gh-29271
2022-01-05 15:46:54 +00:00
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