lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-19 01:58:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare for Spring Boot 1.5 compatibility

Browse Source
This commit is contained in:
Stephane Nicoll
2017-01-06 13:06:31 +01:00
parent f576d89bf8
commit 5efc6dc947
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initializr-actuator/pom.xml
View File

@@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-redis</artifactId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<optional>true</optional>
</dependency>
<dependency>

9
initializr-generator/src/test/groovy/io/spring/initializr/metadata/InitializrMetadataBuilderTests.groovy
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2017 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.
@@ -20,6 +20,9 @@ import org.junit.Test
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean
import org.springframework.boot.bind.PropertiesConfigurationFactory
import org.springframework.core.env.MutablePropertySources
import org.springframework.core.env.PropertiesPropertySource
import org.springframework.core.env.PropertySources
import org.springframework.core.io.ClassPathResource
import org.springframework.core.io.Resource
@@ -183,7 +186,9 @@ class InitializrMetadataBuilderTests {
PropertiesConfigurationFactory<InitializrProperties> factory =
new PropertiesConfigurationFactory<>(InitializrProperties)
factory.setTargetName("initializr")
factory.setProperties(loadProperties(resource))
PropertySources sources = new MutablePropertySources()
sources.addFirst(new PropertiesPropertySource("main", loadProperties(resource)))
factory.setPropertySources(sources)
factory.afterPropertiesSet();
return factory.getObject();
}