fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,277 Commits 22 Branches 339 Tags
Commit Graph

10386 Commits

Author SHA1 Message Date
Pavel Gordon
62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation 
See gh-23459
 2020-09-23 14:36:00 +02:00
Andy Wilkinson
232c310df2 Merge branch '2.2.x' into 2.3.x 2020-09-22 16:26:39 +01:00
Andy Wilkinson
24102656f2 Fix Log4j2 XML configuration tests on Windows 
See gh-22983
 2020-09-22 16:03:58 +01:00
Stephane Nicoll
3adf06df17 Merge branch '2.2.x' into 2.3.x 
Closes gh-23452
 2020-09-22 16:45:08 +02:00
Stephane Nicoll
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
Stephane Nicoll
531690b8e1 Merge branch '2.2.x' into 2.3.x 
Closes gh-23448
 2020-09-22 15:21:04 +02:00
Stephane Nicoll
7f84a92ef1 Document that Java 15 is supported 
Closes gh-23447
 2020-09-22 15:19:47 +02:00
Stephane Nicoll
37ded9f6d3 Merge branch '2.2.x' into 2.3.x 
Closes gh-23446
 2020-09-22 10:10:24 +02:00
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
363d35a0ac Merge branch '2.2.x' into 2.3.x 
Closes gh-23444
 2020-09-21 23:20:10 -07: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
3fca8c6b4e Merge branch '2.2.x' into 2.3.x 
Closes gh-23441
 2020-09-21 22:27:45 -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
Andy Wilkinson
0963218be1 Merge branch '2.2.x' into 2.3.x 2020-09-21 19:28:39 +01:00
Andy Wilkinson
0edf7cb9b9 Polish Log4j2 XML configuration tests 
See gh-22983
 2020-09-21 19:26:40 +01:00
Andy Wilkinson
13e08a4344 Merge branch '2.2.x' into 2.3.x 
Closes gh-23428
 2020-09-21 15:15:08 +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
8667e9ded8 Merge branch '2.2.x' into 2.3.x 
Closes gh-23426
 2020-09-21 12:16:14 +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
d06af28cd8 Merge branch '2.2.x' into 2.3.x 
Closes gh-23422
 2020-09-21 10:47:06 +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
55bfef9901 Merge branch '2.2.x' into 2.3.x 
Closes gh-23408
 2020-09-18 13:32:46 +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
3861ef13fb Merge branch '2.2.x' into 2.3.x 
Closes gh-23406
 2020-09-18 09:09:41 +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
Andy Wilkinson
07dc202966 Upgrade to Micrometer 1.5.5 
Closes gh-23393
 2020-09-17 13:02:23 +01:00
Stephane Nicoll
3622fd5b04 Upgrade to Spring Session Dragonfruit-SR1 
Closes gh-23187
 2020-09-17 08:51:49 +02: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
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
a2be6e0817 Upgrade to Spring Kafka 2.5.6 
Closes gh-23199
 2020-09-17 07:25:09 +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
d3d96f0417 Upgrade to Spring REST Docs 2.0.5.RELEASE 
Closes gh-23374
 2020-09-16 17:45:34 +01:00
Andy Wilkinson
d6586b8354 Merge branch '2.2.x' into 2.3.x 
Closes gh-23376
 2020-09-16 17:39:08 +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
7a7aef80d9 Upgrade to Spring AMQP 2.2.11 
Closes gh-23373
 2020-09-16 18:24:53 +02:00
Stephane Nicoll
9ab8ad6e74 Upgrade to Spring AMQP 2.2.11 
Closes gh-23372
 2020-09-16 18:23:06 +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
68ea2ca210 Upgrade to Spring Data Neumann-SR4 
Closes gh-23196
 2020-09-16 15:45:46 +02:00
Stephane Nicoll
bac5a7909e Upgrade to Spring Data Moore-SR10 
Closes gh-23195
 2020-09-16 15:44:25 +02:00
Stephane Nicoll
b1e47811af Upgrade to Spring Data Lovelace-SR20 
Closes gh-23194
 2020-09-16 15:40:09 +02:00
Stephane Nicoll
8faa08f585 Merge branch '2.2.x' into 2.3.x 
Closes gh-23341
 2020-09-16 11:43:43 +02:00
Stephane Nicoll
15dd780eb4 Upgrade to Spring WS 3.0.10.RELEASE 
Closes gh-23339
 2020-09-16 10:10:17 +02:00
Stephane Nicoll
e5af0d51aa Upgrade to Spring HATEOAS 1.1.2.RELEASE 
Closes gh-23338
 2020-09-16 10:10:15 +02:00
Stephane Nicoll
83d9385946 Upgrade to Lettuce 5.3.4.RELEASE 
Closes gh-23337
 2020-09-16 10:10:14 +02:00
Stephane Nicoll
d7a5d44a75 Upgrade to Spring Ws 3.0.10.RELEASE 
Closes gh-23336
 2020-09-16 10:02:17 +02:00