root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
27,823 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

27823 Commits

Author SHA1 Message Date
Phillip Webb a47bc41fe3 Merge branch '2.2.x' into 2.3.x 2020-09-21 21:29:05 -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 945347c944 Merge branch '2.2.x' into 2.3.x 2020-09-21 17:46:49 -07:00
Phillip Webb 15f2186aaf Add Java 15 to download script 
See gh-23433
 2020-09-21 17:46:20 -07:00
Phillip Webb b59b28767b Merge branch '2.2.x' into 2.3.x 2020-09-21 17:41:50 -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 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 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 8eb7815a4d Merge branch '2.2.x' into 2.3.x 2020-09-20 17:00:46 +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 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
Spring Buildmaster f466ea1f2a Next development version (v2.3.5.BUILD-SNAPSHOT) 2020-09-17 13:14:51 +00:00
Andy Wilkinson 07dc202966 Upgrade to Micrometer 1.5.5 
Closes gh-23393
 2020-09-17 13:02:23 +01:00
Andy Wilkinson 6e369c9505 Merge branch '2.2.x' into 2.3.x 2020-09-17 12:51:56 +01:00
Spring Buildmaster bd8300cb6b Next development version (v2.2.11.BUILD-SNAPSHOT) 2020-09-17 11:04:48 +00:00
Andy Wilkinson 16ff7022db Merge branch '2.2.x' into 2.3.x 2020-09-17 09:47:18 +01: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 0fd61c1a14 Merge branch '2.2.x' into 2.3.x 2020-09-17 09:35:55 +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 3622fd5b04 Upgrade to Spring Session Dragonfruit-SR1 
Closes gh-23187
 2020-09-17 08:51:49 +02:00
Stephane Nicoll 0b06457ace Merge branch '2.2.x' into 2.3.x 2020-09-17 08:51:06 +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 29988f1d38 Merge branch '2.2.x' into 2.3.x 2020-09-17 08:22:57 +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 a2be6e0817 Upgrade to Spring Kafka 2.5.6 
Closes gh-23199
 2020-09-17 07:25:09 +02:00
Stephane Nicoll a76f5ae03e Merge branch '2.2.x' into 2.3.x 2020-09-17 07:24:24 +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 358b9f839a Remove spring-boot.version property from spring-boot-dependencies 
The version of Spring Boot should not be modifiable by a property,
only being using a different version of spring-boot-dependencies or
spring-boot-starter-parent.

Fixes gh-23174
 2020-09-16 18:25:17 +01:00
Andy Wilkinson d5234a9254 Merge branch '2.2.x' into 2.3.x 2020-09-16 17:46:25 +01: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 d6586b8354 Merge branch '2.2.x' into 2.3.x 
Closes gh-23376
 2020-09-16 17:39:08 +01:00