Commit Graph

27673 Commits

Author SHA1 Message Date
Phillip Webb
507fae5141 Merge branch '2.2.x' into 2.3.x
Closes gh-23258
2020-09-11 18:45:05 -07:00
Phillip Webb
018cc1c84a Merge pull request #23256 from lock14
* pr/23256:
  Polish 'Allow other "timestamp" types in MVC error model'
  Allow other "timestamp" types in MVC error model

Closes gh-23256
2020-09-11 18:44:27 -07:00
Phillip Webb
d8232b3c21 Polish 'Allow other "timestamp" types in MVC error model'
See gh-23256
2020-09-11 18:44:04 -07:00
lock14
d1d953819a Allow other "timestamp" types in MVC error model
Remove casting "timestamp" to `java.util.Date` in
`ErrorMvcAutoConfiguration` as the cast is not necessary and it
prevents other types (e.g. `java.time`) from being used.

See gh-23256
2020-09-11 18:11:47 -07:00
Brian Clozel
62cb87bd95 Merge branch '2.2.x' into 2.3.x
Closes gh-23252
2020-09-11 11:42:32 +02:00
David Good
775f0fa861 Improve sanitization for list of URI types
Prior to this commit, Actuator would sanitize properties values when
serializing them on the dedicated endpoint. Keys like "password" or
"secret" are entirely sanitized, but other keys like "uri" or "address"
are considered as URI types and only the password part of the user info
is sanitized.

This commit fixes the sanitization process where lists of such URI types
would not match the first entries of the list since they're starting
with `'['`. This commit improves the regexp matching process to sanitize
all URIs within a collection.

The documentation is also updated to better underline the processing
difference between complete sanitization and selective sanitization for
URIs.

Fixes gh-23037
2020-09-11 11:34:38 +02:00
Stephane Nicoll
7c13c01cb6 Fix mapping of Cassandra's idle-timeout and heartbeat-interval
Previous to this commit the connection idle timeout and heartbeat
interval were mapped to seconds whereas Cassandra expects ms for all
duration types.

This commit fixes the mapping and removes the default duration unit
since it should be considered ms like every other duration properties.

Closes gh-23249
2020-09-11 08:59:34 +02:00
Andy Wilkinson
aab4ee9aa2 Merge branch '2.2.x' into 2.3.x
Closes gh-23243
2020-09-10 11:15:03 +01:00
Andy Wilkinson
e4691a4c61 Document that sliced tests don't scan @ConfigurationProperties beans
Closes gh-23210
2020-09-10 11:14:28 +01:00
Andy Wilkinson
e7e77a917f Align PropertiesLauncher's close behavior with JarLauncher
Previously, PropertiesLauncher would close each archive that it
iterated over when creating its ClassLoader. This was not aligned
with JarLauncher's behaviour and left the ClassLoader with closed
archives. The close was introduced in [1] and became more apparent
following the change to fail operations on closed archives [2].

This commit updates Launcher to remove the close() that was added in
[1]. This aligns the behavior of PropertiesLauncher with JarLauncher
and ensures that the ClassLoader does not have entries backed by
closed archives on its classpath.

Fixes gh-23165

