From 39140945b5e8aedcd50a8aff6009c2a0822dcf05 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 29 Mar 2016 21:45:11 -0700 Subject: [PATCH 1/3] Polish --- .../integration/IntegrationAutoConfigurationTests.java | 10 ++++++---- .../boot/gradle/run/FindMainClassTask.java | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index 69706e4a44b..d9f7c3bf486 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -77,23 +77,25 @@ public class IntegrationAutoConfigurationTests { "org.springframework.integration.monitor"); } - @Test public void parentContext() { this.context = new AnnotationConfigApplicationContext(); - this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class); + this.context.register(JmxAutoConfiguration.class, + IntegrationAutoConfiguration.class); this.context.refresh(); AnnotationConfigApplicationContext parent = this.context; this.context = new AnnotationConfigApplicationContext(); this.context.setParent(parent); - this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class); + this.context.register(JmxAutoConfiguration.class, + IntegrationAutoConfiguration.class); this.context.refresh(); assertNotNull(this.context.getBean(HeaderChannelRegistry.class)); ((ConfigurableApplicationContext) this.context.getParent()).close(); this.context.close(); } - private static void assertDomains(MBeanServer mBeanServer, boolean expected, String... domains) { + private static void assertDomains(MBeanServer mBeanServer, boolean expected, + String... domains) { List actual = Arrays.asList(mBeanServer.getDomains()); for (String domain : domains) { assertEquals(expected, actual.contains(domain)); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java index b4c052b51ba..a2a99428ce5 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java @@ -136,4 +136,5 @@ public class FindMainClassTask extends DefaultTask { } return null; } + } From e7bb67fa332e6d7aa748d13400364580a72bfa2b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 1 Apr 2016 11:36:48 +0100 Subject: [PATCH 2/3] Upgrade to SLF4J 1.7.20 Closes gh-5408 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index f219672d94c..53324a097bc 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -124,7 +124,7 @@ 2.2.2 3.1.0 1.1.1 - 1.7.16 + 1.7.20 1.16 4.10.4 1.0-groovy-2.4 From b4b7e7ead32f800b1ec15d4847804a7a8c374552 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Tue, 15 Mar 2016 00:28:52 +0900 Subject: [PATCH 3/3] Upgrade to Logback 1.1.6 Closes gh-5410 --- spring-boot-dependencies/pom.xml | 2 +- .../context/config/ConfigFileApplicationListenerTests.java | 4 ++-- .../logging/logback/SpringBootJoranConfiguratorTests.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 53324a097bc..bab5e03f6db 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -112,7 +112,7 @@ 3.4.2 1.2.17 2.4.1 - 1.1.5 + 1.1.6 1.2.3 1.10.19 2.13.3 diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index 3b64e4b5f26..886c7954eac 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.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. @@ -106,7 +106,7 @@ public class ConfigFileApplicationListenerTests { LoggerContext loggerContext = ((Logger) LoggerFactory.getLogger(getClass())) .getLoggerContext(); loggerContext.reset(); - BasicConfigurator.configure(loggerContext); + new BasicConfigurator().configure(loggerContext); } @After diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java index a00c6548354..3501e05d746 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.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. @@ -25,6 +25,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.slf4j.impl.StaticLoggerBinder; import org.springframework.boot.logging.LoggingInitializationContext; @@ -71,7 +72,7 @@ public class SpringBootJoranConfiguratorTests { @After public void reset() { this.context.stop(); - BasicConfigurator.configureDefaultContext(); + new BasicConfigurator().configure((LoggerContext) LoggerFactory.getILoggerFactory()); } @Test