Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-04-01 11:53:35 +01:00
parent c167e4fd0e dad4e84d35
commit f55066464d
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@@ -96,7 +96,8 @@ public class IntegrationAutoConfigurationTests {
"org.springframework.integration.monitor");
}
private static void assertDomains(MBeanServer mBeanServer, boolean expected, String... domains) {
private static void assertDomains(MBeanServer mBeanServer, boolean expected,
String... domains) {
List<String> actual = Arrays.asList(mBeanServer.getDomains());
for (String domain : domains) {
assertThat(actual.contains(domain)).isEqualTo(expected);

4
spring-boot-dependencies/pom.xml
View File

@@ -116,7 +116,7 @@
<junit.version>4.12</junit.version>
<liquibase.version>3.4.2</liquibase.version>
<log4j2.version>2.5</log4j2.version>
<logback.version>1.1.5</logback.version>
<logback.version>1.1.6</logback.version>
<lombok.version>1.16.6</lombok.version>
<mariadb.version>1.3.6</mariadb.version>
<mockito.version>1.10.19</mockito.version>
@@ -131,7 +131,7 @@
<sendgrid.version>2.2.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.16</slf4j.version>
<slf4j.version>1.7.20</slf4j.version>
<snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.5.0</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>

1
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java
View File

@@ -136,4 +136,5 @@ public class FindMainClassTask extends DefaultTask {
}
return null;
}
}

2
spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@@ -95,7 +95,7 @@ public class ConfigFileApplicationListenerTests {
LoggerContext loggerContext = ((Logger) LoggerFactory.getLogger(getClass()))
.getLoggerContext();
loggerContext.reset();
BasicConfigurator.configure(loggerContext);
new BasicConfigurator().configure(loggerContext);
}
@After

3
spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
View File

@@ -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