Commit Graph

37320 Commits

Author SHA1 Message Date
Stephane Nicoll
57f11696eb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:01:14 +02:00
Stephane Nicoll
7ccbdda1e7 Upgrade to Spring Framework 5.3.18
Closes gh-30492
2022-03-31 11:30:14 +02:00
Stephane Nicoll
94c40c7234 Upgrade to Spring Framework 5.3.18
Closes gh-30491
2022-03-31 11:29:49 +02:00
Stephane Nicoll
47eb63028f Merge branch '2.7.x' 2022-03-31 09:14:15 +02:00
Stephane Nicoll
7b0d0bf3cc Upgrade CI to Docker 20.10.14
Closes gh-30487
2022-03-31 09:13:59 +02:00
Stephane Nicoll
3e5953c0a0 Upgrade Java 18 version in CI image
Closes gh-30483
2022-03-31 09:13:25 +02:00
Stephane Nicoll
0ce499441b Merge branch '2.6.x' into 2.7.x 2022-03-31 09:12:43 +02:00
Stephane Nicoll
15041cfbd4 Upgrade CI to Docker 20.10.14
Closes gh-30485
2022-03-31 09:12:26 +02:00
Stephane Nicoll
25e8a4d572 Upgrade Java 18 version in CI image
Closes gh-30486
2022-03-31 09:11:50 +02:00
Stephane Nicoll
be716d8765 Merge branch '2.5.x' into 2.6.x 2022-03-31 09:08:26 +02:00
Stephane Nicoll
8409c2f514 Upgrade CI to Docker 20.10.14
Closes gh-30481
2022-03-31 09:08:15 +02:00
Stephane Nicoll
a99fcecd48 Upgrade Java 18 version in CI image
Closes gh-30482
2022-03-31 09:07:32 +02:00
Stephane Nicoll
2e90fd2302 Upgrade CI to Docker 20.10.14
Closes gh-30484
2022-03-31 09:06:56 +02:00
Stephane Nicoll
6cded5b928 Upgrade Java 18 version in CI image
Closes gh-30488
2022-03-31 09:06:19 +02:00
Andy Wilkinson
930b1d6fc5 Merge branch '2.7.x' 2022-03-30 15:27:14 +01:00
Andy Wilkinson
be3288cddf Merge branch '2.6.x' into 2.7.x 2022-03-30 15:26:50 +01:00
Andy Wilkinson
2da44a0b4f Upgrade to Jackson Bom 2.13.2.20220328
Closes gh-30478
2022-03-30 14:29:38 +01:00
Andy Wilkinson
1d53e711fe Merge branch '2.5.x' into 2.6.x 2022-03-30 14:24:28 +01:00
Andy Wilkinson
06c5e26f81 Upgrade to Jackson Bom 2.12.6.20220326
Closes gh-30477
2022-03-30 13:30:42 +01:00
Andy Wilkinson
ad95aded7e Merge branch '2.7.x' 2022-03-30 10:57:28 +01:00
Andy Wilkinson
b9029fcf9e Merge branch '2.6.x' into 2.7.x
Closes gh-30476
2022-03-30 10:57:10 +01:00
Andy Wilkinson
64beaba99f Merge branch '2.5.x' into 2.6.x
Closes gh-30475
2022-03-30 10:56:56 +01:00
Andy Wilkinson
c0c32d89a7 Merge pull request #30456 from candrews
* gh-30456:
  Polish "Make MustacheViewResolver bean back off without Spring MVC"
  Make MustacheViewResolver bean back off without Spring MVC

Closes gh-30456
2022-03-30 10:56:47 +01:00
Andy Wilkinson
8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC"
See gh-30456
2022-03-30 10:33:35 +01:00
Craig Andrews
7101b5099f Make MustacheViewResolver bean back off without Spring MVC
See gh-30456
2022-03-30 10:31:44 +01:00
Andy Wilkinson
5a52c2eebc Merge branch '2.7.x' 2022-03-29 16:51:27 +01:00
Andy Wilkinson
24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots
See gh-30463
2022-03-29 16:50:12 +01:00
Andy Wilkinson
42ae55895d Simplify resolution of the application's main class name
Closes gh-30467
2022-03-29 15:51:22 +01:00
Brian Clozel
98cac100c6 Merge branch '2.7.x' 2022-03-29 16:38:12 +02:00
Brian Clozel
93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT
See gh-30463
2022-03-29 16:37:21 +02:00
Brian Clozel
4466a0b041 Upgrade to GraphQL Java 18.0
Closes gh-30464
2022-03-29 16:37:21 +02:00
Andy Wilkinson
fbb060e0fe Polish
See 5d8c1d9bd7.
2022-03-29 15:22:01 +01:00
Andy Wilkinson
d9c2e7c85a Merge branch '2.7.x' 2022-03-29 15:07:08 +01:00
Andy Wilkinson
4722d9d17e Merge branch '2.6.x' into 2.7.x
Closes gh-30470
2022-03-29 15:06:56 +01:00
Andy Wilkinson
880d33f391 Merge branch '2.5.x' into 2.6.x
Closes gh-30469
2022-03-29 15:06:47 +01:00
Andy Wilkinson
05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object)
Closes gh-30468
2022-03-29 15:05:54 +01:00
Andy Wilkinson
5d8c1d9bd7 Merge branch '2.7.x' 2022-03-29 14:30:42 +01:00
Andy Wilkinson
2f3ae02385 Merge branch '2.6.x' into 2.7.x
Closes gh-30466
2022-03-29 14:24:42 +01:00
Andy Wilkinson
8f985474a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30465
2022-03-29 14:24:25 +01:00
Andy Wilkinson
d574563616 Document @ConstructorBinding and @DefaultValue with records
Closes gh-30460
2022-03-29 14:14:28 +01:00
Stephane Nicoll
6865f1f3d9 Merge branch '2.7.x' 2022-03-28 09:47:13 +02:00
Stephane Nicoll
5466444826 Merge branch '2.6.x' into 2.7.x
Closes gh-30450
2022-03-28 09:46:42 +02:00
Stephane Nicoll
e28b59693a Merge pull request #30446 from vikeychen
* pr/30446:
  Update copyright year of changed file
  Remove redundant Javadoc

Closes gh-30446
2022-03-28 09:46:34 +02:00
Stephane Nicoll
5dc4ff5366 Update copyright year of changed file
See gh-30446
2022-03-28 09:46:21 +02:00
Vikey Chen
f9d1c400a7 Remove redundant Javadoc
See gh-30446
2022-03-28 09:45:33 +02:00
Stephane Nicoll
73e2e84402 Merge pull request #30447 from dreis2211
* pr/30447:
  Fix references to JDK 1.8 in READMEs

Closes gh-30447
2022-03-28 09:38:38 +02:00
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