diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..cf01a66e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +# Work in Progress +consul: + image: progrium/consul + volumes: + - /data + - /config + - ./src/test/resources/consul_ui:/ui + ports: + - "8400:8400" + - "8500:8500" + - "8600:53/udp" + command: agent -server -bootstrap -data-dir /data -ui-dir /ui \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb30b720..1c242d06 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ + spring-cloud-consul-dependencies spring-cloud-consul-core spring-cloud-consul-config spring-cloud-consul-discovery @@ -54,199 +55,14 @@ - - 1.1.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT - 1.0.2.RELEASE - 0.7.1 - 1.1.6 - 8.8.1 - 2.3.1 - 4.5 - 4.4.1 - 2.7 - 1.16.4 - 2.1.0 - - org.springframework.cloud - spring-cloud-consul-core + spring-cloud-consul-dependencies ${project.version} - - - org.springframework.cloud - spring-cloud-consul-bus - ${project.version} - - - org.springframework.cloud - spring-cloud-consul-config - ${project.version} - - - org.springframework.cloud - spring-cloud-consul-discovery - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-consul - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-consul-bus - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-consul-config - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-consul-discovery - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-consul-all - ${project.version} - - - org.springframework.cloud - spring-cloud-commons - ${spring-cloud-commons.version} - - - org.springframework.cloud - spring-cloud-bus - ${spring-cloud-bus.version} - - - org.springframework.boot - spring-boot-starter-amqp - - - org.springframework.integration - spring-integration-amqp - - - org.springframework.cloud - spring-cloud-spring-service-connector - - - - org.springframework.cloud - spring-cloud-localconfig-connector - - - - org.springframework.cloud - spring-cloud-cloudfoundry-connector - - - - - - org.springframework.cloud - spring-cloud-context - ${spring-cloud-commons.version} - - - com.ecwid.consul - consul-api - ${consul-api.version} - - - javax.servlet - servlet-api - - - - - org.springframework.integration - spring-integration-java-dsl - ${spring-integration-dsl.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - org.springframework.cloud - spring-cloud-starter-zuul - ${spring-cloud-netflix.version} - - - org.springframework.cloud - spring-cloud-netflix-core - ${spring-cloud-netflix.version} - - - com.netflix.archaius - archaius-core - ${archaius.version} - - - - commons-configuration - commons-configuration - 1.8 - - - com.netflix.ribbon - ribbon - ${ribbon.version} - - - com.netflix.ribbon - ribbon-core - ${ribbon.version} - - - - com.google.guava - guava - 18.0 - - - com.netflix.ribbon - ribbon-loadbalancer - ${ribbon.version} - - - com.netflix.ribbon - ribbon-httpclient - ${ribbon.version} - - - joda-time - joda-time - ${joda-time.version} - - - org.projectlombok - lombok - ${lombok.version} - provided + import + pom diff --git a/spring-cloud-consul-dependencies/.factorypath b/spring-cloud-consul-dependencies/.factorypath new file mode 100644 index 00000000..e91bd512 --- /dev/null +++ b/spring-cloud-consul-dependencies/.factorypath @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml new file mode 100644 index 00000000..b005b56f --- /dev/null +++ b/spring-cloud-consul-dependencies/pom.xml @@ -0,0 +1,237 @@ + + + 4.0.0 + + spring-cloud-dependencies-parent + org.springframework.cloud + 1.1.0.BUILD-SNAPSHOT + + + spring-cloud-consul-dependencies + 1.0.0.BUILD-SNAPSHOT + pom + spring-cloud-consul-dependencies + Spring Cloud Consul Dependencies + + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT + 1.0.2.RELEASE + 0.7.1 + 1.1.6 + 2.3.1 + 4.5 + 4.4.1 + 2.7 + + + + + org.springframework.cloud + spring-cloud-netflix-dependencies + ${spring-cloud-netflix.version} + import + pom + + + org.springframework.cloud + spring-cloud-consul-core + ${project.version} + + + org.springframework.cloud + spring-cloud-consul-bus + ${project.version} + + + org.springframework.cloud + spring-cloud-consul-config + ${project.version} + + + org.springframework.cloud + spring-cloud-consul-discovery + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-consul + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-consul-bus + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-consul-config + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-consul-discovery + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-consul-all + ${project.version} + + + org.springframework.cloud + spring-cloud-commons + ${spring-cloud-commons.version} + + + org.springframework.cloud + spring-cloud-bus + ${spring-cloud-bus.version} + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.integration + spring-integration-amqp + + + org.springframework.cloud + spring-cloud-spring-service-connector + + + + org.springframework.cloud + spring-cloud-localconfig-connector + + + + org.springframework.cloud + spring-cloud-cloudfoundry-connector + + + + + + org.springframework.cloud + spring-cloud-context + ${spring-cloud-commons.version} + + + com.ecwid.consul + consul-api + ${consul-api.version} + + + javax.servlet + servlet-api + + + + + org.springframework.integration + spring-integration-java-dsl + ${spring-integration-dsl.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + org.springframework.cloud + spring-cloud-starter-zuul + ${spring-cloud-netflix.version} + + + org.springframework.cloud + spring-cloud-netflix-core + ${spring-cloud-netflix.version} + + + com.netflix.archaius + archaius-core + ${archaius.version} + + + + commons-configuration + commons-configuration + 1.8 + + + joda-time + joda-time + ${joda-time.version} + + + org.projectlombok + lombok + true + + + + + + spring + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + + + diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index b843659f..b8514c4f 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -51,13 +51,12 @@ org.springframework.cloud spring-cloud-starter-feign - ${spring-cloud-netflix.version} org.projectlombok lombok - provided + true