Rely on spring-cloud-deployer autoconfig

- Deployer core/local uses 2.0.0.BUILD-SNAPSHOT
- Use pring-cloud-deployer-dependencies bom
- Remove ResourceLoadingAutoConfiguration as that is now in
  deployer itself with a way to configure loaders.
- spring-cloud-task-core now depends on spring-cloud-deployer-autoconfigure.
- Rest of deployer modules like support/maven are still defined in deps
  as those are optional in spring-cloud-deployer-autoconfigure.
This commit is contained in:
Janne Valkealahti
2018-11-29 15:42:34 +00:00
parent 8e1d38a76a
commit de45d1eb47
5 changed files with 10 additions and 152 deletions

22
pom.xml
View File

@@ -63,8 +63,10 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-spi</artifactId>
<version>${spring-cloud-deployer-spi.version}</version>
<artifactId>spring-cloud-deployer-dependencies</artifactId>
<version>${spring-cloud-deployer.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -72,11 +74,6 @@
<version>${spring-cloud-deployer-local.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-resource-support</artifactId>
<version>${spring-cloud-deployer-resource-support.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId>
@@ -92,11 +89,6 @@
<artifactId>spring-batch-integration</artifactId>
<version>${spring-batch.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-resource-maven</artifactId>
<version>${spring-cloud-deployer-resource-maven.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
@@ -133,11 +125,9 @@
<properties>
<spring-cloud-stream.version>2.1.0.RC1</spring-cloud-stream.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-deployer-local.version>1.3.9.RELEASE</spring-cloud-deployer-local.version>
<spring-cloud-deployer-local.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>2.1.0.RC1</spring-cloud-stream-binder-rabbit.version>
<spring-cloud-deployer-resource-support.version>1.3.4.RELEASE</spring-cloud-deployer-resource-support.version>
<spring-cloud-deployer-resource-maven.version>1.3.4.RELEASE</spring-cloud-deployer-resource-maven.version>
<spring-cloud-deployer.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-deployer.version>
<spring-batch.version>4.1.0.RELEASE</spring-batch.version>
<commons-logging.version>1.1</commons-logging.version>
<java-ee-api.version>8.0</java-ee-api.version>