From 91d288d781db706ed114af56df934748faec0c84 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 3 Jul 2015 09:54:16 +0100 Subject: [PATCH] Update to Spring Boot 1.3, stage I (make it compile) --- .../cloud/netflix/eureka/server/Log4JLoggingSystemTests.java | 5 ++++- spring-cloud-netflix-turbine-amqp/pom.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java index 80860c4f..f95da01d 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java @@ -24,8 +24,10 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.springframework.boot.logging.LogLevel; +import org.springframework.boot.logging.LoggingInitializationContext; import org.springframework.boot.logging.log4j.Log4JLoggingSystem; import org.springframework.boot.test.OutputCapture; +import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.ClassPathResource; import org.springframework.util.StringUtils; @@ -61,7 +63,8 @@ public class Log4JLoggingSystemTests { @Ignore("gh-48") public void setLevel() throws Exception { this.loggingSystem.beforeInitialize(); - this.loggingSystem.initialize(null, null); + this.loggingSystem.initialize(new LoggingInitializationContext( + new StandardEnvironment()), null, null); this.logger.debug("Hello"); this.loggingSystem.setLogLevel("org.springframework.cloud", LogLevel.DEBUG); this.logger.debug("Hello"); diff --git a/spring-cloud-netflix-turbine-amqp/pom.xml b/spring-cloud-netflix-turbine-amqp/pom.xml index 2bd10117..2d9724c5 100644 --- a/spring-cloud-netflix-turbine-amqp/pom.xml +++ b/spring-cloud-netflix-turbine-amqp/pom.xml @@ -84,6 +84,7 @@ org.projectlombok lombok + compile true