Commit Graph

31946 Commits

Author SHA1 Message Date
Stephane Nicoll bffa26fefa Upgrade to AppEngine SDK 1.9.88
Closes gh-25953
2021-04-09 14:02:17 +02:00
Stephane Nicoll d50e581403 Start building against Micrometer 1.7.0-RC1 snapshots
See gh-25934
2021-04-09 13:44:32 +02:00
Stephane Nicoll 555a3a79cb Start building against Spring WS 3.1.0-RC1 snapshots
See gh-25933
2021-04-09 13:40:17 +02:00
Stephane Nicoll 1f357f62cf Start building against Spring Session 2021.0.0-RC1 snapshots
See gh-25932
2021-04-09 13:40:17 +02:00
Stephane Nicoll fee62c41b9 Start building against Spring Security 5.5.0-RC1 snapshots
See gh-25931
2021-04-09 13:40:17 +02:00
Stephane Nicoll 03f2054984 Start building against Spring Kafka 2.7.0 snapshots
See gh-25930
2021-04-09 13:40:17 +02:00
Stephane Nicoll 3ee6a945ec Start building against Spring Data 2021.0.0 snapshots
See gh-25928
2021-04-09 12:43:14 +02:00
Stephane Nicoll 6bf6136aaf Upgrade to Jedis 3.6.0-RC1
Closes gh-25950
2021-04-09 12:43:13 +02:00
Stephane Nicoll b4ca1b9112 Start building against Spring HATEOAS 1.3.0 snapshots
See gh-25927
2021-04-09 08:57:16 +02:00
Stephane Nicoll 4290e0792b Start building against Spring Framework 5.3.6 snapshots
See gh-25926
2021-04-09 08:56:37 +02:00
Phillip Webb 7a636e5c08 Update @Timed WebFlux documentation
Closes gh-23112
2021-04-08 23:15:44 -07:00
Phillip Webb 78aa5236a7 Merge pull request #23112 from anshlykov
* pr/23112:
  Polish 'Support @Timed annotation for WebFlux'
  Support @Timed annotation for WebFlux

Closes gh-23112
2021-04-08 23:04:11 -07:00
Phillip Webb 15fe41868e Polish 'Support @Timed annotation for WebFlux'
Extract common method logic to a `HandlerMethodTimedAnnotations`
utility class and also add some caching. Also move the test code
into a single class.

See gh-23112
2021-04-08 23:01:21 -07:00
anshlykov 4ff4a9b082 Support @Timed annotation for WebFlux
Update `MetricsWebFilter` to support `@Timed` annotations on the WebFlux
handler methods or beans.

See gh-23112
2021-04-08 23:00:08 -07:00
Phillip Webb 816bd1462a Merge pull request #24490 from mederel
* pr/24490:
  Polish 'Support system-dependent path separators'
  Support system-dependent path separators

Closes gh-24490
2021-04-08 20:51:05 -07:00
Phillip Webb 7056a95ffc Polish 'Support system-dependent path separators'
See gh-24490
2021-04-08 20:49:02 -07:00
mederel f918a46ea2 Support system-dependent path separators
Update `StandardConfigDataLocationResolver` so that it recognizes
both `/` and `File.separator` suffixes as directories.

