Browse Source

Merge branch '1.3.x'

pull/5234/head
Andy Wilkinson 10 years ago
parent
commit
7d84273d98
  1. 2
      spring-boot-dependencies/pom.xml
  2. 1
      spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

2
spring-boot-dependencies/pom.xml

@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
<junit.version>4.12</junit.version>
<liquibase.version>3.4.2</liquibase.version>
<log4j2.version>2.4.1</log4j2.version>
<logback.version>1.1.3</logback.version>
<logback.version>1.1.5</logback.version>
<lombok.version>1.16.6</lombok.version>
<mariadb.version>1.3.4</mariadb.version>
<mockito.version>1.10.19</mockito.version>

1
spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

@ -122,6 +122,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { @@ -122,6 +122,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
"${logging.pattern.level:${LOG_LEVEL_PATTERN:%5p}}"));
new DefaultLogbackConfiguration(initializationContext, logFile)
.apply(configurator);
context.setPackagingDataEnabled(true);
}
@Override

Loading…
Cancel
Save