diff --git a/pom.xml b/pom.xml index 5edbcde8..5cfe84b8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,11 +33,12 @@ spring-cloud-consul-bus spring-cloud-consul-ui spring-cloud-consul-sample + spring-cloud-starter-consul spring-cloud-starter-consul-bus spring-cloud-starter-consul-config spring-cloud-starter-consul-discovery spring-cloud-starter-consul-ui - spring-cloud-starter-consul + spring-cloud-starter-consul-all docs @@ -121,6 +122,11 @@ spring-cloud-starter-consul-ui ${project.version} + + org.springframework.cloud + spring-cloud-starter-consul-all + ${project.version} + org.springframework.cloud spring-cloud-commons diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index dd26dbaf..048c28b4 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -47,7 +47,7 @@ org.springframework.cloud - spring-cloud-starter-consul + spring-cloud-starter-consul-all - - com.google.code.gson - gson - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - diff --git a/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides index 6583dfc2..7e37bc1f 100644 --- a/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides +++ b/spring-cloud-starter-consul-bus/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus \ No newline at end of file +provides: spring-cloud-consul-bus \ No newline at end of file diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index fc37b904..543068dd 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -22,32 +22,11 @@ org.springframework.cloud - spring-cloud-consul-config - - - org.springframework.boot - spring-boot-starter-web - - - com.ecwid.consul - consul-api - - - - com.google.code.gson - gson - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore + spring-cloud-starter-consul org.springframework.cloud - spring-cloud-consul-core + spring-cloud-consul-config org.springframework.cloud diff --git a/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides index 3d862baa..76b15afb 100644 --- a/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides +++ b/spring-cloud-starter-consul-config/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-config \ No newline at end of file +provides: spring-cloud-consul-config \ No newline at end of file diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index b40a1fe2..675c9e88 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -21,39 +21,14 @@ ${basedir}/../.. + + org.springframework.cloud + spring-cloud-starter-consul + org.springframework.cloud spring-cloud-consul-discovery - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-commons - - - com.ecwid.consul - consul-api - - - - com.google.code.gson - gson - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.springframework.cloud - spring-cloud-consul-core - org.springframework.cloud spring-cloud-netflix-core diff --git a/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides index 9952539f..85fed12c 100644 --- a/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides +++ b/spring-cloud-starter-consul-discovery/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-discovery \ No newline at end of file +provides: spring-cloud-consul-discovery \ No newline at end of file diff --git a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides index 9d157263..e5fe9b5e 100644 --- a/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides +++ b/spring-cloud-starter-consul-ui/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-ui \ No newline at end of file +provides: spring-cloud-consul-ui \ No newline at end of file diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 4154bc6b..e4b497b9 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -21,20 +21,33 @@ - org.springframework.cloud - spring-cloud-starter-consul-bus + org.springframework.boot + spring-boot-starter-web org.springframework.cloud - spring-cloud-starter-consul-config + spring-cloud-commons org.springframework.cloud - spring-cloud-starter-consul-discovery + spring-cloud-consul-core - org.springframework.cloud - spring-cloud-starter-consul-ui + com.ecwid.consul + consul-api + + + + com.google.code.gson + gson + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore diff --git a/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides index 281e1913..174eee93 100644 --- a/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides +++ b/spring-cloud-starter-consul/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: spring-cloud-consul-core, consul-api, spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui \ No newline at end of file +provides: spring-cloud-consul-core, consul-api \ No newline at end of file