Prior to this commit, working with directories on Windows was awkward
since the path separator is `\`. If a directory were specified in the
form `c:\config\`, an exception was raised complaining it did not end
with '/'.

See gh-24490
2021-04-08 20:42:35 -07:00
Phillip Webb 6ad100eae6 Short circuit already covered property sources
Add an alternative `PropertySourcesPropertyResolver` that can short
circuit resolution of properties that are already covered by the
`ConfigurationPropertySourcesPropertySource`.

Prior to this commit, calling `getProperty` or `containsProperty` on an
`Environment` that has `ConfigurationPropertySources` attached could
result in two identical calls to the underlying source. The first call
would be via the adapted source, and the second would be direct. Since
we can now plug-in a custom `PropertySourcesPropertyResolver` to the
`Environment`, we can optimize resolution so that calls happen only
once.

Closes gh-17400
2021-04-08 20:29:54 -07:00
Phillip Webb 1d302f4c63 Add customer Application Environment subclasses
Add custom `ApplicationEnvironment`, `ApplicationServletEnvironment`
and `ApplicationReactiveWebEnvironment` subclasses for use with
`SpringApplication`. The subclasses all disable the resolution of
active and default profiles using properties since this is handled
directly by the `ConfigDataEnvironmentPostProcessor`.

Closes gh-24892
See gh-24890
2021-04-08 20:29:48 -07:00
Phillip Webb d938dd97bf Add with/without methods to ConfigData.Options
Add convenience methods to ConfigData.Options to allow new Options
instances to be created with options excluded or included.

See gh-25766
2021-04-08 13:21:14 -07:00
Scott Frederick 86303c017b Merge branch '2.4.x'
Closes gh-25938
2021-04-08 13:03:45 -05:00
Scott Frederick 9108b81bb2 Merge branch '2.3.x' into 2.4.x
Closes gh-25937
2021-04-08 13:03:26 -05:00
Scott Frederick 0ad7f76263 Preserve file permissions in images built by Gradle
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
2021-04-08 12:56:41 -05:00
Stephane Nicoll 5ca4cc9c56 Merge branch '2.4.x' 2021-04-08 18:42:17 +02:00
Brian Clozel 0929048bb4 Link build tools docs version properties section
Closes gh-25935
2021-04-08 18:18:11 +02:00
Stephane Nicoll 5aa1e683c0 Start building against Spring Session 2020.0.4 snapshots
See gh-25912
2021-04-08 18:02:04 +02:00
Stephane Nicoll 0f53663cf6 Start building against Spring Security 5.4.6 snapshots
See gh-25911
2021-04-08 18:02:03 +02:00
Stephane Nicoll aa8f5433ee Start building against Spring Data 2020.0.8 snapshots
See gh-25910
2021-04-08 18:02:03 +02:00
Stephane Nicoll f1b2db03e0 Start building against Spring Framework 5.3.6 snapshots
See gh-25909
2021-04-08 18:02:03 +02:00
Brian Clozel b4d2207902 Merge branch '2.4.x'
Closes gh-25936
2021-04-08 17:45:42 +02:00
Brian Clozel a0ee0601ef Fix SSL configuration with Reactor Netty
Prior to this commit, the SslServerCustomizer would use a Reactor Netty
API that lets users customize the SSL configuration, but later override
some of the choices with defaults.

This commits moves from the new deprecated Reactor Netty API and instead
uses a new variant that builds the defaults and lets developers override
them if they want to.

Fixes gh-25913
2021-04-08 17:09:31 +02:00
Stephane Nicoll b52902e92a Merge branch '2.4.x'
Closes gh-25923
2021-04-08 10:14:03 +02:00
Stephane Nicoll c6205f10f1 Merge branch '2.3.x' into 2.4.x
Closes gh-25922
2021-04-08 10:13:45 +02:00
Stephane Nicoll 1d61da1786 Merge pull request #25884 from alex-bel-apica
* pr/25884:
  Polish "Properly close input streams when loading key stores"
  Properly close input streams when loading key stores

Closes gh-25884
2021-04-08 10:12:38 +02:00
Stephane Nicoll 25b7495d8e Polish "Properly close input streams when loading key stores"
See gh-25884
2021-04-08 09:25:03 +02:00
Alex Belyaev 1e3f5c342b Properly close input streams when loading key stores
See gh-25884
2021-04-08 09:21:58 +02:00
Stephane Nicoll 152ce5f780 Upgrade Ubuntu version in CI images
Closes gh-25917
2021-04-08 08:22:13 +02:00
Stephane Nicoll 5e2a611742 Merge branch '2.4.x' 2021-04-08 08:21:04 +02:00
Stephane Nicoll 4d52fe6db4 Upgrade Ubuntu version in CI images
Closes gh-25918
2021-04-08 08:20:52 +02:00
Stephane Nicoll 8565728a89 Merge branch '2.3.x' into 2.4.x 2021-04-08 08:19:44 +02:00
Stephane Nicoll 2ac160a9b8 Upgrade Ubuntu version in CI images
Closes gh-25916
2021-04-08 08:19:05 +02:00
Stephane Nicoll aae524766f Merge branch '2.4.x' 2021-04-08 08:05:54 +02:00
Stephane Nicoll f5009cb0a8 Merge branch '2.3.x' into 2.4.x 2021-04-08 08:05:35 +02:00
Phillip Webb e4164d0143 Fix package tangle in endpoint package
Fix package tangle in the actuator endpoint package by relocating a
few classes.

The `Producible` and `ProducibleOperationArgumentResolver` classes have
been moved from `endpoint.annotation` to `endpoint` since they aren't
directly tied to annotations.

The `ApiVersion` class has been moved from `endpoint.http` to
`endpoint` since it needs to implement `Producible` and isn't really
tied to HTTP.

Closes gh-25914
2021-04-07 16:54:37 -07:00
Phillip Webb e766c8b3a7 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
2021-04-07 15:17:02 -07:00
Phillip Webb ab8e599cfe Switch default MVC path matching strategy
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
2021-04-07 11:02:45 -07:00
Phillip Webb 455864bfa0 Allow 'servet.path' with path pattern parser
Remove the restriction previously prevented `spring.mvc.servlet.path`
from being combined with a `spring.mvc.pathmatch.matching-strategy`
of `PATH_PATTERN_PARSER`. Spring Framework supports this combination
as of v5.3.4.

See gh-24805
2021-04-07 10:59:55 -07:00
Stephane Nicoll 2a60503849 Start building against Spring Session Dragonfruit-SR3 snapshots
See gh-25907
2021-04-07 15:43:12 +02:00
Stephane Nicoll e4bf730f0b Start building against Spring Security 5.3.9 snapshots
See gh-25906
2021-04-07 15:42:42 +02:00
Stephane Nicoll b12a725977 Start building against Spring Data Neumann-SR9 snapshots
See gh-25905
2021-04-07 15:42:07 +02:00