From c26f45ad6ec3378f432146c02586b6e79e42c037 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 25 Jun 2015 11:59:53 +0100 Subject: [PATCH] Re-organize starters so they can be extracted cleanly Extraction into the "natural" home will follow in the next release train. For now the only uncomfortable thing is the version of the starters are all 1.0.3 (whereas their parent might be 1.0.2). --- pom.xml | 1 - spring-cloud-starter-aws-jdbc/pom.xml | 7 +- spring-cloud-starter-aws-messaging/pom.xml | 7 +- spring-cloud-starter-aws/pom.xml | 7 +- spring-cloud-starter-build/pom.xml | 358 ------------------ .../main/resources/META-INF/spring.provides | 1 - spring-cloud-starter-bus-amqp/pom.xml | 18 +- spring-cloud-starter-cloudfoundry/pom.xml | 7 +- spring-cloud-starter-config/pom.xml | 7 +- spring-cloud-starter-eureka-server/pom.xml | 4 +- spring-cloud-starter-eureka/pom.xml | 4 +- spring-cloud-starter-feign/pom.xml | 4 +- .../pom.xml | 4 +- spring-cloud-starter-hystrix/pom.xml | 4 +- spring-cloud-starter-oauth2/pom.xml | 7 +- spring-cloud-starter-parent/pom.xml | 38 +- spring-cloud-starter-ribbon/pom.xml | 4 +- spring-cloud-starter-security/pom.xml | 7 +- spring-cloud-starter-turbine-amqp/pom.xml | 15 +- spring-cloud-starter-turbine/pom.xml | 4 +- spring-cloud-starter/pom.xml | 5 +- 21 files changed, 70 insertions(+), 443 deletions(-) delete mode 100644 spring-cloud-starter-build/pom.xml delete mode 100644 spring-cloud-starter-build/src/main/resources/META-INF/spring.provides diff --git a/pom.xml b/pom.xml index ce82983..a02ce68 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,6 @@ - spring-cloud-starter-build spring-cloud-starter-parent spring-cloud-starter spring-cloud-starter-config diff --git a/spring-cloud-starter-aws-jdbc/pom.xml b/spring-cloud-starter-aws-jdbc/pom.xml index 82d8e7e..4734371 100644 --- a/spring-cloud-starter-aws-jdbc/pom.xml +++ b/spring-cloud-starter-aws-jdbc/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-aws + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-aws-jdbc + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-aws-jdbc Spring Cloud Starter AWS JDBC http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-aws-messaging/pom.xml b/spring-cloud-starter-aws-messaging/pom.xml index ee3b6d6..a4e9ed7 100644 --- a/spring-cloud-starter-aws-messaging/pom.xml +++ b/spring-cloud-starter-aws-messaging/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-aws + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-aws-messaging + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-aws-messaging Spring Cloud Starter AWS Messaging http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-aws/pom.xml b/spring-cloud-starter-aws/pom.xml index a93e995..1f4ed85 100644 --- a/spring-cloud-starter-aws/pom.xml +++ b/spring-cloud-starter-aws/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-aws + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-aws + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-aws Spring Cloud Starter AWS http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-build/pom.xml b/spring-cloud-starter-build/pom.xml deleted file mode 100644 index 4223ae7..0000000 --- a/spring-cloud-starter-build/pom.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-parent - 1.0.2.BUILD-SNAPSHOT - - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - spring-cloud-starter-build - Spring Cloud Starter Build - a temporary shim for the Angel service releases (in Brixton we plan to split the starters out into their "natural" homes with the things they activate, e.g. eureka part of netflix) - pom - http://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT - 1.0.3.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-config - ${spring-cloud-config.version} - pom - import - - - org.springframework.cloud - spring-cloud-netflix - ${spring-cloud-netflix.version} - pom - import - - - - org.springframework.cloud - spring-cloud-commons - ${spring-cloud-commons.version} - - - org.springframework.cloud - spring-cloud-context - ${spring-cloud-commons.version} - - - org.springframework.cloud - spring-cloud-security - ${spring-cloud-security.version} - - - org.springframework.cloud - spring-cloud-bus - ${spring-cloud-bus.version} - - - org.springframework.cloud - spring-cloud-bus-hystrix - ${spring-cloud-netflix.version} - - - org.springframework.cloud - spring-cloud-aws-context - ${spring-cloud-aws.version} - - - org.springframework.cloud - spring-cloud-aws-autoconfigure - ${spring-cloud-aws.version} - - - org.springframework.cloud - spring-cloud-aws-jdbc - ${spring-cloud-aws.version} - - - org.springframework.cloud - spring-cloud-aws-messaging - ${spring-cloud-aws.version} - - - org.springframework.cloud - spring-cloud-starter-cloudfoundry - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-bus-amqp - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-config - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-turbine-amqp - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-eureka - 1.0.3.BUILD-SNAPSHOT - - - com.google.inject.extensions - guice-grapher - - - com.google.inject.extensions - guice-assistedinject - - - org.codehaus.jsr166-mirror - jsr166y - - - org.apache.xbean - xbean-finder - - - asm - asm-all - - - com.google.inject.extensions - guice-multibindings - - - org.apache.xbean - xbean-bundleutils - - - org.apache.commons - commons-math - - - com.netflix.netflix-commons - netflix-infix - - - joda-time - joda-time - - - commons-jxpath - commons-jxpath - - - org.antlr - antlr-runtime - - - org.antlr - stringtemplate - - - antlr - antlr - - - com.google.code.gson - gson - - - com.google.code.findbugs - annotations - - - com.squareup.dagger - dagger - - - com.netflix.blitz4j - blitz4j - - - hibernate-validator - org.hibernate - - - - - org.springframework.cloud - spring-cloud-starter-eureka-server - 1.0.3.BUILD-SNAPSHOT - - - com.google.inject.extensions - guice-grapher - - - com.google.inject.extensions - guice-assistedinject - - - org.codehaus.jsr166-mirror - jsr166y - - - org.apache.xbean - xbean-finder - - - asm - asm-all - - - com.google.inject.extensions - guice-multibindings - - - org.apache.xbean - xbean-bundleutils - - - org.apache.commons - commons-math - - - com.netflix.netflix-commons - netflix-infix - - - joda-time - joda-time - - - commons-jxpath - commons-jxpath - - - org.antlr - antlr-runtime - - - org.antlr - stringtemplate - - - antlr - antlr - - - com.google.code.gson - gson - - - com.google.code.findbugs - annotations - - - com.squareup.dagger - dagger - - - - - org.springframework.cloud - spring-cloud-starter-feign - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-hystrix - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-hystrix-dashboard - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-oauth2 - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-ribbon - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-security - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-turbine - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-zuul - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-zuul-server - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-aws - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-aws-jdbc - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-aws-messaging - 1.0.3.BUILD-SNAPSHOT - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - com.netflix.eureka - eureka-core - - - com.netflix.eureka - eureka-client - - - - - - - - diff --git a/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 3628be6..0000000 --- a/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-config-client \ No newline at end of file diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 84dcc81..9b9f4a1 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-bus-parent + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-bus-amqp + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-bus-amqp Spring Cloud Starter http://projects.spring.io/spring-cloud @@ -19,17 +20,6 @@ ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-bus-parent - ${spring-cloud-bus.version} - pom - import - - - org.springframework.cloud diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 9b92f7e..e81cdc9 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-commons-parent + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-cloudfoundry + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-cloudfoundry Spring Cloud Starter http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index e9d9465..fcebd73 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-config + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-config + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml index ca185f7..8838615 100644 --- a/spring-cloud-starter-eureka-server/pom.xml +++ b/spring-cloud-starter-eureka-server/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-eureka-server spring-cloud-starter-eureka-server diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml index fc4f9d6..d52c984 100644 --- a/spring-cloud-starter-eureka/pom.xml +++ b/spring-cloud-starter-eureka/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-eureka spring-cloud-starter-eureka diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml index 05a4453..6ce4370 100644 --- a/spring-cloud-starter-feign/pom.xml +++ b/spring-cloud-starter-feign/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-feign spring-cloud-starter-feign diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml index ebf2da0..3d4c39d 100644 --- a/spring-cloud-starter-hystrix-dashboard/pom.xml +++ b/spring-cloud-starter-hystrix-dashboard/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-hystrix-dashboard spring-cloud-starter-hystrix-dashboard diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml index c9c30c2..680eea6 100644 --- a/spring-cloud-starter-hystrix/pom.xml +++ b/spring-cloud-starter-hystrix/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-hystrix spring-cloud-starter-hystrix diff --git a/spring-cloud-starter-oauth2/pom.xml b/spring-cloud-starter-oauth2/pom.xml index cb11d3a..bb8c479 100644 --- a/spring-cloud-starter-oauth2/pom.xml +++ b/spring-cloud-starter-oauth2/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-security-parent + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-oauth2 + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-oauth2 Spring Cloud Starter http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index bd917e4..9652a59 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -90,12 +90,22 @@ org.springframework.cloud - spring-cloud-starter-cloudfoundry + spring-cloud-starter 1.0.3.BUILD-SNAPSHOT org.springframework.cloud - spring-cloud-starter + spring-cloud-starter-aws + 1.0.3.BUILD-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-aws-jdbc + 1.0.3.BUILD-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-aws-messaging 1.0.3.BUILD-SNAPSHOT @@ -105,12 +115,12 @@ org.springframework.cloud - spring-cloud-starter-config + spring-cloud-starter-cloudfoundry 1.0.3.BUILD-SNAPSHOT org.springframework.cloud - spring-cloud-starter-turbine-amqp + spring-cloud-starter-config 1.0.3.BUILD-SNAPSHOT @@ -306,6 +316,11 @@ spring-cloud-starter-turbine 1.0.3.BUILD-SNAPSHOT + + org.springframework.cloud + spring-cloud-starter-turbine-amqp + 1.0.3.BUILD-SNAPSHOT + org.springframework.cloud spring-cloud-starter-zuul @@ -316,21 +331,6 @@ spring-cloud-starter-zuul-server 1.0.3.BUILD-SNAPSHOT - - org.springframework.cloud - spring-cloud-starter-aws - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-aws-jdbc - 1.0.3.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-aws-messaging - 1.0.3.BUILD-SNAPSHOT - diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml index aa795eb..b97ff91 100644 --- a/spring-cloud-starter-ribbon/pom.xml +++ b/spring-cloud-starter-ribbon/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-ribbon spring-cloud-starter-ribbon diff --git a/spring-cloud-starter-security/pom.xml b/spring-cloud-starter-security/pom.xml index 8102229..bfd94d5 100644 --- a/spring-cloud-starter-security/pom.xml +++ b/spring-cloud-starter-security/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-security-parent + 1.0.2.BUILD-SNAPSHOT + spring-cloud-starter-security + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter-security Spring Cloud Starter http://projects.spring.io/spring-cloud diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml index 669eb32..7dbc027 100644 --- a/spring-cloud-starter-turbine-amqp/pom.xml +++ b/spring-cloud-starter-turbine-amqp/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-turbine-amqp spring-cloud-starter-turbine-amqp @@ -20,17 +20,6 @@ ${basedir}/../.. 2.0.0-DP.2 - - - - org.springframework.cloud - spring-cloud-netflix-turbine-amqp - ${project.version} - pom - import - - - org.springframework.cloud diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml index 03fc43e..d2ec6e1 100644 --- a/spring-cloud-starter-turbine/pom.xml +++ b/spring-cloud-starter-turbine/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build + spring-cloud-netflix 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-build + spring-cloud-starter-turbine spring-cloud-starter-turbine diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index a6e6edd..3886604 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -4,11 +4,12 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-build - 1.0.3.BUILD-SNAPSHOT + spring-cloud-commons-parent + 1.0.2.BUILD-SNAPSHOT ../spring-cloud-starter-build spring-cloud-starter + 1.0.3.BUILD-SNAPSHOT spring-cloud-starter Spring Cloud Starter http://projects.spring.io/spring-cloud