Commit Graph

37124 Commits

Author SHA1 Message Date
dreis2211
eea4611553 Fix references to JDK 1.8 in READMEs
See gh-30447
2022-03-28 09:38:24 +02:00
Moritz Halbritter
be3523b1cd Move metric properties
- Moved from 'management.metrics.export.<product>' to
  'management.<product>.metrics.export'
- The default enabled property moved from 'management.metrics.export.defaults.enabled'
  to 'management.defaults.metrics.export.enabled'

Closes gh-30381
2022-03-28 08:24:03 +02:00
Moritz Halbritter
3af3b26f8e Merge branch '2.7.x' 2022-03-25 16:28:38 +01:00
Moritz Halbritter
018281f3d0 Merge branch '2.6.x' into 2.7.x
Closes gh-30441
2022-03-25 16:28:24 +01:00
Moritz Halbritter
cee51783fd Merge branch '2.5.x' into 2.6.x
Closes gh-30440
2022-03-25 16:28:07 +01:00
Moritz Halbritter
24e748d5cd Remove unnecessary entries in additional config metadata
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
2022-03-25 16:22:47 +01:00
Andy Wilkinson
eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00:00
Andy Wilkinson
64be4d3b2f Merge pull request #30152 from terminux
* gh-30152:
  Polish
  Simplify registration of Jackson mixin types

Closes gh-30152
2022-03-25 15:15:11 +00:00
Andy Wilkinson
685d2d4391 Polish
See gh-30152
2022-03-25 15:15:02 +00:00
Guirong Hu
df417bf317 Simplify registration of Jackson mixin types
See gh-30152
2022-03-25 15:15:02 +00:00
Moritz Halbritter
e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01:00
Moritz Halbritter
45f393b76b Merge branch '2.6.x' into 2.7.x
Closes gh-30437
2022-03-25 14:56:01 +01:00
Moritz Halbritter
c003d5b533 Merge branch '2.5.x' into 2.6.x
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter
0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
2022-03-25 14:54:39 +01:00
Andy Wilkinson
2e32f800e1 Merge branch '2.7.x' 2022-03-25 13:34:37 +00:00
Andy Wilkinson
8646ac4215 Move JsonComponent docs to general Jackson section
Closes gh-30405
2022-03-25 13:30:06 +00:00
Andy Wilkinson
3de024594f Merge branch '2.7.x' 2022-03-25 12:06:16 +00:00
Andy Wilkinson
64888b0deb Merge branch '2.6.x' into 2.7.x
Closes gh-30433
2022-03-25 12:03:24 +00:00
Andy Wilkinson
35d8f1dcdd Merge branch '2.5.x' into 2.6.x
Closes gh-30431
2022-03-25 11:44:24 +00:00
Andy Wilkinson
25e1e8629a Merge pull request #30406 from quaff
* gh-30406:
  Polish "Prevent imports of null-safety annotations"
  Prevent imports of null-safety annotations

Closes gh-30406
2022-03-25 11:44:15 +00:00
Andy Wilkinson
c087d609a0 Polish "Prevent imports of null-safety annotations"
See gh-30406
2022-03-25 11:43:57 +00:00
Yanming Zhou
0e99c57f8e Prevent imports of null-safety annotations
See gh-30406
2022-03-25 11:22:36 +00:00
Andy Wilkinson
a59f60c614 Merge branch '2.7.x' 2022-03-25 11:15:08 +00:00
Andy Wilkinson
aad59efef2 Merge branch '2.6.x' into 2.7.x
Closes gh-30430
2022-03-25 11:14:57 +00:00
Andy Wilkinson
344aa405ae Merge branch '2.5.x' into 2.6.x
Closes gh-30429
2022-03-25 11:14:46 +00:00
Andy Wilkinson
6e16552e84 Merge pull request #30422 from eddumelendez
* gh-30422:
  Polish "Enable Java 18 for LoaderIntegrationTests"
  Enable Java 18 for LoaderIntegrationTests

Closes gh-30422
2022-03-25 11:03:09 +00:00
Andy Wilkinson
e36ac6c155 Polish "Enable Java 18 for LoaderIntegrationTests"
See gh-30422
2022-03-25 11:02:57 +00:00
Eddú Meléndez
e9c433a0b7 Enable Java 18 for LoaderIntegrationTests
See gh-30422
2022-03-25 11:02:42 +00:00
Andy Wilkinson
3c2634c62c Merge branch '2.7.x' 2022-03-25 10:52:11 +00:00
Andy Wilkinson
7c36211bf3 Merge branch '2.6.x' into 2.7.x
Closes gh-30428
2022-03-25 10:51:59 +00:00
Andy Wilkinson
d1ec50b915 Merge branch '2.5.x' into 2.6.x
Closes gh-30427
2022-03-25 10:51:41 +00:00
Andy Wilkinson
f33b489f47 Merge pull request #30415 from eddumelendez
* gh-30415:
  Switch to GA releases for Java 18 update checks

Closes gh-30415
2022-03-25 10:48:27 +00:00
Eddú Meléndez
713edf3625 Switch to GA releases for Java 18 update checks
See gh-30415
2022-03-25 10:47:45 +00:00
Andy Wilkinson
5d09260870 Reinstate support for REST Assured
Closes gh-29543
Closes gh-30426
2022-03-25 10:12:42 +00:00
Andy Wilkinson
c7bf816cf7 Start building against Spring REST Docs 3.0.0-M3 snapshots
See gh-30424
2022-03-25 10:06:33 +00:00
Phillip Webb
7e98ee8cf6 Upgrade to SendGrid 4.9.1
Closes gh-30420
2022-03-24 13:38:27 -07:00
Phillip Webb
aac5afebf3 Upgrade to MongoDB 4.5.1
Closes gh-30419
2022-03-24 13:38:25 -07:00
Phillip Webb
fd0fce6e3a Upgrade to AspectJ 1.9.9
Closes gh-30418
2022-03-24 13:38:22 -07:00
Phillip Webb
e5d189ca61 Merge branch '2.7.x' 2022-03-24 11:05:06 -07:00
Phillip Webb
dcfaadfb88 Upgrade to SendGrid 4.9.1
Closes gh-30417
2022-03-24 11:04:45 -07:00
Phillip Webb
123e22afb0 Upgrade to MongoDB 4.5.1
Closes gh-30416
2022-03-24 11:04:39 -07:00
Phillip Webb
7e4520cb0e Merge branch '2.7.x' 2022-03-24 11:03:45 -07:00
Phillip Webb
b89374a917 Merge branch '2.6.x' into 2.7.x 2022-03-24 11:02:25 -07:00
Phillip Webb
acb63e7126 Merge branch '2.5.x' into 2.6.x 2022-03-24 11:01:05 -07:00
Spring Builds
7072e9e75b Next development version (v2.6.6-SNAPSHOT) 2022-03-24 14:23:11 +00:00
Moritz Halbritter
c943dcec27 Merge branch '2.7.x' 2022-03-24 15:18:59 +01:00
Moritz Halbritter
47bf218bd2 Add prohibit clauses to shut up bomr 2022-03-24 15:18:19 +01:00
Spring Builds
fe27ce8c91 Next development version (v2.5.12-SNAPSHOT) 2022-03-24 12:45:53 +00:00
Andy Wilkinson
c3b9b33aab Merge branch '2.7.x' 2022-03-24 11:00:56 +00:00
Andy Wilkinson
975674d319 Merge branch '2.6.x' into 2.7.x
Closes gh-30410
2022-03-24 11:00:19 +00:00