Commit Graph

25495 Commits

Author SHA1 Message Date
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
Stephane Nicoll
9f3b3504ef Upgrade to Tomcat 9.0.38
Closes gh-23331
2020-09-16 09:56:22 +02:00
Phillip Webb
bd87ba33d0 Use ephemeral ports for RSocket tests
Closes gh-23325
2020-09-16 00:15:19 -07:00
Phillip Webb
195def0ec3 Merge branch '2.1.x' into 2.2.x 2020-09-15 08:48:00 -07:00
Phillip Webb
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
Andy Wilkinson
5a266155b0 Disable proxyBeanMethods on Spring Session config sub-classes
Closes gh-23280
2020-09-15 16:32:15 +01:00
Stephane Nicoll
95a33071ca Upgrade to Spring Framework 5.2.9
Closes gh-23182
2020-09-15 13:48:02 +02:00
Stephane Nicoll
825ad00370 Merge branch '2.1.x' into 2.2.x 2020-09-15 13:47:46 +02:00
Stephane Nicoll
d73ee9d545 Upgrade to Spring Framework 5.1.18
Closes gh-23181
2020-09-15 13:45:51 +02:00
Andy Wilkinson
5d20660c8a Disable proxyBeanMethods on all management context config classes
Fixes gh-23301
2020-09-15 12:30:32 +01:00
Stephane Nicoll
bc9c6dc005 Upgrade to Reactor Dysprosium-SR12
Closes gh-23191
2020-09-15 08:46:17 +02:00
Stephane Nicoll
a7341b4a46 Merge branch '2.1.x' into 2.2.x 2020-09-15 08:45:29 +02:00
Stephane Nicoll
a5905c5cb9 Upgrade to Reactor Californium-SR21
Closes gh-23190
2020-09-15 08:42:35 +02:00
Phillip Webb
b8e6b2ef94 Merge branch '2.1.x' into 2.2.x 2020-09-14 13:51:24 -07:00