9bd040cb0f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23500
2020-09-26 09:16:46 +01:00
e74f777971
Remove use of spring-core's Assert from PropertiesLauncher
...
Fixes gh-23474
2020-09-26 09:11:05 +01:00
df5cd21ca5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23481
2020-09-24 19:04:17 +01:00
6dc8e6815d
Align default tldScanPatterns with Tomcat's
...
Previously, we configured embedded Tomcat in such a way that no TLD
scan patterns were configured. This differed from a standalone
Tomcat installation where 4 patterns are configured that take
precedence over some of the skip patterns. The missing scan patterns
resulted in the skip patterns preventing the discovery of Log4j2's
TLDs.
This commit updates TomcatServletWebServerFactory to configure the
same four scan patterns as standalone Tomcat configures by default.
Fixes gh-23302
2020-09-24 17:51:38 +01:00
e626f7f47e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23477
2020-09-24 14:45:55 +01:00
bf9d23e55a
Consider SpringBootTest's web environment in context cache key
...
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.
This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.
Fixes gh-23085
2020-09-24 14:43:51 +01:00
b3c5588c86
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23461
2020-09-23 14:36:41 +02:00
62eb835a4e
Fix link to Log4j's JDK Logging Adapter in reference documentation
...
See gh-23459
2020-09-23 14:36:00 +02:00
232c310df2
Merge branch '2.2.x' into 2.3.x
2020-09-22 16:26:39 +01:00
24102656f2
Fix Log4j2 XML configuration tests on Windows
...
See gh-22983
2020-09-22 16:03:58 +01:00
3adf06df17
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23452
2020-09-22 16:45:08 +02:00
2999f09a40
Rework tip on templates location in the IDE
...
This commit rework the tip on locating templates when running the app
in the IDE. Using classpath* should not change anything as this won't
make a difference without a pattern in the path.
Closes gh-23068
2020-09-22 16:44:16 +02:00
531690b8e1
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23448
2020-09-22 15:21:04 +02:00
7f84a92ef1
Document that Java 15 is supported
...
Closes gh-23447
2020-09-22 15:19:47 +02:00
37ded9f6d3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23446
2020-09-22 10:10:24 +02:00
fba1fb23e4
Fix multi-release JAR test on JDK 15
...
Backport of 54f93e9
2020-09-22 10:09:18 +02:00
363d35a0ac
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23444
2020-09-21 23:20:10 -07:00
b443d22c59
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23443
2020-09-21 23:19:41 -07:00
cc442c5c0d
Make HandlerFunctionDescription JDK 15 compatible
...
Update `HandlerFunctionDescription` so that it will work with JDK 15.
Closes gh-23442
2020-09-21 23:18:02 -07:00
3fca8c6b4e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23441
2020-09-21 22:27:45 -07:00
4945806d84
Make `StringSequence.isEmpty()` public
...
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.
Closes gh-23440
2020-09-21 22:26:20 -07:00
0963218be1
Merge branch '2.2.x' into 2.3.x
2020-09-21 19:28:39 +01:00
0edf7cb9b9
Polish Log4j2 XML configuration tests
...
See gh-22983
2020-09-21 19:26:40 +01:00
13e08a4344
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23428
2020-09-21 15:15:08 +01:00
f6492cd0c0
Consume level and dateformat patterns as system props in Log4j config
...
Previously LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN were not
consumed as system properties in log4j2.xml and log4j2-file.xml. As a
result, the logging.pattern.level and logging.pattern.dateformat
configuration properties, which are translated into the
LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN system properties
respectively had no effect.
This commit updates the log4j2.xml and log4j2-file.xml config files to
consume LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN as system
properties. When the system property is not set, the configuation falls
back to the default values specified in the config files. Tests for
both log4j2.xml and log4j2-file.xml to verify the behaviour have also
bean added.
Fixes gh-22983
2020-09-21 15:08:41 +01:00
8667e9ded8
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23426
2020-09-21 12:16:14 +01:00
581190d7a0
Test the Gradle plugin against 6.7-rc-1
...
Closes gh-23425
2020-09-21 12:14:35 +01:00
d06af28cd8
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23422
2020-09-21 10:47:06 +01:00
360e29af48
Polish "Add note about Kotlin main class name"
...
See gh-23418
2020-09-21 10:40:29 +01:00
0bde5fda9b
Add note about Kotlin main class name
...
See gh-23418
2020-09-21 10:36:16 +01:00
55bfef9901
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23408
2020-09-18 13:32:46 +01:00
95f26c6358
Configure Flyway with initSqls for any DataSource configuration
...
Previously, spring.flyway.init-sqls was only applied to Flyway's
configuration if Flyway was being configured to create the DataSource.
If Flyway was being configured to use an existing DataSource, init-sqls
was not applied. This is a hangover from when the init SQLs support was
introduced. At that time, Flyway only supported SQL to initialize the
connection when it was creating the DataSource. Flyway 5.2 added init
SQL support no matter how Flyway's DataSource was configured.
This commit updates FlywayAutoConfiguration to always apply the
init-sqls property to Flyway's configuration. The property's
documentation does not describe the current limitation so this change
should align the behaviour with what the documentation leads people to
expect.
Fixes gh-23392
2020-09-18 13:03:24 +01:00
3861ef13fb
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23406
2020-09-18 09:09:41 +01:00
5ec673ff2a
Add anchors to section headers in Gradle plugin docs
...
Fixes gh-23402
2020-09-18 09:06:54 +01:00
07dc202966
Upgrade to Micrometer 1.5.5
...
Closes gh-23393
2020-09-17 13:02:23 +01:00
3622fd5b04
Upgrade to Spring Session Dragonfruit-SR1
...
Closes gh-23187
2020-09-17 08:51:49 +02:00
ab2115633f
Upgrade to Micrometer 1.3.14
...
Closes gh-23388
2020-09-17 08:46:30 +02:00
35b33303d0
Upgrade to Spring Session Corn-SR4
...
Closes gh-23186
2020-09-17 08:45:52 +02:00
91c1d52fc1
Upgrade to Micrometer 1.1.18
...
Closes gh-23384
2020-09-17 07:40:59 +02:00
db04672403
Upgrade to Spring Session Bean-SR12
...
Closes gh-23185
2020-09-17 07:37:14 +02:00
a2be6e0817
Upgrade to Spring Kafka 2.5.6
...
Closes gh-23199
2020-09-17 07:25:09 +02:00
e5d135c61c
Upgrade to Spring Kafka 2.3.11
...
Closes gh-23198
2020-09-17 07:23:41 +02:00
d3d96f0417
Upgrade to Spring REST Docs 2.0.5.RELEASE
...
Closes gh-23374
2020-09-16 17:45:34 +01:00
d6586b8354
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23376
2020-09-16 17:39:08 +01:00
e87e52d035
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23375
2020-09-16 17:38:02 +01:00
106968a115
Upgrade to Spring REST Docs 2.0.5.RELEASE
...
Closes gh-23374
2020-09-16 17:36:34 +01:00
7a7aef80d9
Upgrade to Spring AMQP 2.2.11
...
Closes gh-23373
2020-09-16 18:24:53 +02:00
9ab8ad6e74
Upgrade to Spring AMQP 2.2.11
...
Closes gh-23372
2020-09-16 18:23:06 +02:00
9a09a3c570
Upgrade to Spring AMQP 2.1.17
...
Closes gh-23371
2020-09-16 18:20:34 +02:00
68ea2ca210
Upgrade to Spring Data Neumann-SR4
...
Closes gh-23196
2020-09-16 15:45:46 +02:00
bac5a7909e
Upgrade to Spring Data Moore-SR10
...
Closes gh-23195
2020-09-16 15:44:25 +02:00
b1e47811af
Upgrade to Spring Data Lovelace-SR20
...
Closes gh-23194
2020-09-16 15:40:09 +02:00
8faa08f585
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23341
2020-09-16 11:43:43 +02:00
15dd780eb4
Upgrade to Spring WS 3.0.10.RELEASE
...
Closes gh-23339
2020-09-16 10:10:17 +02:00
e5af0d51aa
Upgrade to Spring HATEOAS 1.1.2.RELEASE
...
Closes gh-23338
2020-09-16 10:10:15 +02:00
83d9385946
Upgrade to Lettuce 5.3.4.RELEASE
...
Closes gh-23337
2020-09-16 10:10:14 +02:00
d7a5d44a75
Upgrade to Spring Ws 3.0.10.RELEASE
...
Closes gh-23336
2020-09-16 10:02:17 +02:00
d5aeb828e6
Upgrade to Neo4j Ogm 3.2.16
...
Closes gh-23335
2020-09-16 10:02:15 +02:00
3f520f18d7
Upgrade to Tomcat 9.0.38
...
Closes gh-23334
2020-09-16 10:02:14 +02:00
297735a7e7
Upgrade to Spring Ws 3.0.10.RELEASE
...
Closes gh-23333
2020-09-16 09:56:25 +02:00
b37d79a07e
Upgrade to Neo4j Ogm 3.1.22
...
Closes gh-23332
2020-09-16 09:56:24 +02:00
9f3b3504ef
Upgrade to Tomcat 9.0.38
...
Closes gh-23331
2020-09-16 09:56:22 +02:00
f590225c82
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23328
2020-09-16 00:28:29 -07:00
bd87ba33d0
Use ephemeral ports for RSocket tests
...
Closes gh-23325
2020-09-16 00:15:19 -07:00
5c1055dc22
Merge branch '2.2.x' into 2.3.x
2020-09-15 08:48:25 -07:00
195def0ec3
Merge branch '2.1.x' into 2.2.x
2020-09-15 08:48:00 -07:00
e0030094e2
Fix missing jar entry certificates
...
Ensure that the source jar entry is closed before reading
certificates and code signers from the entry.
gh-19041
2020-09-15 08:42:58 -07:00
409743eddb
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23320
2020-09-15 16:32:43 +01:00
5a266155b0
Disable proxyBeanMethods on Spring Session config sub-classes
...
Closes gh-23280
2020-09-15 16:32:15 +01:00
2df947cedb
Upgrade to Undertow 2.1.4.Final
...
Closes gh-23318
2020-09-15 14:55:39 +02:00
db3e81c5b7
Upgrade to Tomcat 9.0.38
...
Closes gh-23317
2020-09-15 14:55:39 +02:00
69576a3be2
Upgrade to R2DBC Bom Arabba-SR7
...
Closes gh-23316
2020-09-15 14:55:39 +02:00
3cb8a4fd5a
Upgrade to Postgresql 42.2.16
...
Closes gh-23315
2020-09-15 14:55:39 +02:00
9bf7555dcf
Upgrade to Netty tcNative 2.0.34.Final
...
Closes gh-23314
2020-09-15 14:55:38 +02:00
201bfd2b0c
Upgrade to Netty 4.1.52.Final
...
Closes gh-23313
2020-09-15 14:55:38 +02:00
71607777b1
Upgrade to Neo4j OGM 3.2.16
...
Closes gh-23312
2020-09-15 14:25:31 +02:00
8738e05f59
Upgrade to Hibernate 5.4.21.Final
...
Closes gh-23311
2020-09-15 14:25:29 +02:00
9b3148ce3f
Upgrade to Hazelcast 3.12.9
...
Closes gh-23310
2020-09-15 14:25:28 +02:00
b1d33a3df9
Upgrade to Flatten Maven Plugin 1.2.5
...
Closes gh-23309
2020-09-15 14:25:27 +02:00
c9f413edfb
Upgrade to Couchbase Client 3.0.8
...
Closes gh-23308
2020-09-15 14:25:26 +02:00
94d5e11e7d
Upgrade to AppEngine SDK 1.9.82
...
Closes gh-23307
2020-09-15 14:25:24 +02:00
5517cd06df
Upgrade to Spring Framework 5.2.9
...
Closes gh-23183
2020-09-15 13:49:14 +02:00
95a33071ca
Upgrade to Spring Framework 5.2.9
...
Closes gh-23182
2020-09-15 13:48:02 +02:00
d73ee9d545
Upgrade to Spring Framework 5.1.18
...
Closes gh-23181
2020-09-15 13:45:51 +02:00
53f2966b61
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23305
2020-09-15 12:30:45 +01:00
5d20660c8a
Disable proxyBeanMethods on all management context config classes
...
Fixes gh-23301
2020-09-15 12:30:32 +01:00
2ee22d50b4
Upgrade to Reactor Dysprosium-SR12
...
Closes gh-23192
2020-09-15 08:48:35 +02:00
bc9c6dc005
Upgrade to Reactor Dysprosium-SR12
...
Closes gh-23191
2020-09-15 08:46:17 +02:00
a5905c5cb9
Upgrade to Reactor Californium-SR21
...
Closes gh-23190
2020-09-15 08:42:35 +02:00
a249a1a3d1
Merge branch '2.2.x' into 2.3.x
2020-09-14 13:52:22 -07:00
b8e6b2ef94
Merge branch '2.1.x' into 2.2.x
2020-09-14 13:51:24 -07:00
4138e59c33
Fix potential JarFileEntries ClassCastException
...
Update `JarFileEntries` so that the interface is obtained rather than
the concrete implementation. This allows `JarEntry` values to be used
without causing a ClassCastException.
Closes gh-19041
2020-09-14 13:48:59 -07:00
c5532cfac0
Upgrade to Spring Security 5.2.6.RELEASE
...
Closes gh-23299
2020-09-14 13:38:05 +02:00
4da461cf85
Upgrade to Spring Amqp 2.2.10.RELEASE
...
Closes gh-23298
2020-09-14 13:38:05 +02:00
1862eb4455
Upgrade to Postgresql 42.2.16
...
Closes gh-23297
2020-09-14 13:38:05 +02:00
0edd00c9d7
Upgrade to Neo4j Ogm 3.2.15
...
Closes gh-23296
2020-09-14 13:38:05 +02:00
de38777397
Upgrade to Infinispan 9.4.20.Final
...
Closes gh-23295
2020-09-14 13:38:04 +02:00
bf02b86f60
Upgrade to Hibernate 5.4.21.Final
...
Closes gh-23294
2020-09-14 13:38:04 +02:00
12d0835da0
Upgrade to Elasticsearch 6.8.12
...
Closes gh-23293
2020-09-14 13:38:04 +02:00
53ba03bdec
Upgrade to Jetty 9.4.31.v20200723
...
Closes gh-23292
2020-09-14 13:38:04 +02:00
4125e5fc8f
Upgrade to Byte Buddy 1.10.14
...
Closes gh-23291
2020-09-14 13:38:04 +02:00
0d12683a93
Upgrade to Undertow 2.0.31.Final
...
Closes gh-23290
2020-09-14 13:38:04 +02:00
67f3c3193d
Upgrade to Rsocket 1.0.2
...
Closes gh-23289
2020-09-14 13:38:03 +02:00
1a676b154e
Upgrade to Netty Tcnative 2.0.34.Final
...
Closes gh-23288
2020-09-14 13:38:03 +02:00
f4a84d3b63
Upgrade to Netty 4.1.52.Final
...
Closes gh-23287
2020-09-14 13:37:57 +02:00
a9f1441fcc
Upgrade to Micrometer 1.3.12
...
Closes gh-23286
2020-09-14 13:12:09 +02:00
87fdccf4a0
Upgrade to Dropwizard Metrics 4.1.12.1
...
Closes gh-23285
2020-09-14 13:12:07 +02:00
da9505cf01
Upgrade to Hazelcast 3.12.9
...
Closes gh-23284
2020-09-14 13:12:05 +02:00
5ce3aaefb2
Upgrade to Appengine Sdk 1.9.82
...
Closes gh-23283
2020-09-14 13:12:03 +02:00
492e1a4c0f
Upgrade to Netty 4.1.52.Final
...
Closes gh-23269
2020-09-14 11:28:55 +02:00
3bd4337a4e
Upgrade to Spring Security 5.1.12.RELEASE
...
Closes gh-23278
2020-09-14 10:41:44 +02:00
72a5b2353d
Upgrade to Postgresql 42.2.16
...
Closes gh-23277
2020-09-14 10:41:43 +02:00
5c3947c64b
Upgrade to Neo4j Ogm 3.1.21
...
Closes gh-23276
2020-09-14 10:41:40 +02:00
c723b4e705
Upgrade to Infinispan 9.4.20.Final
...
Closes gh-23275
2020-09-14 10:41:25 +02:00
738613b889
Upgrade to Hibernate 5.3.18.Final
...
Closes gh-23274
2020-09-14 10:41:25 +02:00
c608f4425d
Upgrade to Jetty 9.4.31.v20200723
...
Closes gh-23273
2020-09-14 10:41:25 +02:00
9f0befbcb8
Upgrade to Undertow 2.0.31.Final
...
Closes gh-23272
2020-09-14 10:41:25 +02:00
78c1e105ee
Upgrade to Dependency Management Plugin 1.0.10.RELEASE
...
Closes gh-23271
2020-09-14 10:41:24 +02:00
6d99776d9d
Upgrade to Netty Tcnative 2.0.34.Final
...
Closes gh-23270
2020-09-14 10:41:20 +02:00
e5a9a7ae83
Upgrade to Micrometer 1.1.17
...
Closes gh-23268
2020-09-14 09:47:49 +02:00
fb935ecb8d
Upgrade to Appengine Sdk 1.9.82
...
Closes gh-23267
2020-09-14 09:47:48 +02:00
76fd9a530c
Upgrade to Jackson 2.9.10.20200824
...
Closes gh-23266
2020-09-14 09:47:47 +02:00
45275e6586
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23264
2020-09-13 22:49:21 -07:00
a20fdf8e6a
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23263
2020-09-13 22:45:39 -07:00
895ff9c72d
Merge pull request #19041 from mathieufortin01
...
* pr/19041:
Polish 'Fix signed jar performance issues'
Fix signed jar performance issues
Ignore Visual Studio Code Files
Closes gh-19041
2020-09-13 22:40:05 -07:00
c6a9696dd1
Polish 'Fix signed jar performance issues'
...
Update the performance improvements to push certificate loading
and storage into the `JarFileEntries` class. This allows us to
keep certificates without needing to cache all entry data. We
now also keep certificates and code signers in a dedicated class
which is set whenever the full jar stream as been read, even if
the contained values are `null`. The logic that assumes META-INF
entries are not signed has been removed in favor of delegating to
the streamed entry results.
See gh-19041
2020-09-13 22:28:45 -07:00
4d053e15d8
Fix signed jar performance issues
...
Update Spring Boot nested JarFile support to improve the performance of
signed jars. Prior to this commit, `certificates` and `codeSigners`
were read by streaming the entire jar whenever the existing values
were `null`. Unfortunately, the contract for `getCertificates` and
get `getCodeSigners` states that `null` is a valid return value. This
meant that full jar streaming would occur whenever either method was
called on an entry that had no result. The problem was further
exacerbated by the fact that entries might not be cached.
See gh-19041
2020-09-13 22:14:03 -07:00
5294c34807
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23260
2020-09-13 11:02:19 -07:00
326a56da01
Support validation of bound map key entries
...
Update `ValidationBindHandler` so that pushed fields that reference
map keys can be used. This fixes a regression that was introduced in
commit 4483f417
2020-09-13 10:54:30 -07:00
f5ae58e8e5
Fix deprecation warning
...
See gh-23256
2020-09-11 19:01:22 -07:00
507fae5141
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23258
2020-09-11 18:45:05 -07:00
d8232b3c21
Polish 'Allow other "timestamp" types in MVC error model'
...
See gh-23256
2020-09-11 18:44:04 -07:00
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
62cb87bd95
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23252
2020-09-11 11:42:32 +02:00
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
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
aab4ee9aa2
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23243
2020-09-10 11:15:03 +01:00
e4691a4c61
Document that sliced tests don't scan @ConfigurationProperties beans
...
Closes gh-23210
2020-09-10 11:14:28 +01:00
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] ad72f86bdbed7a5db174
2020-09-10 09:40:44 +01:00
3e0096e9b1
Use classpath normalizer on antlib's integration test classpath input
...
Closes gh-23223
2020-09-08 11:38:31 +01:00
52859303fe
Start building against Spring Kafka 2.5.6 snapshots
...
See gh-23199
2020-09-07 15:55:27 +02:00
c909b2b4a0
Start building against Spring Session Dragonfruit-SR1 snapshots
...
See gh-23187
2020-09-07 15:54:49 +02:00
72c34c8bfd
Start building against Spring Data Neumann-SR4 snapshots
...
See gh-23196
2020-09-07 15:54:08 +02:00
c352528aa5
Start building against Reactor Dysprosium-SR12 snapshots
...
See gh-23192
2020-09-07 15:53:27 +02:00
ba7a103588
Start building against Spring Kafka 2.3.11 snapshots
...
See gh-23198
2020-09-07 15:24:02 +02:00
3b4f541b44
Start building against Spring Session Corn-SR4 snapshots
...
See gh-23186
2020-09-07 15:23:21 +02:00
a8c36b7659
Start building against Spring Data Moore-SR10 snapshots
...
See gh-23195
2020-09-07 15:22:43 +02:00
e3635c4848
Start building against Reactor Dysprosium-SR11 snapshots
...
See gh-23191
2020-09-07 15:21:51 +02:00
86fc4dea2a
Merge branch '2.2.x' into 2.3.x
...
See gh-23203
2020-09-07 14:16:37 +01:00
5f00d91176
Restore identifying org.hsqldb.jdbcDriver as embedded
...
See gh-23036
2020-09-07 14:03:10 +01:00
b3960cae86
Start building against Spring Data Bean-SR12 snapshots
...
See gh-23185
2020-09-07 14:38:50 +02:00
d2a6035914
Start building against Spring Data Lovelace-SR20 snapshots
...
See gh-23194
2020-09-07 14:38:25 +02:00
e35cf5219a
Start building against Reactor Californium-SR21 snapshots
...
See gh-23190
2020-09-07 14:38:18 +02:00
88e0c280ce
Start building against Spring Framework 5.0.19 snapshots
...
See gh-23181
2020-09-07 14:36:01 +02:00
116b2472a7
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23200
2020-09-07 13:34:14 +01:00
115ea87b14
Restore ordering of ErrorPageFilter lost in 49f8943
...
See gh-19471
2020-09-07 13:33:43 +01:00
d39b107917
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23203
2020-09-07 13:30:02 +01:00
648789ef84
Document that buildpacks use non-root users
...
Closes gh-21122
2020-09-07 12:41:51 +02:00
c948c70c5a
Align EmbeddedDatabaseConnection with DatabaseDriver
...
Fixes gh-23036
2020-09-07 10:13:55 +01:00
d2eeb9524f
Merge branch '2.2.x' into 2.3.x
...
See gh-23183
2020-09-07 09:17:51 +02:00
4b5a3f4ff9
Start building against Spring Framework 5.2.9 snapshots
...
See gh-23182
2020-09-07 08:47:57 +02:00
652561c274
Review checkstyle rule to prevent non BDD mockito imports
...
Closes gh-20902
2020-09-01 11:50:14 +02:00
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
ee914624e6
Document buildpacks are configured with target Java version
...
Closes gh-21796
2020-08-31 16:15:30 +02:00
8404c4c71b
Document how to perform tasks after application startup
...
Closes gh-22100
2020-08-31 11:33:27 +02:00
e74e53fdaf
Clarify how to take full control of ElasticSearch's rest client
...
Closes gh-23074
2020-08-31 11:19:36 +02:00
b80314b44b
Document how to customize the jmxPort for Maven integration tests
...
Closes gh-22401
2020-08-31 10:52:47 +02:00
62dbd90d46
Document how to add auto-configurations to a test slice
...
Closes gh-22531
2020-08-31 09:58:56 +02:00
008eee42a1
Add a note about using graceful shutdown from an IDE
...
Closes gh-22959
2020-08-31 09:38:21 +02:00
98f432681f
Merge branch '2.2.x' into 2.3.x
2020-08-28 15:30:57 -07:00
611447c4d5
Fix checkstyle issue caused by polish commit
...
See gh-22946
2020-08-28 15:30:27 -07:00
84f281fbfd
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23135
2020-08-28 15:23:10 -07:00
35994b061c
Polish 'Remove ResourceUtils.getURL logging config check'
...
Extend `initializeSystem` to search the exception stack for a
FileNotFoundException before reporting the error. This allows
us to provide a similar stack trace to the one that used to be
thrown when we had the `ResourceUtils.getURL` check.
See gh-22946
2020-08-28 15:16:12 -07:00
684b65e80c
Remove ResourceUtils.getURL logging config check
...
Remove `ResourceUtils.getURL` checking from `LoggingApplicationListener`
so that logging systems can implement custom location support.
Prior to this commit, we checked in the listener if the specified config
location could be opened as a URL. This unfortunately prevents Log4J
extensions such as `log4j-spring-cloud-config-client` from implementing
configurable SSL and credentials support.
See gh-22946
2020-08-28 15:07:06 -07:00
bc1834bfdf
Ensure layer digest hashes contain 64 characters
...
This commit ensures that encoded digest hashes for Docker image
layers are zero-padded to the required 64 characters length.
Fixes gh-23132
2020-08-28 17:04:34 -05:00
4f1b4c98ae
Fail on Docker image load with empty response
...
In some cases, a call to the Docker image load API will fail but
return a 200 OK response status code and an empty response. This
commit detects that the response from this call is empty and
treats this condition as an error instead of a silent failure.
Fixes gh-23130
2020-08-28 15:18:02 -05:00
51c9dee899
Use DynamicPropertySource in MongoDB tests
...
See gh-23127
2020-08-28 14:32:01 +01:00
627ede8bff
Remove duplicate jackson-datatype-jsr310 dependency
...
Closes gh-23123
2020-08-28 12:38:42 +01:00
33ef1b6e5b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23124
2020-08-28 12:29:07 +01:00
5cd910c7ce
Replace Embedded Mongo with Testcontainers' MongoDB support
...
Closes gh-23090
2020-08-28 12:00:31 +01:00
84a12c8436
Upgrade to Testcontainers 1.14.3
...
Closes gh-23122
2020-08-28 11:57:32 +01:00
c74e0be0d2
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23094
2020-08-26 14:49:12 +01:00
04540887af
Widen timeout and delay to accommodate Windows' imprecision under load
...
Closes gh-23093
2020-08-26 14:48:33 +01:00
4143c31f9c
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23087
2020-08-26 09:03:46 +01:00
d8ba7dd4d0
Remove unused methods
...
See gh-23086
2020-08-26 09:57:49 +02:00
6f047c8356
Polish "Handle null RSocketServer address when setting port property"
...
See gh-23084
2020-08-26 08:52:57 +01:00
f08f948c3e
Handle null RSocketServer address when setting port property
...
See gh-23084
2020-08-26 08:52:57 +01:00
d133f228e2
Increase wait times in DevToolsIntegrationTests
...
See gh-22909
2020-08-25 16:50:56 +01:00
b57b2f0b44
Test the Gradle Plugin against 6.5 and 6.6
...
Closes gh-23075
2020-08-25 12:01:25 +01:00
0b3a1310bd
Align managed version of Nimbus JOSE JWT with Spring Security
...
Closes gh-22996
2020-08-25 09:53:50 +01:00
7a5392d6bd
Polish
2020-08-25 09:45:40 +01:00
858e1948dd
Polish "Added dependency management for nimbus-jose-jwt"
...
See gh-22996
2020-08-25 08:49:36 +01:00
0277dce3da
Added dependency management for nimbus-jose-jwt
...
See gh-22996
2020-08-25 08:49:36 +01:00
0374ed2a0c
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23063
2020-08-24 12:20:30 +02:00
5b0f22e8fe
Fix unintended import on commons lang
...
Closes gh-23059
2020-08-24 12:12:33 +02:00
39dc2e7de4
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23060
2020-08-24 11:57:22 +02:00
f1455b156a
Polish "Add example of custom Actuator operations"
...
See gh-23028
2020-08-24 11:56:31 +02:00
e8de069e00
Add example of custom Actuator operations
...
See gh-23028
2020-08-24 11:37:00 +02:00
56bc0eb9e0
Use canonical path for CNB builder lifecycle binaries
...
This commit changes the path used to invoke lifecycle binaries in
CNB builders from `/lifecycle` to `/cnb/lifecycle` to conform to
the CNB spec. This will ensure the build plugin image-building
goals and tasks are compatible with future versions of builders
that may not support both paths.
See gh-23009
2020-08-19 16:11:59 -05:00
8fd9c685a2
Reduce HTTP debug logging when building image
...
Update `BuildImageMojo` so that commons HTTP wire logging is configured
to ERROR. Without this update, running `mvn -X` will produce a great
deal of logging since by default HTTP Client logs all bytes transfered
at DEBUG and Maven will enable DEBUG for all logs.
Closes gh-22674
2020-08-19 13:20:06 -07:00
73038267a0
Merge branch '2.2.x' into 2.3.x
2020-08-19 10:34:06 -07:00
17e2d72bcb
Fix Windows path issue in JarFileWrapperTests
...
See gh-22991
2020-08-19 10:33:23 -07:00
8722c2c5de
Close writer after use in ExtractCommandTests
...
Update `ExtractCommandTests` so that the writer is closed after the
contents have been written.
See gh-22993
2020-08-19 10:25:37 -07:00
0dd38a7264
Merge branch '2.2.x' into 2.3.x
2020-08-19 10:22:45 -07:00
3fe2005e06
Use @AfterEach to close the source jar file
...
Update `JarFileWrapperTests` so that the jar files are closed after each
test.
See gh-22991
2020-08-19 10:22:10 -07:00
9a374f7d67
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23004
2020-08-19 10:09:22 +02:00
06eb7e9777
Mention correct JUnit 5 annotations in Kotlin testing section
...
See gh-23002
2020-08-19 10:07:40 +02:00
f7452b9383
Ensure LayoutFactory is not passed an empty file
...
Update `Repackager` to ensure that `getLayout` is called before we
backup the source file. This restores earlier behavior that some
custom `ModuleFactory` implementations were relying on.
Closes gh-22995
2020-08-18 16:45:44 -07:00
c5b12effbf
Merge branch '2.2.x' into 2.3.x
2020-08-18 16:21:03 -07:00
2a137a2d8a
Remove Mockito from JarFileWrapperTests
...
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.
See gh-22991
2020-08-18 16:20:05 -07:00
15a0cbc96b
Update copyright year of changed files
2020-08-18 15:39:23 -07:00
ba2ab3363b
Merge branch '2.2.x' into 2.3.x
2020-08-18 15:38:53 -07:00
4e76138ebc
Update copyright year of changed files
2020-08-18 15:37:59 -07:00
5997cbd21f
Refine AbstractJarFile method visibility
...
Refine method visibility in an attempt to fix test issues on Java 11+.
See gh-22991
2020-08-18 15:37:37 -07:00
3f80638a36
Fail on layertools extract with launch script
...
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.
Fixes gh-22993
2020-08-18 17:06:31 -05:00
2b1b096fac
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22998
2020-08-18 14:35:45 -07:00
aac367e9c5
Attempt to fix memory leak in JarFile class
...
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.
Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.
With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.
Closes gh-22991
2020-08-18 14:07:03 -07:00
ff36f8bab8
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22989
2020-08-17 16:17:47 -07:00
10da595302
Polish 'Order metrics auto-configurations correctly'
...
See gh-21134
2020-08-17 16:10:18 -07:00
02b7ec787e
Order metrics auto-configurations correctly
...
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.
Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.
See gh-21134
2020-08-17 16:03:27 -07:00
c2ec46c5b1
Polish "Fix include exception handling in DefaultErrorAttributes"
...
See gh-22750
2020-08-17 13:33:59 -05:00
c49605cd7b
Fix include exception handling in DefaultErrorAttributes
...
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.
See gh-22750
2020-08-17 13:33:59 -05:00
27528fdd07
Fix custom image name example and documentation
...
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.
See gh-22918
2020-08-17 13:59:42 +02:00
b1e631e8a6
Remove trailing whitespaces
2020-08-17 13:59:08 +02:00
6b679b7d64
Polish
...
See gh-22945
2020-08-17 13:24:51 +02:00
f75e988450
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22966
2020-08-14 17:12:41 -07:00
3271542d98
Add @Interited to @TypeExcludeFilters
...
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.
Closes gh-22939
2020-08-14 17:12:31 -07:00
1675b47637
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22964
2020-08-14 17:08:48 -07:00
89a6f83344
Fix and improve SpringApplicationBuilder javadoc
...
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.
Closes gh-22962
2020-08-14 17:06:39 -07:00
3e939cbabd
Polish method order
2020-08-14 17:02:13 -07:00
03d4b89c06
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22960
2020-08-14 15:11:23 -07:00
15de956566
Fix typo `Assert4J` -> `AssertJ`
...
See gh-22948
2020-08-14 15:09:56 -07:00
3e35fd480f
Wait longer for server port and improve diagnostics on timeout
...
See gh-22909
2020-08-14 15:34:41 +01:00
8c4e6f766c
Revert "Merge pull request #21060 from dsyer"
...
This reverts commit 6547ea56f9e9e4a34e62
2020-08-13 13:31:45 +01:00
2f5145b6a1
Upgrade to Micrometer 1.5.4
...
Closes gh-22932
2020-08-13 13:04:03 +02:00
df78105a3c
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22930
2020-08-13 11:48:43 +02:00
f61a632a37
Polish "Fix conditions that lead to auto-configure PushGateway"
...
See gh-22919
2020-08-13 11:47:43 +02:00
c355b95f6c
Fix conditions that lead to auto-configure PushGateway
...
See gh-22919
2020-08-13 11:41:49 +02:00
d0662e824a
Fix default value of server.jetty.accesslog.format
...
Closes gh-22921
2020-08-13 09:43:37 +02:00
4c6a722f18
Fix test for Java version in image building docs
...
See gh-22916
2020-08-12 17:43:37 -05:00
005ed8b8db
Use Java version wildcard in image building docs
...
Fixes gh-22916
2020-08-12 17:04:17 -05:00
c59b48b690
Upgrade to Spring Kafka 2.5.5.RELEASE
...
Closes gh-22843
2020-08-12 19:19:57 +01:00
ce729b7188
Upgrade to Spring AMQP 2.2.10.RELEASE
...
Closes gh-22842
2020-08-12 19:19:18 +01:00
f43a0b4891
Fix configuration of environment in Kotlin bootBuildImage examples
...
Fixes gh-22913
2020-08-12 17:06:16 +01:00
5e5c1fb4d0
Upgrade to Spring Data Neumann SR3
...
Closes gh-22844
2020-08-12 15:42:54 +02:00
2b1bb2f18f
Improve diagnostics when remote application does not start as expected
...
See gh-22909
2020-08-12 13:24:17 +01:00
65ccb514d0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22910
2020-08-12 13:14:15 +01:00
68e2dd626d
Mention configuration customizers for WebTestClient and RestAssured
...
See gh-22765
2020-08-12 13:13:11 +01:00
1381929525
Upgrade to Gradle 6.6
...
Closes gh-22905
2020-08-12 12:24:08 +01:00
0841eab877
Simplify build.gradle for spring-boot-starter-data-solr
...
Closes gh-22903
2020-08-12 11:40:21 +01:00
Andy Wilkinson
Stephane Nicoll
Pavel Gordon
dreis2211
Phillip Webb
Sebastiaan Fernandez
mathieufortin01
lock14
Brian Clozel
David Good
Ralph Goers
Scott Frederick
spencergibb
Thomas Kåsene
Ivo Smid
Martin Benda
Lopfest
Jean-Baptiste Nizet
Maciej Walkowiak
smlc
Johnny Lim