From 3f742d967504e0678a85fb25e8c8e1aa2018c13e Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 7 Jan 2016 13:44:04 +0000 Subject: [PATCH] Add spring-cloud-netflix-dependencies module as a BOM The new module is a BOM that doesn't have any parent or direct dependency management in spring-boot-*. So users can include it in their dependency management without polluting the spring boot dependency versions. Luckily it can also be used in the main spring-cloud-netflix pom, which should no longer be used as a BOM. --- pom.xml | 436 +------------------- spring-cloud-netflix-dependencies/pom.xml | 471 ++++++++++++++++++++++ 2 files changed, 474 insertions(+), 433 deletions(-) create mode 100644 spring-cloud-netflix-dependencies/pom.xml diff --git a/pom.xml b/pom.xml index 55f698e0..93ffe1df 100644 --- a/pom.xml +++ b/pom.xml @@ -21,23 +21,7 @@ netflix - 1.1.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT ${basedir} - 0.6.5 - 1.3.4 - 8.12.1 - 1.4.21 - 2.1.0 - 0.10.0 - 1.1.0 - 1.0.14 - 1.7 - 1.0.0 - 1.0.0.RELEASE - 1.1.1.RELEASE - 1.19 @@ -71,434 +55,20 @@ org.springframework.cloud - spring-cloud-commons-parent - ${spring-cloud-commons.version} + spring-cloud-netflix-dependencies + ${project.version} pom import - - org.springframework.cloud - spring-cloud-config - ${spring-cloud-config.version} - pom - import - - - org.springframework.cloud - spring-cloud-starter-atlas - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-eureka - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-eureka-server - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-feign - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-hystrix - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-hystrix-dashboard - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-ribbon - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-spectator - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-turbine - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-turbine-stream - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-zuul - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-core - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-eureka-server - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-hystrix-dashboard - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-hystrix-stream - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-sidecar - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-spectator - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-turbine - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-turbine-stream - ${project.version} - - - org.springframework.cloud - spring-cloud-netflix-zuul-server - ${project.version} - - - org.springframework.cloud - spring-cloud-stream-parent - ${spring-cloud-stream.version} - pom - import - - - com.netflix.netflix-commons - netflix-commons-util - 0.1.1 - - - com.netflix.archaius - archaius-core - ${archaius.version} - - - commons-logging - commons-logging - - - com.google.code.findbugs - annotations - - - - - com.sun.jersey - jersey-servlet - ${eureka-jersey.version} - - - com.sun.jersey - jersey-core - ${eureka-jersey.version} - - - com.sun.jersey - jersey-client - ${eureka-jersey.version} - - - com.sun.jersey - jersey-server - ${eureka-jersey.version} - - - com.sun.jersey.contribs - jersey-apache-client4 - ${eureka-jersey.version} - - - com.netflix.servo - servo-core - ${servo.version} - - - com.google.code.findbugs - annotations - - - com.fasterxml.jackson.dataformat jackson-dataformat-smile ${jackson.version} - - com.netflix.eureka - eureka-client - ${eureka.version} - - - javax.servlet - servlet-api - - - commons-logging - commons-logging - - - com.google.code.findbugs - jsr305 - - - com.google.code.findbugs - annotations - - - - - javax-inject - javax-inject - 1 - - - com.netflix.eureka - eureka-core - ${eureka.version} - - - javax.servlet - servlet-api - - - commons-logging - commons-logging - - - log4j - log4j - - - com.netflix.blitz4j - blitz4j - - - com.google.code.findbugs - annotations - - - com.google.code.findbugs - jsr305 - - - - - - com.thoughtworks.xstream - xstream - 1.4.2 - - - com.netflix.feign - feign-core - ${feign.version} - - - com.netflix.feign - feign-slf4j - ${feign.version} - - - com.netflix.feign - feign-httpclient - ${feign.version} - - - com.netflix.feign - feign-hystrix - ${feign.version} - - - com.netflix.feign - feign-okhttp - ${feign.version} - - - com.netflix.hystrix - hystrix-core - ${hystrix.version} - - - com.google.code.findbugs - annotations - - - - - com.netflix.hystrix - hystrix-metrics-event-stream - ${hystrix.version} - - - javax.servlet - servlet-api - - - - - com.netflix.hystrix - hystrix-javanica - ${hystrix.version} - - - com.google.code.findbugs - jsr305 - - - com.google.code.findbugs - annotations - - - org.aspectj - aspectjrt - - - - - com.netflix.ribbon - ribbon - ${ribbon.version} - - - commons-logging - commons-logging - - - - - com.netflix.ribbon - ribbon-core - ${ribbon.version} - - - com.google.code.findbugs - annotations - - - - - com.netflix.ribbon - ribbon-httpclient - ${ribbon.version} - - - com.google.code.findbugs - annotations - - - - - com.netflix.ribbon - ribbon-eureka - ${ribbon.version} - - - com.google.code.findbugs - annotations - - - javax.servlet - servlet-api - - - - - com.netflix.ribbon - ribbon-loadbalancer - ${ribbon.version} - - - com.google.code.findbugs - annotations - - - - - io.reactivex - rxjava - ${rxjava.version} - - - com.netflix.zuul - zuul-core - ${zuul.version} - - - groovy-all - org.codehaus.groovy - - - mockito-all - org.mockito - - - - - org.springframework.integration - spring-integration-java-dsl - ${spring-integration-dsl.version} - - - com.squareup.okhttp - okhttp - 2.5.0 - - - com.google.guava - guava - 18.0 - - - org.webjars - d3js - 3.4.11 - - - org.webjars - jquery - 2.1.1 - - - org.webjars - bootstrap - 3.2.0 - - - javax.inject - javax.inject - 1 - + spring-cloud-netflix-dependencies spring-cloud-netflix-core spring-cloud-netflix-hystrix-dashboard spring-cloud-netflix-hystrix-amqp diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml new file mode 100644 index 00000000..0814a664 --- /dev/null +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -0,0 +1,471 @@ + + + 4.0.0 + + spring-cloud-dependencies-parent + org.springframework.cloud + 1.1.0.BUILD-SNAPSHOT + + spring-cloud-netflix-dependencies + 1.1.0.BUILD-SNAPSHOT + pom + spring-cloud-netflix-dependencies + Spring Cloud Netflix Dependencies + + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT + 1.0.0.BUILD-SNAPSHOT + 0.6.5 + 1.3.4 + 8.12.1 + 1.4.21 + 2.1.0 + 0.10.0 + 1.1.0 + 1.0.14 + 1.7 + 1.0.0 + 1.1.1.RELEASE + 1.19 + + + + + org.springframework.cloud + spring-cloud-commons-parent + ${spring-cloud-commons.version} + pom + import + + + org.springframework.cloud + spring-cloud-config + ${spring-cloud-config.version} + pom + import + + + org.springframework.cloud + spring-cloud-starter-atlas + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-eureka + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-eureka-server + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-feign + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-hystrix + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-hystrix-dashboard + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-ribbon + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-spectator + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-turbine + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-turbine-stream + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-zuul + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-core + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-eureka-server + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-hystrix-dashboard + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-hystrix-stream + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-sidecar + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-spectator + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-turbine + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-turbine-stream + ${project.version} + + + org.springframework.cloud + spring-cloud-netflix-zuul-server + ${project.version} + + + org.springframework.cloud + spring-cloud-stream-parent + ${spring-cloud-stream.version} + pom + import + + + com.netflix.netflix-commons + netflix-commons-util + 0.1.1 + + + com.netflix.archaius + archaius-core + ${archaius.version} + + + commons-logging + commons-logging + + + com.google.code.findbugs + annotations + + + + + com.sun.jersey + jersey-servlet + ${eureka-jersey.version} + + + com.sun.jersey + jersey-core + ${eureka-jersey.version} + + + com.sun.jersey + jersey-client + ${eureka-jersey.version} + + + com.sun.jersey + jersey-server + ${eureka-jersey.version} + + + com.sun.jersey.contribs + jersey-apache-client4 + ${eureka-jersey.version} + + + com.netflix.servo + servo-core + ${servo.version} + + + com.google.code.findbugs + annotations + + + + + com.netflix.eureka + eureka-client + ${eureka.version} + + + javax.servlet + servlet-api + + + commons-logging + commons-logging + + + com.google.code.findbugs + jsr305 + + + com.google.code.findbugs + annotations + + + + + javax-inject + javax-inject + 1 + + + com.netflix.eureka + eureka-core + ${eureka.version} + + + javax.servlet + servlet-api + + + commons-logging + commons-logging + + + log4j + log4j + + + com.netflix.blitz4j + blitz4j + + + com.google.code.findbugs + annotations + + + com.google.code.findbugs + jsr305 + + + + + + com.thoughtworks.xstream + xstream + 1.4.2 + + + com.netflix.feign + feign-core + ${feign.version} + + + com.netflix.feign + feign-slf4j + ${feign.version} + + + com.netflix.feign + feign-httpclient + ${feign.version} + + + com.netflix.feign + feign-hystrix + ${feign.version} + + + com.netflix.feign + feign-okhttp + ${feign.version} + + + com.netflix.hystrix + hystrix-core + ${hystrix.version} + + + com.google.code.findbugs + annotations + + + + + com.netflix.hystrix + hystrix-metrics-event-stream + ${hystrix.version} + + + javax.servlet + servlet-api + + + + + com.netflix.hystrix + hystrix-javanica + ${hystrix.version} + + + com.google.code.findbugs + jsr305 + + + com.google.code.findbugs + annotations + + + org.aspectj + aspectjrt + + + + + com.netflix.ribbon + ribbon + ${ribbon.version} + + + commons-logging + commons-logging + + + + + com.netflix.ribbon + ribbon-core + ${ribbon.version} + + + com.google.code.findbugs + annotations + + + + + com.netflix.ribbon + ribbon-httpclient + ${ribbon.version} + + + com.google.code.findbugs + annotations + + + + + com.netflix.ribbon + ribbon-eureka + ${ribbon.version} + + + com.google.code.findbugs + annotations + + + javax.servlet + servlet-api + + + + + com.netflix.ribbon + ribbon-loadbalancer + ${ribbon.version} + + + com.google.code.findbugs + annotations + + + + + io.reactivex + rxjava + ${rxjava.version} + + + com.netflix.zuul + zuul-core + ${zuul.version} + + + groovy-all + org.codehaus.groovy + + + mockito-all + org.mockito + + + + + com.squareup.okhttp + okhttp + 2.5.0 + + + com.google.guava + guava + 18.0 + + + org.webjars + d3js + 3.4.11 + + + org.webjars + jquery + 2.1.1 + + + org.webjars + bootstrap + 3.2.0 + + + javax.inject + javax.inject + 1 + + + + + https://github.com/spring-cloud + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + +