Commit Graph

28674 Commits

Author SHA1 Message Date
Phillip Webb
0ec8d281ef Align TldPatterns with Tomcat default
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.

Closes gh-25764
2021-03-23 12:46:27 -07:00
Andy Wilkinson
62023104de Test auto-configured MockRestServiceServer with metrics and a root URI
Closes gh-25741
2021-03-23 14:37:37 +00:00
Andy Wilkinson
bf6f36a783 Apply any root URI to RestTemplate metric's URI tag
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.

This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.

Fixes gh-25744
2021-03-23 13:05:54 +00:00
Andy Wilkinson
f8c1a73bf2 Prevent import of Micrometer class outside of the Actuator
Closes gh-25760
2021-03-23 10:16:42 +00:00
Stephane Nicoll
2b29b99984 Merge pull request #25129 from bono007
* pr/25129:
  Polish "Take JPA database action into account when setting ddlAuto"
  Take JPA database action into account when setting ddlAuto

Closes gh-25129
2021-03-22 14:44:10 +01:00
Stephane Nicoll
c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007
674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Scott Frederick
e4fa39df01 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson
4358d9bc39 Update CI to use Artifactory Resource 0.0.14
Closes gh-25698
2021-03-17 17:37:09 +00:00
Stephane Nicoll
6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:09:37 +01:00
Andy Wilkinson
0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson
ae2ff7849b Revert "Fail fast when finalName is misconfigured"
This reverts commit 263b7c20e4.

See gh-25590
2021-03-17 11:11:24 +00:00
Scott Frederick
263b7c20e4 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-16 17:22:48 -05:00
Andy Wilkinson
f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
2021-03-16 20:24:45 +00:00
Andy Wilkinson
2359b37e69 Polish 2021-03-16 19:43:35 +00:00
Andy Wilkinson
bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr
Closes gh-25345
2021-03-16 19:09:38 +00:00
Andy Wilkinson
017dbe608f Merge pull request #25620 from uc4w6c
* gh-25620:
  Polish "Improve error message when no resources exist at a script location"
  Improve error message when no resources exist at a script location

Closes gh-25620
2021-03-16 16:34:28 +00:00
Andy Wilkinson
a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito
42841b895f Improve error message when no resources exist at a script location
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson
226ee61dea Create exception reporters when needed so they pick up current state
Fixes gh-25691
2021-03-16 16:13:40 +00:00
Madhura Bhave
df1d1dbaa9 Fallback to BeanPropertyBindingResult for unbound property validation
gh-17424 updated `ValidationBindHandler` so that it would
only look at bound values when validating. This commit updates
`ValidationBindHandler` to use Spring Framework's `BeanPropertyBindingResult`.
This means that for fields that are not bound, JavaBean accessor methods can
be used to get the value to validate.

Fixes gh-25356
2021-03-12 13:56:54 -08:00
Andy Wilkinson
df97627b21 Merge pull request #25480 from maruoovv
* gh-25480:
  Correct javadoc for ON_PARAM

Closes gh-25480
2021-03-11 11:12:42 +00:00
maruoovv
b401be1589 Correct javadoc for ON_PARAM
See gh-25480
2021-03-11 11:12:04 +00:00
Andy Wilkinson
3f241b6b73 Upgrade CI images to ubuntu:focal-20210217
Closes gh-25593
2021-03-11 09:49:12 +00:00
Andy Wilkinson
911cb21a3e Merge pull request #25597 from bal360
* gh-25597:
  Fix typos in README

Closes gh-25597
2021-03-11 09:39:28 +00:00
Blake A. Long
6da00dfed8 Fix typos in README
See gh-25597
2021-03-11 09:38:54 +00:00
Andy Wilkinson
94e17d23ef Create issue for each forward merge found in commit message
Closes gh-25586
2021-03-10 17:30:15 +00:00
Andy Wilkinson
4d3d56abfe Try to stabilize SampleSessionWebFluxApplicationTests
userDefinedMappingsSecureByDefault in
SampleSessionWebFluxApplicationTests may fail with an NPE if the
session times out before the initial response is sent due to the absence
of a SESSION cookie in the response. The test uses a short session
timeout (2 seconds) and we've seen the problem occur on CI when,
presumably, a noisy neighbour has caused some CPU starvation.

