diff --git a/pom.xml b/pom.xml index f96d8317..7140ee75 100755 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,10 @@ org.springframework.cloud - spring-cloud-deployer-spi - ${spring-cloud-deployer-spi.version} + spring-cloud-deployer-dependencies + ${spring-cloud-deployer.version} + pom + import org.springframework.cloud @@ -72,11 +74,6 @@ ${spring-cloud-deployer-local.version} test - - org.springframework.cloud - spring-cloud-deployer-resource-support - ${spring-cloud-deployer-resource-support.version} - org.springframework.batch spring-batch-core @@ -92,11 +89,6 @@ spring-batch-integration ${spring-batch.version} - - org.springframework.cloud - spring-cloud-deployer-resource-maven - ${spring-cloud-deployer-resource-maven.version} - org.springframework.cloud spring-cloud-stream-test-support-internal @@ -133,11 +125,9 @@ 2.1.0.RC1 - 1.3.4.RELEASE - 1.3.9.RELEASE + 2.0.0.BUILD-SNAPSHOT 2.1.0.RC1 - 1.3.4.RELEASE - 1.3.4.RELEASE + 2.0.0.BUILD-SNAPSHOT 4.1.0.RELEASE 1.1 8.0 diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index bf090c4f..8b40b38e 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -19,6 +19,10 @@ org.springframework.boot spring-boot-autoconfigure + + org.springframework.cloud + spring-cloud-deployer-autoconfigure + org.springframework.cloud spring-cloud-deployer-resource-support diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfiguration.java deleted file mode 100644 index 7ca5e8b2..00000000 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfiguration.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.cloud.task.configuration; - -import java.util.HashMap; -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; -import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ResourceLoader; - -/** - * Autoconfiguration of a file or Maven based {@link ResourceLoader}. - * - * @author Michael Minella - * @since 1.0.1 - */ -@Configuration -public class ResourceLoadingAutoConfiguration { - - @Configuration - @ConditionalOnClass(MavenResourceLoader.class) - public static class MavenResourceLoadingAutoConfiguration { - - @Bean - public MavenResourceLoader mavenResourceLoader(MavenProperties mavenProperties) { - return new MavenResourceLoader(mavenProperties); - } - - @Bean - @ConditionalOnMissingBean - public DelegatingResourceLoader delegatingResourceLoader(MavenResourceLoader mavenResourceLoader) { - Map loaders = new HashMap<>(1); - loaders.put("maven", mavenResourceLoader); - - return new DelegatingResourceLoader(loaders); - } - - @Bean - public MavenProperties mavenProperties() { - return new MavenConfigurationProperties(); - } - - @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(); - } - } -} diff --git a/spring-cloud-task-core/src/main/resources/META-INF/spring.factories b/spring-cloud-task-core/src/main/resources/META-INF/spring.factories index ea2f98ee..243ca91b 100644 --- a/spring-cloud-task-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-task-core/src/main/resources/META-INF/spring.factories @@ -1,4 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.task.configuration.SingleTaskConfiguration,\ -org.springframework.cloud.task.configuration.ResourceLoadingAutoConfiguration,\ org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration\ diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfigurationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfigurationTests.java deleted file mode 100644 index d2daa929..00000000 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/ResourceLoadingAutoConfigurationTests.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.task.configuration; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.deployer.resource.maven.MavenProperties; -import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader; -import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.junit.Assert.assertNotNull; - -/** - * @author Glenn Renfro - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = {ResourceLoadingAutoConfiguration.class}) -public class ResourceLoadingAutoConfigurationTests { - - @Autowired - ApplicationContext context; - - @Test - public void testTaskLauncher() { - MavenResourceLoader mavenResourceLoader = - context.getBean(MavenResourceLoader.class); - assertNotNull(mavenResourceLoader); - - DelegatingResourceLoader delegatingResourceLoader = - context.getBean(DelegatingResourceLoader.class); - assertNotNull(delegatingResourceLoader); - - MavenProperties mavenProperties = - context.getBean(MavenProperties.class); - assertNotNull(mavenProperties); - } - -}