diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e9c2b63c9d0..99bbcfcfb4b 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -124,7 +124,7 @@ 4.12 3.5.3 2.6.2 - 1.1.7 + 1.1.8 1.16.10 1.4.6 1.10.19 diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java index 0c5b831271a..221cfa07277 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import ch.qos.logback.core.ConsoleAppender; import ch.qos.logback.core.rolling.FixedWindowRollingPolicy; import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; +import ch.qos.logback.core.util.FileSize; import ch.qos.logback.core.util.OptionHelper; import org.springframework.boot.bind.RelaxedPropertyResolver; @@ -142,7 +143,7 @@ class DefaultLogbackConfiguration { config.start(rollingPolicy); SizeBasedTriggeringPolicy triggeringPolicy = new SizeBasedTriggeringPolicy(); - triggeringPolicy.setMaxFileSize("10MB"); + triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB")); appender.setTriggeringPolicy(triggeringPolicy); config.start(triggeringPolicy);