Commit Graph

40139 Commits

Author SHA1 Message Date
Andy Wilkinson
3c9be8bfcc Merge branch '2.7.x'
Closes gh-32801
2022-10-21 11:33:24 +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
bbc5aed6b3 Merge branch '2.7.x' 2022-10-21 11:23:04 +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
965ac59c8c Merge branch '2.7.x' 2022-10-21 11:19:01 +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
a606b26920 Merge branch '2.7.x'
Closes gh-32837
2022-10-21 11:04:52 +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
Moritz Halbritter
e999513838 Add micrometer tracing documentation
Closes gh-30658
2022-10-21 10:04:40 +02:00
Phillip Webb
7ddd1e2bed Merge pull request #29361 from sdeleuze
* pr/32822:
  Provide a workaround to allow multiple @ImportRuntimeHints

Closes gh-29361
2022-10-20 17:13:29 -07:00
Sébastien Deleuze
4e131bd627 Provide a workaround to allow multiple @ImportRuntimeHints
Provide a workaround for spring-projects/spring-framework#29361 so
that multiple `@ImportRuntimeHints` can be used in a type hierarchy.

The commit should cover Actuator web endpoint use cases with the
exception of Cloud Foundry endpoints which are not possible due to
package access issues.

See gh-29361
2022-10-20 17:12:58 -07:00
Phillip Webb
ea094ddba6 Fix package tangles caused by ConfigurationProperties hints
Relocate `ConfigurationPropertiesReflectionHintsProcessor` and refactor
it to be a general purpose `BindableRuntimeHintsRegistrar`.

Prior to this commit, `ConfigurationPropertiesReflectionHintsProcessor`
was used to declare binding hints for classes that were bound, but
might be `@ConfigurationProperties`. By moving and renaming the class,
it's now better aligned to the way it's used.

Support for `@NestedConfigurationProperties` has been implemented by
adding a `@Nestable` meta-annotation. This allow us to create the
appropriate hints, without the `Binder` needing to be directly aware of
the `@NestedConfigurationProperties` annotation.

Closes gh-32815
2022-10-20 17:05:54 -07:00
Phillip Webb
eb1d72e7b7 Merge branch '2.7.x' 2022-10-20 17:05:49 -07: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
Scott Frederick
3eb61bf010 Use Paketo early access buildpack in Paketo native system tests
Closes gh-32828
2022-10-20 17:29:33 -05:00
Phillip Webb
7db93aeb90 Merge branch '2.7.x'
Closes gh-32827
2022-10-20 15:20:15 -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
Scott Frederick
072ce5c151 Fix versions in documentation links
Fixes gh-32772
2022-10-20 14:59:14 -05:00
Scott Frederick
b78b22b6f6 Allow Gradle task property to be set with String or enum value
See gh-32769
2022-10-20 13:59:54 -05:00
Phillip Webb
c53c8c84b8 Fix annotation processor to deal with relocated @ConstructorBinding
Update `ConfigurationMetadataAnnotationProcessor` to use the correct
location for the `@ConstructorBinding` annotation and to deal with
finding it as a meta-annotation.

Closes gh-32660
2022-10-20 10:19:57 -07:00
Scott Frederick
bdedae21c0 Polish native image documentation
See gh-32582
2022-10-20 11:45:10 -05:00
Stephane Nicoll
010891a3c6 Merge branch '2.7.x'
Closes gh-32821
2022-10-20 16:43:25 +02: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
74a8eb7160 Merge branch '2.7.x'
Closes gh-32819
2022-10-20 16:40:30 +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
Andy Wilkinson
482eb49391 Support <import> in logback.xml during AOT processing
See gh-32756
2022-10-20 14:56:25 +01:00
Brian Clozel
685fa900f8 Auto-configure Observation instrumentation for WebFlux
Prior to this commit, Spring Boot would offer a specific Metrics
instrumentation for WebFlux applications through a `WebFilter` and
custom Tag providers.

As of Spring Framework 6.0, the Observation instrumentation is done
directly in WebFlux, also with a `WebFilter`. While this allows both
metrics and traces, some features cannot be supported in the same way
with this new infrastructure.
The former `WebFilter` has been removed and the Tagging infrastructure
deprecated in favor of custom Observation conventions. This commit
provides an adapter layer so that developers can refactor their custom
tagging solution to the convention way, during the deprecation phase,
without losing any feature.

Closes gh-32539
2022-10-20 15:29:31 +02:00
Stephane Nicoll
cda63b541f Upgrade to Spring Framework 6.0.0-RC2
Closes gh-32696
2022-10-20 15:24:51 +02:00
Stephane Nicoll
f0a0af4a71 Merge branch '2.7.x' 2022-10-20 15:24:35 +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
Andy Wilkinson
26e747d2db Fix package tangle in spring-boot-gradle-plugin
Closes gh-32814
2022-10-20 13:12:12 +01:00
Spring Builds
954e874d72 Next development version (v2.6.14-SNAPSHOT) 2022-10-20 09:10:36 +00:00
Stephane Nicoll
04d6840ff3 Polish "Upgrade to Spring Security 6.0.0-RC1"
See gh-32604
2022-10-20 10:50:17 +02:00
Stephane Nicoll
d8ec24b542 Upgrade to Spring Batch 5.0.0-RC1
Closes gh-32618
2022-10-20 10:50:17 +02:00
Stephane Nicoll
d39144232f Upgrade to Spring Session 3.0.0-RC1
Closes gh-32606
2022-10-20 10:50:17 +02:00
Moritz Halbritter
1635f61368 Update GraalVM requirement to 22.3
See gh-32813
2022-10-20 10:36:42 +02:00
Phillip Webb
73a34b6c0a Fix checkstyle issues
See gh-32582
2022-10-20 00:09:07 -07:00
Phillip Webb
e8363d27a6 Merge pull request #32793 from sdeleuze
* pr/32793:
  Remove LogbackConfigurationAotContribution from native image

Closes gh-32793
2022-10-19 23:50:44 -07:00