From 4bba2778eaacc405a4dde3bf0270aba24d0452aa Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 24 Jun 2015 17:35:42 +0100 Subject: [PATCH] Make starters independent of spring-cloud-starter-parent This is an essential step in breaking the tie between the individual starters and the release train. Temporarily introduces a new parent that we can fact out sooner or later. --- pom.xml | 1 + spring-cloud-starter-aws-jdbc/pom.xml | 4 +- spring-cloud-starter-aws-messaging/pom.xml | 4 +- spring-cloud-starter-aws/pom.xml | 5 +- spring-cloud-starter-build/pom.xml | 358 ++++++++++++++++++ .../main/resources/META-INF/spring.provides | 1 + spring-cloud-starter-bus-amqp/pom.xml | 4 +- spring-cloud-starter-cloudfoundry/pom.xml | 4 +- spring-cloud-starter-config/pom.xml | 4 +- 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 | 4 +- spring-cloud-starter-parent/pom.xml | 120 +++--- spring-cloud-starter-ribbon/pom.xml | 4 +- spring-cloud-starter-security/pom.xml | 4 +- spring-cloud-starter-turbine-amqp/pom.xml | 4 +- spring-cloud-starter-turbine/pom.xml | 4 +- spring-cloud-starter-zuul/pom.xml | 4 +- spring-cloud-starter/pom.xml | 4 +- 22 files changed, 456 insertions(+), 97 deletions(-) create mode 100644 spring-cloud-starter-build/pom.xml create mode 100644 spring-cloud-starter-build/src/main/resources/META-INF/spring.provides diff --git a/pom.xml b/pom.xml index a02ce68..ce82983 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ + 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 a601c34..82d8e7e 100644 --- a/spring-cloud-starter-aws-jdbc/pom.xml +++ b/spring-cloud-starter-aws-jdbc/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-aws-jdbc spring-cloud-starter-aws-jdbc diff --git a/spring-cloud-starter-aws-messaging/pom.xml b/spring-cloud-starter-aws-messaging/pom.xml index d5cff23..ee3b6d6 100644 --- a/spring-cloud-starter-aws-messaging/pom.xml +++ b/spring-cloud-starter-aws-messaging/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-aws-messaging spring-cloud-starter-aws-messaging diff --git a/spring-cloud-starter-aws/pom.xml b/spring-cloud-starter-aws/pom.xml index 6d35a7d..a93e995 100644 --- a/spring-cloud-starter-aws/pom.xml +++ b/spring-cloud-starter-aws/pom.xml @@ -4,12 +4,11 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-aws - ${spring-cloud-aws.version} 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 new file mode 100644 index 0000000..4223ae7 --- /dev/null +++ b/spring-cloud-starter-build/pom.xml @@ -0,0 +1,358 @@ + + + 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 new file mode 100644 index 0000000..3628be6 --- /dev/null +++ b/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides @@ -0,0 +1 @@ +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 7921f0d..84dcc81 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-bus-amqp spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index ae84f53..9b92f7e 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-cloudfoundry spring-cloud-starter-cloudfoundry diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 843bf7d..e9d9465 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-config spring-cloud-starter-config diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml index 0b15eed..ca185f7 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 50845b6..fc4f9d6 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 ba8ca18..05a4453 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 9574e0a..ebf2da0 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 1392d96..c9c30c2 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 44c2526..cb11d3a 100644 --- a/spring-cloud-starter-oauth2/pom.xml +++ b/spring-cloud-starter-oauth2/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-oauth2 spring-cloud-starter-oauth2 diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 737523d..bd917e4 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -8,7 +8,7 @@ 1.0.2.BUILD-SNAPSHOT spring-cloud-starter-parent - 1.0.3.BUILD-SNAPSHOT + Angel.BUILD-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter pom @@ -58,45 +58,65 @@ spring-cloud-security ${spring-cloud-security.version} - - org.springframework.cloud - spring-cloud-starter-cloudfoundry - ${spring-cloud-cloudfoundry.version} - - - org.springframework.cloud - spring-cloud-starter - ${spring-cloud-commons.version} - - - org.springframework.cloud - spring-cloud-starter-bus-amqp - ${spring-cloud-bus.version} - org.springframework.cloud spring-cloud-bus ${spring-cloud-bus.version} - - org.springframework.cloud - spring-cloud-starter-config - ${spring-cloud-config.version} - - - org.springframework.cloud - spring-cloud-starter-turbine-amqp - ${spring-cloud-netflix.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 - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT com.google.inject.extensions @@ -179,7 +199,7 @@ org.springframework.cloud spring-cloud-starter-eureka-server - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT com.google.inject.extensions @@ -254,82 +274,62 @@ org.springframework.cloud spring-cloud-starter-feign - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-hystrix - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-hystrix-dashboard - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-oauth2 - ${spring-cloud-security.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-ribbon - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-security - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-turbine - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-zuul - ${spring-cloud-netflix.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-zuul-server - ${spring-cloud-starters.version} - - - org.springframework.cloud - spring-cloud-aws-context - ${spring-cloud-aws.version} - - - org.springframework.cloud - spring-cloud-aws-autoconfigure - ${spring-cloud-aws.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-aws - ${spring-cloud-aws.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-aws-jdbc - ${spring-cloud-aws.version} + 1.0.3.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-starter-aws-messaging - ${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} + 1.0.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml index 68421b3..aa795eb 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../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 f167beb..8102229 100644 --- a/spring-cloud-starter-security/pom.xml +++ b/spring-cloud-starter-security/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-security spring-cloud-starter-security diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml index e908292..669eb32 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-turbine-amqp spring-cloud-starter-turbine-amqp diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml index 17ec5dc..03fc43e 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-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-turbine spring-cloud-starter-turbine diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml index 818aafc..40e1679 100644 --- a/spring-cloud-starter-zuul/pom.xml +++ b/spring-cloud-starter-zuul/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter-zuul spring-cloud-starter-zuul diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index b5b2cad..a6e6edd 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-starter-parent + spring-cloud-starter-build 1.0.3.BUILD-SNAPSHOT - ../spring-cloud-starter-parent + ../spring-cloud-starter-build spring-cloud-starter spring-cloud-starter