Scott Frederick
576b72a7a1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30877
2022-05-05 15:37:29 -05:00
Scott Frederick
6098b0c91f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30876
2022-05-05 15:36:57 -05:00
Scott Frederick
8fe47aaebd
Remove smoke tests that do nothing without a server
...
Fixes gh-30875
2022-05-05 15:35:38 -05:00
Andy Wilkinson
2b4f042325
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30874
2022-05-05 10:19:19 +01:00
Andy Wilkinson
c9571a04ab
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30873
2022-05-05 10:19:01 +01:00
Andy Wilkinson
8cd3b86e5c
Merge pull request #30505 from terminux
...
* gh-30505:
Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
Fix ConditionalOnProperty when used in an aliased composed annotation
Closes gh-30505
2022-05-05 10:18:50 +01:00
Andy Wilkinson
6d4f0232ca
Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
...
See gh-30505
2022-05-05 10:02:27 +01:00
Guirong Hu
dc57ad54d5
Fix ConditionalOnProperty when used in an aliased composed annotation
...
See gh-30505
2022-05-05 10:02:15 +01:00
Andy Wilkinson
3717b558a0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30868
2022-05-05 09:40:02 +01:00
Andy Wilkinson
366dd9a2aa
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30869
2022-05-05 09:38:46 +01:00
Andy Wilkinson
09ec409184
Upgrade CI images to ubuntu:focal-20220426
...
Closes gh-30871
2022-05-05 09:33:35 +01:00
Brian Clozel
5352c441e1
Do not use application/graphql as default MIME type
...
As seen in spring-projects/spring-graphql#375 , Spring Boot should also
use "application/json" as the default MIME type but remain compatible
with "application/graphql+json" still if clients POST content with this
type or explicitly accept it.
Closes gh-30860
2022-05-04 13:05:45 +02:00
Brian Clozel
31cabba828
Switch to Spring for GraphQL 1.0.0-SNAPSHOT
...
See gh-30858
2022-05-04 13:05:45 +02:00
Brian Clozel
ecd7c21493
Upgrade to GraphQL Java 18.1
...
Closes gh-30859
2022-05-04 13:05:45 +02:00
Andy Wilkinson
23f89f0d1e
Switch to a same minor version upgrade policy
...
Closes gh-30857
2022-05-04 10:34:50 +01:00
Andy Wilkinson
d819aba0b9
Upgrade to Selenium 4.1.3
...
Closes gh-30730
2022-05-04 10:04:36 +01:00
Andy Wilkinson
c596afd03a
Upgrade to Selenium HtmlUnit 3.61.0
...
Closes gh-30855
2022-05-04 10:04:11 +01:00
Andy Wilkinson
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson
111dfd8911
Merge pull request #30773 from marcwrobel
...
* gh-30773:
Polish "Fix typos"
Fix typos
Closes gh-30773
2022-05-03 14:10:06 +01:00
Andy Wilkinson
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson
8782e4122c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30848
2022-05-03 13:55:09 +01:00
Andy Wilkinson
b20a8bd778
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30847
2022-05-03 13:54:59 +01:00
Andy Wilkinson
561526f802
Merge branch 'gh-30844' into 2.5.x
...
Closes gh-30844
2022-05-03 13:54:31 +01:00
Andy Wilkinson
798d61fcf0
Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
...
See gh-30844
2022-05-03 13:54:13 +01:00
dugenkui03
aeaad006cd
Make event handling in ClassPathFileSystemWatcherTests thread-safe
...
See gh-30844
2022-05-03 13:52:55 +01:00
Andy Wilkinson
8044df277b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30846
2022-05-03 13:51:49 +01:00
Andy Wilkinson
a8b5a1c688
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30845
2022-05-03 13:51:38 +01:00
Andy Wilkinson
e08483f495
Merge pull request #30705 from dugenkui03
...
* gh-30705:
Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
Make event handling in JobExecutionExitCodeGenerator thread-safe
Closes gh-30705
2022-05-03 13:49:33 +01:00
Andy Wilkinson
026b9e2efe
Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
...
See gh-30705
2022-05-03 13:49:12 +01:00
dugenkui03
c8d1dfebab
Make event handling in JobExecutionExitCodeGenerator thread-safe
...
See gh-30705
2022-05-03 13:48:15 +01:00
Andy Wilkinson
61cd05f74b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30842
2022-05-03 11:29:03 +01:00
Andy Wilkinson
f1b5f36af8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30841
2022-05-03 11:28:53 +01:00
Andy Wilkinson
7cf37cae43
Merge pull request #30824 from eddumelendez
...
* gh-30824:
Polish "Polish InfluxMetricsExportAutoConfiguration"
Polish InfluxMetricsExportAutoConfiguration
Closes gh-30824
2022-05-03 09:51:03 +01:00
Andy Wilkinson
f8e5a534a6
Polish "Polish InfluxMetricsExportAutoConfiguration"
...
See gh-30824
2022-05-03 09:50:51 +01:00
Eddú Meléndez
b0d5364efa
Polish InfluxMetricsExportAutoConfiguration
...
See gh-30824
2022-05-03 09:50:06 +01:00
Andy Wilkinson
fb121a1d40
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30836
2022-04-29 11:01:55 +01:00
Andy Wilkinson
de1cda786e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30835
2022-04-29 11:01:37 +01:00
Andy Wilkinson
d338df513a
Avoid stale inputs by using sync rather than copy
...
Closes gh-30829
2022-04-29 11:00:25 +01:00
Andy Wilkinson
cbc4e77b04
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30810
2022-04-28 10:14:03 +01:00
Andy Wilkinson
c7117f8f57
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30813
2022-04-28 10:13:31 +01:00
Andy Wilkinson
b5167a46ac
Upgrade Java 18 CI image to jdk-18.0.1+10
...
Closes gh-30817
2022-04-28 10:12:54 +01:00
Andy Wilkinson
bcd5c59373
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30805
2022-04-28 10:10:41 +01:00
Andy Wilkinson
e2bfddb5d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30821
2022-04-28 10:10:01 +01:00
Andy Wilkinson
400dc5261c
Upgrade Java 17 CI image to jdk-17.0.3+7
...
Closes gh-30807
2022-04-28 10:09:12 +01:00
Andy Wilkinson
692caea73b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30809
2022-04-28 10:07:34 +01:00
Andy Wilkinson
dd23222d3f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30820
2022-04-28 10:06:56 +01:00
Andy Wilkinson
7bd6805bc0
Upgrade Java 11 CI image to jdk-11.0.15+10
...
Closes gh-30818
2022-04-28 10:06:30 +01:00
Andy Wilkinson
55ee74fe60
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30808
2022-04-28 10:04:12 +01:00