Browse Source

Update to Spring Boot 1.3, stage I (make it compile)

pull/6/head
Dave Syer 10 years ago
parent
commit
91d288d781
  1. 5
      spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java
  2. 1
      spring-cloud-netflix-turbine-amqp/pom.xml

5
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/Log4JLoggingSystemTests.java

@ -24,8 +24,10 @@ import org.junit.Ignore; @@ -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 { @@ -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");

1
spring-cloud-netflix-turbine-amqp/pom.xml

@ -84,6 +84,7 @@ @@ -84,6 +84,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<!-- Only needed at compile time -->
<scope>compile</scope>
<optional>true</optional>
</dependency>

Loading…
Cancel
Save