This commit increases the timeout to 5 seconds to reduce the chance of
a short period of CPU starvation causing the test to fail.

Closes gh-25572
2021-03-10 14:06:40 +00:00
Stephane Nicoll
f38e863fbc Properly subscribe to CloseableConnectionFactory#close
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll
c8101f8c9b Remove host name in R2DBC's embedded H2 url
Closes gh-25560
2021-03-10 13:24:08 +01:00
Andy Wilkinson
3e9341fbb4 Start using Spring Asciidoctor 0.5.1 snapshots
See gh-25558
2021-03-09 10:59:26 +00:00
Andy Wilkinson
b76a9951e9 Polish RSocketServerAutoConfiguration 2021-03-09 09:25:34 +00:00
Andy Wilkinson
84637acbdc Make embedded RSocket server back off without spring-web
Fixes gh-25551
2021-03-09 08:53:25 +00:00
Stephane Nicoll
034e7d4f7d Merge pull request #25507 from brenuart
* pr/25507:
  Polish "Include properties in source merge algorithm"
  Include properties in source merge algorithm

Closes gh-25507
2021-03-05 15:47:17 +01:00
Stephane Nicoll
6ebc69d704 Polish "Include properties in source merge algorithm"
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart
cf4bc6e9e0 Include properties in source merge algorithm
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
2021-03-05 15:47:09 +01:00
Andy Wilkinson
c62367e8c4 Merge pull request #25375 from cdalexndr
* gh-25375:
  Polish "Improve documentaion of Mockito test execution listeners"
  Improve documentaion of Mockito test execution listeners

Closes gh-25375
2021-03-05 14:15:03 +00:00
Andy Wilkinson
22b73f3020 Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
2021-03-05 14:14:36 +00:00
cdalexndr
72562e0fd4 Improve documentaion of Mockito test execution listeners
See gh-25375
2021-03-05 12:49:18 +00:00
Andy Wilkinson
8b5c345d49 Merge pull request #25486 from cdalexndr
* gh-25486:
  Polish "Make link to Actuator API docs more prominent"
  Make link to Actuator API docs more prominent

Closes gh-25486
2021-03-05 10:59:07 +00:00
Andy Wilkinson
92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr
5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Andy Wilkinson
1ac9b3fac2 Merge pull request #25505 from trungPa
* gh-25505:
  Polish "Prevent extracting zip entries outside of destination path"
  Prevent extracting zip entries outside of destination path

Closes gh-25505
2021-03-05 10:38:19 +00:00
Andy Wilkinson
c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path"
See gh-25505
2021-03-05 10:13:32 +00:00
trungPa
2993e68715 Prevent extracting zip entries outside of destination path
See gh-25505
2021-03-05 10:12:06 +00:00
Andy Wilkinson
da3920bd46 Wait for process to exit to avoid race with file deletion
See gh-25457
2021-03-03 17:55:37 +00:00
Andy Wilkinson
c5cfb8750b Delete files after destroying processes that may be accessing them
Closes gh-25457
2021-03-03 16:42:49 +00:00
Stephane Nicoll
8e67ae7113 Fix fallback fork value for spring-boot:stop
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
2021-03-03 15:15:04 +01:00
Andy Wilkinson
14948cb12e Merge pull request #25457 from dreis2211
* gh-25457:
  Speed up spring-boot-server-tests

Closes gh-25457
2021-03-03 13:46:20 +00:00
dreis2211
b0a6e92fb6 Speed up spring-boot-server-tests
See gh-25457
2021-03-03 13:34:41 +00:00