SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to use DelegatedResourceLoader that can use an empty loaders map

Browse Source
This commit is contained in:
Glenn Renfro
2016-07-06 22:14:41 -04:00
committed by Michael Minella
parent 7f1ece96e6
commit de3d09664e
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfiguration.java
View File

@@ -20,6 +20,7 @@ import java.util.Map;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.deployer.resource.maven.MavenProperties;
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
@@ -63,4 +64,15 @@ public class ResourceLoadingAutoConfiguration {
@ConfigurationProperties(prefix = "maven")
public static class MavenConfigurationProperties extends MavenProperties {}
}
@Configuration
@ConditionalOnMissingClass("org.springframework.cloud.deployer.resource.maven.MavenResourceLoader")
public static class LocalResourceLoadingAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public DelegatingResourceLoader delegatingResourceLoader() {
return new DelegatingResourceLoader();
}
}
}

8
spring-cloud-task-dependencies/pom.xml
View File

@@ -16,11 +16,11 @@
<properties>
<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.0.1.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.1.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-deployer-spi.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>1.0.2.RELEASE</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.0.1.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.0.1.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-cloud-deployer-resource-support.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-deployer-resource-maven.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
</properties>
<dependencyManagement>