Phillip Webb
b4283d45c5
Merge branch '2.6.x' into 2.7.x
2022-11-05 17:03:02 -07:00
Phillip Webb
d2cceb6b77
Polish
2022-11-05 17:02:57 -07:00
Phillip Webb
2ab1f49442
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33018
2022-11-05 16:35:26 -07:00
Phillip Webb
caf46043c6
Add @DirtiesUrlFactories annotation
...
Add `@DirtiesUrlFactories` annotation that can be used to reset URL
factories.
Closes gh-33017
2022-11-05 16:30:27 -07:00
Phillip Webb
948893f36d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33015
2022-11-05 16:04:40 -07:00
Phillip Webb
d4cc8fc3a6
Support modified classpath on methods and parameterized tests
...
Update `ModifiedClassPathExtension` and related classes so that
annotations can be used directly on test methods, or on classes
passed into parameterized tests.
Closes gh-33014
2022-11-05 16:04:19 -07:00
Andy Wilkinson
06c83e5345
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32999
2022-11-04 10:42:55 +00:00
Andy Wilkinson
d00e004622
Add missing XMLUnit dependency management
...
Closes gh-32998
2022-11-04 10:42:26 +00:00
Andy Wilkinson
394ae76b04
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32989
2022-11-03 10:44:21 +00:00
Andy Wilkinson
fcd3413ba0
Allow histograms to be disabled for Lettuce metrics
...
Closes gh-32985
2022-11-03 10:34:41 +00:00
Andy Wilkinson
a3870f8da7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32987
2022-11-03 10:23:30 +00:00
Andy Wilkinson
beb62be843
Test Boot's Gradle plugin against Gradle 7.6-rc-1
...
Closes gh-32933
2022-11-03 10:22:14 +00:00
Andy Wilkinson
a814fe958e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32971
2022-11-02 11:32:56 +00:00
Andy Wilkinson
e438721be4
Upgrade to springio/github-changelog-generator 0.0.8
...
Closes gh-32970
2022-11-02 11:32:09 +00:00
Andy Wilkinson
bf4771fe2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32889
2022-11-01 16:58:35 +00:00
Andy Wilkinson
355945faed
Upgrade Java 19 CI image to 19.0.1+11
...
Closes gh-32895
2022-11-01 16:58:13 +00:00
Andy Wilkinson
1859039eea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32890
2022-11-01 16:55:10 +00:00
Andy Wilkinson
17ffa5bd3d
Upgrade CI images to Docker 20.10.21
...
Closes gh-32887
2022-11-01 16:54:49 +00:00
Andy Wilkinson
471e6f9299
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32947
2022-11-01 16:50:58 +00:00
Andy Wilkinson
f881d12441
Merge pull request #32920 from dreis2211
...
* gh-32920:
Upgrade CI image update detection to Ubuntu Jammy
Closes gh-32920
2022-11-01 16:50:47 +00:00
dreis2211
cc23dbe9f7
Upgrade CI image update detection to Ubuntu Jammy
...
See gh-32920
2022-11-01 16:50:30 +00:00
Phillip Webb
f44531a7a2
Merge branch '2.6.x' into 2.7.x
2022-10-25 16:02:04 -07:00
Phillip Webb
92b513dc8d
Polish
2022-10-25 16:01:58 -07:00
Phillip Webb
c8676a81de
Merge branch '2.6.x' into 2.7.x
2022-10-25 15:48:04 -07:00
Phillip Webb
d7ac20cd6c
Update copyright year of changed files
2022-10-25 15:47:30 -07:00
Andy Wilkinson
02457d8103
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32804
2022-10-21 11:38:39 +01:00
Andy Wilkinson
a2cb3c67c3
Upgrade CI images to Docker 20.10.20
...
Closes gh-32810
2022-10-21 11:37:51 +01:00
Andy Wilkinson
8b950bf07c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32803
2022-10-21 11:29:46 +01:00
Andy Wilkinson
de3aa29ab0
Upgrade Java 17 CI to 17.0.5+8
...
Closes gh-32808
2022-10-21 11:29:15 +01:00
Andy Wilkinson
db1e5d1bb5
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32805
2022-10-21 11:22:32 +01:00
Andy Wilkinson
f26cb53fe6
Upgrade Java 11 CI to 11.0.17+7
...
Closes gh-32809
2022-10-21 11:21:49 +01:00
Andy Wilkinson
c8ec176760
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32806
2022-10-21 11:18:09 +01:00
Andy Wilkinson
92ce609b75
Upgrade Java 8 CI to 8.0.352
...
Closes gh-32807
2022-10-21 11:08:59 +01:00
Andy Wilkinson
032487117b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32836
2022-10-21 11:04:09 +01:00
Andy Wilkinson
fe51e03019
Support IPv6 addresses in spring.redis.sentinel.nodes
...
Fixes gh-32762
2022-10-21 10:53:54 +01:00
Phillip Webb
d8c4aec946
Merge branch '2.6.x' into 2.7.x
2022-10-20 17:04:37 -07:00
Phillip Webb
1a14f39f83
Polish
2022-10-20 17:04:29 -07:00
Phillip Webb
1c7bff7cc1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32826
2022-10-20 15:01:00 -07:00
Phillip Webb
463a614d27
Fix package tangle between SpringApplication and Environment types
...
Update `SpringApplication` so that it no longer directly decides the
type of `Environment` that should be created.
Closes gh-32825
2022-10-20 14:51:13 -07:00
Stephane Nicoll
7bd9754ce1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32820
2022-10-20 16:43:14 +02:00
Stephane Nicoll
81beb2e0c6
Merge pull request #32812 from jamessoun93
...
* pr/32812:
Fix typos in logging.adoc
Closes gh-32812
2022-10-20 16:42:05 +02:00
James Seung Hyun Son
5e0a67ac66
Fix typos in logging.adoc
...
See gh-32812
2022-10-20 16:41:24 +02:00
Stephane Nicoll
13691f27bd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32818
2022-10-20 16:37:57 +02:00
Stephane Nicoll
ea97e4ab87
Merge pull request #32644 from eurythmia
...
* pr/32644:
Upgrade copyright year of changed files
Harmonize ConfigurationProperties code samples
Closes gh-32644
2022-10-20 16:36:04 +02:00
Stephane Nicoll
4d7cb7144e
Upgrade copyright year of changed files
...
See gh-32644
2022-10-20 16:35:55 +02:00
Ada-Claire
c5a1944267
Harmonize ConfigurationProperties code samples
...
Rename the SomeProperties class so that it is consistent with other
examples given within the Type-safe Configuration Properties. This
ensures that readers can intuitively draw the conclusion that the
MyProperties class is annotated with ConfigurationProperties.
See gh-32644
2022-10-20 16:35:18 +02:00
Stephane Nicoll
6eb999828f
Merge branch '2.6.x' into 2.7.x
2022-10-20 15:24:15 +02:00
Spring Builds
dfac9ecd27
Next development version (v2.7.6-SNAPSHOT)
2022-10-20 13:12:06 +00:00
Spring Builds
954e874d72
Next development version (v2.6.14-SNAPSHOT)
2022-10-20 09:10:36 +00:00
Phillip Webb
d3750c4991
Merge branch '2.6.x' into 2.7.x
2022-10-19 22:01:13 -07:00