Commit Graph

50613 Commits

Author SHA1 Message Date
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
Stephane Nicoll
80e893ebae Upgrade to Spring HATEOAS 1.1.5
Closes gh-25904
2021-04-07 15:41:34 +02:00
Stephane Nicoll
aab5859fde Start building against Spring Framework 5.2.14 snapshots
See gh-25903
2021-04-07 15:41:17 +02:00
Stephane Nicoll
ac1117f1a1 Start building against Reactor Reactor Dysprosium-SR19
See gh-25902
2021-04-07 15:40:40 +02:00
Andy Wilkinson
4d510d3c9b Merge pull request #25829 from jdubois
* gh-25829:
  Polish "Add detection of Azure App Service to CloudPlatform"
  Add detection of Azure App Service to CloudPlatform

Closes gh-25829
2021-04-07 13:45:52 +01:00
Andy Wilkinson
4d31182123 Polish "Add detection of Azure App Service to CloudPlatform"
See gh-25829
2021-04-07 12:34:54 +01:00
Julien Dubois
98a1017ee7 Add detection of Azure App Service to CloudPlatform
See gh-25829
2021-04-07 12:34:49 +01:00
Andy Wilkinson
660dc5fcd7 Merge branch '2.4.x'
Closes gh-25900
2021-04-07 12:24:33 +01:00
Andy Wilkinson
8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
2021-04-07 12:24:07 +01:00
Andy Wilkinson
7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
2021-04-07 11:43:39 +01:00
Andy Wilkinson
8b5f914ba5 Revert "Merge branch '2.4.x'"
This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840
2021-04-07 10:20:23 +01:00
Andy Wilkinson
58a9fb4027 Merge branch '2.4.x' 2021-04-07 10:20:05 +01:00
Andy Wilkinson
e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
2021-04-07 10:19:20 +01:00
Andy Wilkinson
8048e59fa9 Merge branch '2.3.x' into 2.4.x 2021-04-07 10:18:34 +01:00
Andy Wilkinson
b35d1ec6e8 Revert "Use test harness for image building integration tests"
This reverts commit da9d8d6055.

See gh-25838
2021-04-07 09:30:51 +01:00
Phillip Webb
a24199bbcc Merge branch '2.4.x' 2021-04-06 23:08:05 -07:00
Phillip Webb
2971bdd9e3 Merge branch '2.3.x' into 2.4.x 2021-04-06 23:07:53 -07:00
Phillip Webb
51d57e19d0 Attempt to overcome Docker rate limiting on CI
Update the common build script to pull buildpack images early using the
authenticated CLI.

See gh-25838
2021-04-06 23:04:28 -07:00
Phillip Webb
72ccab0aad Fix WebSessionManager auto-configuration order
Auto-configure `SessionAutoConfiguration` before
`WebFluxAutoConfiguration` to ensure that the correct
`WebSessionManager` bean is created.

See gh-20970
2021-04-06 22:43:42 -07:00
Phillip Webb
807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Phillip Webb
4b05dbf4a2 Polish 2021-04-06 14:59:13 -07:00
Andy Wilkinson
e7314623cb Merge pull request #25815 from parviz-93
* gh-25815:
  Polish "Add config props for keep-alive timeout and max keep-alive reqs"
  Add config props for keep-alive timeout and max keep-alive reqs

Closes gh-25815
2021-04-06 20:32:25 +01:00
Andy Wilkinson
1994219399 Polish "Add config props for keep-alive timeout and max keep-alive reqs"
See gh-25815
2021-04-06 20:32:18 +01:00
Parviz Rozikov
34b94d8898 Add config props for keep-alive timeout and max keep-alive reqs
See gh-25815
2021-04-06 20:32:18 +01:00
Brian Clozel
dc6b5badb8 Add SameSite session cookie config property for WebFlux
This commit adds a new `spring.webflux.session.cookie.same-site`
confuguration property that sets the default value for the "SameSite"
attribute in the WebFlux session cookies.

Closes gh-20970
2021-04-06 21:29:47 +02:00
Andy Wilkinson
5b111093c6 Merge branch '2.4.x'
Closes gh-25896
2021-04-06 19:39:05 +01:00
Andy Wilkinson
1e4f130133 Merge branch '2.3.x' into 2.4.x
Closes gh-25895
2021-04-06 19:37:27 +01:00
Andy Wilkinson
76f74482d4 Make Asciidoctor tasks run when Java examples are updated
Closes gh-25892
2021-04-06 19:35:38 +01:00
Andy Wilkinson
87dd329eba Merge pull request #23990 from bono007
* gh-23990:
  Polish "Auto-configure Mongo metrics"
  Auto-configure Mongo metrics

Closes gh-23990
2021-04-06 18:16:13 +01:00
Andy Wilkinson
73e1dd8728 Polish "Auto-configure Mongo metrics"
See gh-23990
2021-04-06 18:15:09 +01:00
bono007
81c18214d1 Auto-configure Mongo metrics
See gh-23990
2021-04-06 16:58:39 +01:00
Andy Wilkinson
ef986b13e5 Polish Quartz endpoint documentation
See gh-10364
2021-04-06 16:56:17 +01:00
Stephane Nicoll
a07c8e6e18 Merge pull request #10364 from vpavic
* pr/10364:
  Polish "Add Quartz actuator endpoint"
  Add Quartz actuator endpoint

Closes gh-10364
2021-04-06 12:20:44 +02:00
Stephane Nicoll
b11602aeaa Polish "Add Quartz actuator endpoint"
This commit reworks the initial proposal so that jobs and triggers are
treated as first class concepts.

`/actuator/quartz` now returns the group names for jobs and triggers.

`actuator/quartz/jobs` returns the job names, keyed by the available
group names, while `/actuator/quartz/triggers` does the same for
triggers.

`/actuator/jobs/{groupName}` provides an overview of a job group. It
provides a map of job names with the class name of the job.
implementation

`/actuator/triggers/{groupName}` provides an overview of a trigger
group. There are five supported trigger implementations: cron, simple,
daily time interval, calendar interval, and custom for any other
implementation. Given that each implementation has specific settings,
triggers are split in five objects.

`/actuator/jobs/{groupName}/{jobName}` provides the full details of a
particular job. This includes a sanitized data map and a list of
triggers ordered by next fire time.

`/actuator/triggers/{groupName}/{triggerName}` provides the full details
of a particular trigger. This includes the state, its type, and a
dedicate object containing implementation-specific settings.

See gh-10364
2021-04-06 12:13:28 +02:00