dreis2211
fba1fb23e4
Fix multi-release JAR test on JDK 15
...
Backport of 54f93e9
See gh-23445
2020-09-22 10:09:18 +02:00
Phillip Webb
b443d22c59
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23443
2020-09-21 23:19:41 -07:00
Phillip Webb
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
Phillip Webb
19a218dc8e
Backport JDK 15 detection support
...
See gh-23433
2020-09-21 23:14:51 -07:00
Phillip Webb
8b3728a57e
Refine StringSequence checkstyle suppression
...
See gh-23440
2020-09-21 22:31:43 -07:00
Phillip Webb
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
Phillip Webb
be00bbcf41
Merge branch '2.1.x' into 2.2.x
2020-09-21 21:41:09 -07:00
Phillip Webb
3da300fba9
Remove unused CI parameter
2020-09-21 21:40:18 -07:00
Phillip Webb
e8d24948d5
Merge branch '2.1.x' into 2.2.x
2020-09-21 21:23:03 -07:00
Phillip Webb
b0cc5fba4e
Use per-branch CI images
...
Closes gh-23439
2020-09-21 20:03:43 -07:00
Phillip Webb
15f2186aaf
Add Java 15 to download script
...
See gh-23433
2020-09-21 17:46:20 -07:00
Phillip Webb
e6ebcf1429
Upgrade Java version used in CI from 14 to 15
...
Closes gh-23433
2020-09-21 17:18:49 -07:00
Andy Wilkinson
0edf7cb9b9
Polish Log4j2 XML configuration tests
...
See gh-22983
2020-09-21 19:26:40 +01:00
Andy Wilkinson
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
Andy Wilkinson
581190d7a0
Test the Gradle plugin against 6.7-rc-1
...
Closes gh-23425
2020-09-21 12:14:35 +01:00
Andy Wilkinson
3a3e240924
Merge pull request #23418 from fernandezseb
...
* gh-23418:
Polish "Add note about Kotlin main class name"
Add note about Kotlin main class name
Closes gh-23418
2020-09-21 10:46:53 +01:00
Andy Wilkinson
360e29af48
Polish "Add note about Kotlin main class name"
...
See gh-23418
2020-09-21 10:40:29 +01:00
Sebastiaan Fernandez
0bde5fda9b
Add note about Kotlin main class name
...
See gh-23418
2020-09-21 10:36:16 +01:00
Andy Wilkinson
a8c179e922
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23416
2020-09-20 16:58:40 +01:00
Andy Wilkinson
4ed7febc47
Upgrade to Gradle Enterprise Maven Extension 1.6.6
...
Closes gh-23415
2020-09-20 16:58:05 +01:00
Andy Wilkinson
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
Andy Wilkinson
5ec673ff2a
Add anchors to section headers in Gradle plugin docs
...
Fixes gh-23402
2020-09-18 09:06:54 +01:00
Spring Buildmaster
bd8300cb6b
Next development version (v2.2.11.BUILD-SNAPSHOT)
2020-09-17 11:04:48 +00:00
Andy Wilkinson
c23e420914
Merge branch '2.1.x' into 2.2.x
2020-09-17 09:47:06 +01:00
Andy Wilkinson
dbd27839e5
Polish logging in BintrayService
2020-09-17 09:46:39 +01:00
Andy Wilkinson
71e3844460
Merge branch '2.1.x' into 2.2.x
2020-09-17 09:35:41 +01:00
Spring Buildmaster
cb4eb929f6
Next development version (v2.1.18.BUILD-SNAPSHOT)
2020-09-17 07:33:44 +00:00
Stephane Nicoll
ab2115633f
Upgrade to Micrometer 1.3.14
...
Closes gh-23388
2020-09-17 08:46:30 +02:00
Stephane Nicoll
35b33303d0
Upgrade to Spring Session Corn-SR4
...
Closes gh-23186
2020-09-17 08:45:52 +02:00
Stephane Nicoll
3e93a3ec58
Merge branch '2.1.x' into 2.2.x
2020-09-17 08:22:39 +02:00
Stephane Nicoll
91c1d52fc1
Upgrade to Micrometer 1.1.18
...
Closes gh-23384
2020-09-17 07:40:59 +02:00
Stephane Nicoll
db04672403
Upgrade to Spring Session Bean-SR12
...
Closes gh-23185
2020-09-17 07:37:14 +02:00
Stephane Nicoll
e5d135c61c
Upgrade to Spring Kafka 2.3.11
...
Closes gh-23198
2020-09-17 07:23:41 +02:00
Andy Wilkinson
caa417659e
Merge branch '2.1.x' into 2.2.x
2020-09-16 17:46:16 +01:00
Andy Wilkinson
d3d96f0417
Upgrade to Spring REST Docs 2.0.5.RELEASE
...
Closes gh-23374
2020-09-16 17:45:34 +01:00
Andy Wilkinson
e87e52d035
Merge branch '2.1.x' into 2.2.x
...
Closes gh-23375
2020-09-16 17:38:02 +01:00
Andy Wilkinson
106968a115
Upgrade to Spring REST Docs 2.0.5.RELEASE
...
Closes gh-23374
2020-09-16 17:36:34 +01:00
Stephane Nicoll
9ab8ad6e74
Upgrade to Spring AMQP 2.2.11
...
Closes gh-23372
2020-09-16 18:23:06 +02:00
Stephane Nicoll
ae458298b2
Merge branch '2.1.x' into 2.2.x
2020-09-16 18:22:38 +02:00
Stephane Nicoll
9a09a3c570
Upgrade to Spring AMQP 2.1.17
...
Closes gh-23371
2020-09-16 18:20:34 +02:00
Stephane Nicoll
bac5a7909e
Upgrade to Spring Data Moore-SR10
...
Closes gh-23195
2020-09-16 15:44:25 +02:00
Stephane Nicoll
5c4e3cfad4
Merge branch '2.1.x' into 2.2.x
2020-09-16 15:43:41 +02:00
Stephane Nicoll
b1e47811af
Upgrade to Spring Data Lovelace-SR20
...
Closes gh-23194
2020-09-16 15:40:09 +02:00
Stephane Nicoll
2fc3a13814
Exclude Kotlin Coroutines 1.3.9+ as it is built against Kotlin 1.4
...
Closes gh-23340
2020-09-16 11:38:24 +02:00
Stephane Nicoll
d7a5d44a75
Upgrade to Spring Ws 3.0.10.RELEASE
...
Closes gh-23336
2020-09-16 10:02:17 +02:00
Stephane Nicoll
d5aeb828e6
Upgrade to Neo4j Ogm 3.2.16
...
Closes gh-23335
2020-09-16 10:02:15 +02:00
Stephane Nicoll
3f520f18d7
Upgrade to Tomcat 9.0.38
...
Closes gh-23334
2020-09-16 10:02:14 +02:00
Stephane Nicoll
7f602d0062
Merge branch '2.1.x' into 2.2.x
2020-09-16 09:59:51 +02:00
Stephane Nicoll
297735a7e7
Upgrade to Spring Ws 3.0.10.RELEASE
...
Closes gh-23333
2020-09-16 09:56:25 +02:00
Stephane Nicoll
b37d79a07e
Upgrade to Neo4j Ogm 3.1.22
...
Closes gh-23332
2020-09-16 09:56:24 +02:00