[1] ad72f86bdb
[2] ed7a5db174
2020-09-10 09:40:44 +01:00
Andy Wilkinson
3e0096e9b1 Use classpath normalizer on antlib's integration test classpath input
Closes gh-23223
2020-09-08 11:38:31 +01:00
Andy Wilkinson
d50c8aa312 Update container versions used in deployment integration tests
Closes gh-23211
2020-09-07 16:43:27 +01:00
Andy Wilkinson
b9ee545c78 Improve robustness of DeploymentIntegrationTests
Closes gh-23207
2020-09-07 16:15:12 +01:00
Stephane Nicoll
52859303fe Start building against Spring Kafka 2.5.6 snapshots
See gh-23199
2020-09-07 15:55:27 +02:00
Stephane Nicoll
c909b2b4a0 Start building against Spring Session Dragonfruit-SR1 snapshots
See gh-23187
2020-09-07 15:54:49 +02:00
Stephane Nicoll
72c34c8bfd Start building against Spring Data Neumann-SR4 snapshots
See gh-23196
2020-09-07 15:54:08 +02:00
Stephane Nicoll
c352528aa5 Start building against Reactor Dysprosium-SR12 snapshots
See gh-23192
2020-09-07 15:53:27 +02:00
Stephane Nicoll
bc0ceb5881 Merge branch '2.2.x' into 2.3.x 2020-09-07 15:50:34 +02:00
Stephane Nicoll
ba7a103588 Start building against Spring Kafka 2.3.11 snapshots
See gh-23198
2020-09-07 15:24:02 +02:00
Stephane Nicoll
3b4f541b44 Start building against Spring Session Corn-SR4 snapshots
See gh-23186
2020-09-07 15:23:21 +02:00
Stephane Nicoll
a8c36b7659 Start building against Spring Data Moore-SR10 snapshots
See gh-23195
2020-09-07 15:22:43 +02:00
Stephane Nicoll
e3635c4848 Start building against Reactor Dysprosium-SR11 snapshots
See gh-23191
2020-09-07 15:21:51 +02:00
Stephane Nicoll
656f2b375a Merge branch '2.1.x' into 2.2.x 2020-09-07 15:21:04 +02:00
Andy Wilkinson
86fc4dea2a Merge branch '2.2.x' into 2.3.x
See gh-23203
2020-09-07 14:16:37 +01:00
Andy Wilkinson
5f00d91176 Restore identifying org.hsqldb.jdbcDriver as embedded
See gh-23036
2020-09-07 14:03:10 +01:00
Stephane Nicoll
b3960cae86 Start building against Spring Data Bean-SR12 snapshots
See gh-23185
2020-09-07 14:38:50 +02:00
Stephane Nicoll
d2a6035914 Start building against Spring Data Lovelace-SR20 snapshots
See gh-23194
2020-09-07 14:38:25 +02:00
Stephane Nicoll
e35cf5219a Start building against Reactor Californium-SR21 snapshots
See gh-23190
2020-09-07 14:38:18 +02:00
Stephane Nicoll
88e0c280ce Start building against Spring Framework 5.0.19 snapshots
See gh-23181
2020-09-07 14:36:01 +02:00
Andy Wilkinson
116b2472a7 Merge branch '2.2.x' into 2.3.x
Closes gh-23200
2020-09-07 13:34:14 +01:00
Andy Wilkinson
115ea87b14 Restore ordering of ErrorPageFilter lost in 49f8943
See gh-19471
2020-09-07 13:33:43 +01:00
Andy Wilkinson
d39b107917 Merge branch '2.2.x' into 2.3.x
Closes gh-23203
2020-09-07 13:30:02 +01:00
Stephane Nicoll
648789ef84 Document that buildpacks use non-root users
Closes gh-21122
2020-09-07 12:41:51 +02:00
Andy Wilkinson
c948c70c5a Align EmbeddedDatabaseConnection with DatabaseDriver
Fixes gh-23036
2020-09-07 10:13:55 +01:00
Stephane Nicoll
d2eeb9524f Merge branch '2.2.x' into 2.3.x
See gh-23183
2020-09-07 09:17:51 +02:00
Stephane Nicoll
4b5a3f4ff9 Start building against Spring Framework 5.2.9 snapshots
See gh-23182
2020-09-07 08:47:57 +02:00
Andy Wilkinson
de671035a8 Upgrade build to Gradle 6.6.1
Closes gh-23168
2020-09-02 14:22:45 +01:00
Stephane Nicoll
652561c274 Review checkstyle rule to prevent non BDD mockito imports
Closes gh-20902
2020-09-01 11:50:14 +02:00
Stephane Nicoll
a341d00529 Review instructions for running launch script tests with Gradle
Closes gh-20606
2020-09-01 11:30:50 +02:00
Phillip Webb
0d80f46cef Remove node and recursive limits for YAML
Update `OriginTrackedYamlLoader` to remove node limits and recursive
parsing restrictions. SnakeYAML 1.26 introduced these options in order
to protect against the "billion laugh attacks" but since we consider
`application.yml` files to be trusted, we don't need these restrictions.

Fixes gh-23096
2020-08-31 15:27:37 -07:00
Stephane Nicoll
ee914624e6 Document buildpacks are configured with target Java version
Closes gh-21796
2020-08-31 16:15:30 +02:00
Stephane Nicoll
8404c4c71b Document how to perform tasks after application startup
Closes gh-22100
2020-08-31 11:33:27 +02:00
Stephane Nicoll
e74e53fdaf Clarify how to take full control of ElasticSearch's rest client
Closes gh-23074
2020-08-31 11:19:36 +02:00
Stephane Nicoll
b80314b44b Document how to customize the jmxPort for Maven integration tests
Closes gh-22401
2020-08-31 10:52:47 +02:00
Stephane Nicoll
62dbd90d46 Document how to add auto-configurations to a test slice
Closes gh-22531
2020-08-31 09:58:56 +02:00
Stephane Nicoll
008eee42a1 Add a note about using graceful shutdown from an IDE
Closes gh-22959
2020-08-31 09:38:21 +02:00
Phillip Webb
98f432681f Merge branch '2.2.x' into 2.3.x 2020-08-28 15:30:57 -07:00
Phillip Webb
611447c4d5 Fix checkstyle issue caused by polish commit
See gh-22946
2020-08-28 15:30:27 -07:00
Phillip Webb
84f281fbfd Merge branch '2.2.x' into 2.3.x
Closes gh-23135
2020-08-28 15:23:10 -07:00
Phillip Webb
38db582af1 Merge pull request #22946 from rgoers
* pr/22946:
  Polish 'Remove ResourceUtils.getURL logging config check'
  Remove ResourceUtils.getURL logging config check

Closes gh-22946
2020-08-28 15:19:43 -07:00