Phillip Webb
8cf63a28b8
Update AOT work to latest Framework code
2022-05-05 15:19:33 -07:00
Scott Frederick
88250f92bd
Adapt to changes in Spring Kafka snapshots
...
See gh-30645
2022-05-05 17:17:23 -05:00
Scott Frederick
4f3771f88a
Merge branch '2.7.x'
2022-05-05 16:08:18 -05:00
Scott Frederick
7f4b78469e
Merge branch '2.6.x' into 2.7.x
2022-05-05 15:59:37 -05:00
Scott Frederick
51343139c2
Remove empty files
...
See gh-30875
2022-05-05 15:58:55 -05:00
Scott Frederick
03d17dd04a
Merge branch '2.7.x'
2022-05-05 15:39:27 -05:00
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
Madhura Bhave
7a0e5a032d
Delete unused test configuration files
...
These files were used by the legacy ConfigFileApplicationListener tests
and are no longer needed
2022-05-05 11:57:37 -07:00
Madhura Bhave
8d6b442dc4
Remove support for spring.profiles
...
Closes gh-22523
2022-05-05 11:57:37 -07:00
Andy Wilkinson
573fc34e29
Merge branch '2.7.x'
2022-05-05 10:19:32 +01: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
a201a07b2e
Merge branch '2.7.x'
...
Closes gh-30870
2022-05-05 09:42:00 +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
Scott Frederick
2369ce4195
Remove dependency management for AppEngine SDK
...
Closes gh-30638
2022-05-04 16:31:00 -05:00
Andy Wilkinson
1ee079c265
Reinstate support for pooled-jms as it is now JMS 3.0 compatible
...
Closes gh-30865
2022-05-04 18:04:02 +01:00
Brian Clozel
24dcdbb4a1
Merge branch '2.7.x'
2022-05-04 13:06:36 +02: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
f12dcb51ab
Merge pull request #29429 from dangzhicairang
...
* gh-29429:
Polish "Provide callback mechanism for customizing validation configuration"
Provide callback mechanism for customizing validation configuration
Closes gh-29429
2022-05-04 11:58:40 +01:00
Andy Wilkinson
0e00fafe38
Polish "Provide callback mechanism for customizing validation configuration"
...
See gh-29429
2022-05-04 11:45:39 +01:00
当智才让
76a1c6bcaa
Provide callback mechanism for customizing validation configuration
...
See gh-29429
2022-05-04 11:36:59 +01:00
Andy Wilkinson
f3aa5d0773
Merge pull request #30776 from TheCK
...
* gh-30776:
Polish "Add a configuration property for Kafka's async acks"
Add a configuration property for Kafka's async acks
Closes gh-30776
2022-05-04 11:01:55 +01:00
Andy Wilkinson
d36b63dae6
Polish "Add a configuration property for Kafka's async acks"
...
See gh-30776
2022-05-04 10:44:38 +01:00
TheCK
52c3f1c7ef
Add a configuration property for Kafka's async acks
...
See gh-30776
2022-05-04 10:37:22 +01:00
Andy Wilkinson
d9e9ab0660
Merge branch '2.7.x'
2022-05-04 10:35:31 +01: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
b4e42109d0
Merge branch '2.7.x'
2022-05-04 10:34:15 +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
Scott Frederick
7dd8dfc197
Handle zero-offset timezone in logging test
...
See gh-28654
2022-05-03 17:48:09 -05:00
Scott Frederick
7f395941c7
Add timezone offset to default logging date format patterns
...
Closes gh-28654
2022-05-03 17:09:27 -05:00
Andy Wilkinson
541ab69aff
Merge branch '2.7.x'
2022-05-03 15:18:20 +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
f35e5195ad
Merge branch '2.7.x'
2022-05-03 13:55:20 +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