Commit Graph

38021 Commits

Author SHA1 Message Date
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
Phillip Webb
c416c17fe8 Polish documentation title case 2022-10-19 21:53:21 -07:00
Andy Wilkinson
6f787c4b79 Upgrade to Infinispan 13.0.12.Final
Closes gh-32788
2022-10-19 11:44:54 +01:00
Andy Wilkinson
3aa835845e Upgrade to Glassfish JAXB 2.3.7
Closes gh-32787
2022-10-19 11:44:51 +01:00
Andy Wilkinson
ba02a64743 Upgrade to Dependency Management Plugin 1.0.15.RELEASE
Closes gh-32786
2022-10-19 11:44:48 +01:00
Andy Wilkinson
e4822f6915 Merge branch '2.6.x' into 2.7.x 2022-10-19 10:49:48 +01:00
Andy Wilkinson
65bdcdb2a5 Upgrade to Glassfish JAXB 2.3.7
Closes gh-32785
2022-10-19 10:44:06 +01:00
Andy Wilkinson
02760ffee4 Upgrade to Dependency Management Plugin 1.0.15.RELEASE
Closes gh-32784
2022-10-19 10:44:03 +01:00
Andy Wilkinson
a19e394ebb Merge branch '2.6.x' into 2.7.x
Closes gh-32781
2022-10-19 10:00:48 +01:00
Andy Wilkinson
1747c814af Merge pull request #32747 from hpoettker
* gh-32747:
  Upgrade MySQL Connector/J and use new Maven identifiers

Closes gh-32747
2022-10-19 09:58:58 +01:00
Henning Poettker
4ed072a06b Upgrade MySQL Connector/J and use new Maven identifiers
See gh-32747
2022-10-19 09:58:32 +01:00
Phillip Webb
fcaac2b343 Merge branch '2.6.x' into 2.7.x
Closes gh-32777
2022-10-18 17:14:48 -07:00
Phillip Webb
a182cc6f7c Merge pull request #32521 from terminux
* pr/32521:
  Polish 'Use exclamation character for the document separator prefix'
  Use exclamation character for the document separator prefix

Closes gh-32521
2022-10-18 17:14:35 -07:00
Phillip Webb
2c7114fa17 Polish 'Use exclamation character for the document separator prefix'
See gh-32521
2022-10-18 17:08:21 -07:00
Guirong Hu
33e379c4a2 Use exclamation character for the document separator prefix
See gh-32521
2022-10-18 17:07:51 -07:00
Phillip Webb
8dec296dfd Merge branch '2.6.x' into 2.7.x
Closes gh-32775
2022-10-18 15:49:51 -07:00
Phillip Webb
eaf854bd9c Merge pull request #32645 from terminux
* pr/32645:
  Polish 'Add DataSize serializer for configprops endpoint'
  Add DataSize serializer for configprops endpoint

Closes gh-32645
2022-10-18 15:49:42 -07:00
Phillip Webb
de111dba5c Polish 'Add DataSize serializer for configprops endpoint'
See gh-32645
2022-10-18 15:46:56 -07:00
Guirong Hu
3b25132e38 Add DataSize serializer for configprops endpoint
See gh-32645
2022-10-18 15:46:33 -07:00
Phillip Webb
fbd416adc6 Merge branch '2.6.x' into 2.7.x
Closes gh-32773
2022-10-18 15:37:20 -07:00
Phillip Webb
e35de7164e Merge pull request #32770 from YuanHao97
* pr/32770:
  Polish 'Use more specific bean method return types in KafkaAutoConfiguration'
  Use more specific bean method return types in KafkaAutoConfiguration

Closes gh-32770
2022-10-18 15:36:22 -07:00
Phillip Webb
b02c702ad1 Polish 'Use more specific bean method return types in KafkaAutoConfiguration'
See gh-32770
2022-10-18 15:35:37 -07:00