Skip to content

S
spring-cloud-netflix
Commit b894f8db by Spencer Gibb
Options

Upgrade archaius to v 0.7.3

Added spring-cloud-starter-archaius so downstream projects like consul and zookeeper don't need to maintain the list of archaius depenencies. fixes gh-765
parent af88007c
Showing with 127 additions and 1 deletion
pom.xml
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
<module>spring-cloud-netflix-turbine</module> <module>spring-cloud-netflix-turbine</module>
<module>spring-cloud-netflix-turbine-stream</module> <module>spring-cloud-netflix-turbine-stream</module>
<module>spring-cloud-netflix-sidecar</module> <module>spring-cloud-netflix-sidecar</module>
<module>spring-cloud-starter-archaius</module>
<module>spring-cloud-starter-atlas</module> <module>spring-cloud-starter-atlas</module>
<module>spring-cloud-starter-eureka</module> <module>spring-cloud-starter-eureka</module>
<module>spring-cloud-starter-eureka-server</module> <module>spring-cloud-starter-eureka-server</module>
......
spring-cloud-netflix-core/pom.xml
...@@ -59,6 +59,13 @@ ...@@ -59,6 +59,13 @@
<artifactId>archaius-core</artifactId> <artifactId>archaius-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- archaius dependencies that are now runtime -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<optional>true</optional>
</dependency>
<!-- end archaius deps -->
<dependency> <dependency>
<groupId>com.netflix.servo</groupId> <groupId>com.netflix.servo</groupId>
<artifactId>servo-core</artifactId> <artifactId>servo-core</artifactId>
......
spring-cloud-netflix-dependencies/pom.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<spring-cloud-commons.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-commons.version> <spring-cloud-commons.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-config.version> <spring-cloud-config.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-stream.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream.version> <spring-cloud-stream.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream.version>
<archaius.version>0.6.5</archaius.version> <archaius.version>0.7.3</archaius.version>
<eureka.version>1.3.4</eureka.version> <eureka.version>1.3.4</eureka.version>
<feign.version>8.12.1</feign.version> <feign.version>8.12.1</feign.version>
<hystrix.version>1.4.21</hystrix.version> <hystrix.version>1.4.21</hystrix.version>
...@@ -47,6 +47,11 @@ ...@@ -47,6 +47,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-atlas</artifactId> <artifactId>spring-cloud-starter-atlas</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
...@@ -177,6 +182,13 @@ ...@@ -177,6 +182,13 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- archaius dependencies that are now runtime -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.8</version>
</dependency>
<!-- end archaius deps -->
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId> <artifactId>jersey-servlet</artifactId>
......
spring-cloud-netflix-eureka-client/pom.xml
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
<artifactId>archaius-core</artifactId> <artifactId>archaius-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- archaius dependencies that are now runtime -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<optional>true</optional>
</dependency>
<!-- end archaius deps -->
<dependency> <dependency>
<groupId>com.netflix.ribbon</groupId> <groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId> <artifactId>ribbon</artifactId>
......
spring-cloud-netflix-eureka-server/pom.xml
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
<groupId>com.netflix.archaius</groupId> <groupId>com.netflix.archaius</groupId>
<artifactId>archaius-core</artifactId> <artifactId>archaius-core</artifactId>
</dependency> </dependency>
<!-- archaius dependencies that are now runtime -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<optional>true</optional>
</dependency>
<!-- end archaius deps -->
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
......
spring-cloud-starter-archaius/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-starter-archaius</artifactId>
<name>spring-cloud-starter-archaius</name>
<description>Spring Cloud Starter</description>
<url>http://projects.spring.io/spring-cloud</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.archaius</groupId>
<artifactId>archaius-core</artifactId>
</dependency>
<!-- archaius dependencies that are now runtime -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<!-- end archaius deps -->
</dependencies>
</project>
spring-cloud-starter-archaius/src/main/resources/META-INF/spring.provides 0 → 100644
provides: archaius-core
\ No newline at end of file
spring-cloud-starter-eureka-server/pom.xml
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId> <artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency> </dependency>
<dependency> <dependency>
......
spring-cloud-starter-eureka/pom.xml
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId> <artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency> </dependency>
<dependency> <dependency>
......
spring-cloud-starter-feign/pom.xml
...@@ -52,5 +52,9 @@ ...@@ -52,5 +52,9 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId> <artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
spring-cloud-starter-hystrix-dashboard/pom.xml
...@@ -32,5 +32,9 @@ ...@@ -32,5 +32,9 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId> <artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
spring-cloud-starter-hystrix/pom.xml
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
<artifactId>spring-cloud-netflix-core</artifactId> <artifactId>spring-cloud-netflix-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.hystrix</groupId> <groupId>com.netflix.hystrix</groupId>
<artifactId>hystrix-core</artifactId> <artifactId>hystrix-core</artifactId>
</dependency> </dependency>
......
spring-cloud-starter-ribbon/pom.xml
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
<artifactId>spring-cloud-netflix-core</artifactId> <artifactId>spring-cloud-netflix-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.ribbon</groupId> <groupId>com.netflix.ribbon</groupId>
<artifactId>ribbon</artifactId> <artifactId>ribbon</artifactId>
</dependency> </dependency>
......
spring-cloud-starter-turbine-stream/pom.xml
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-turbine-stream</artifactId> <artifactId>spring-cloud-netflix-turbine-stream</artifactId>
</dependency> </dependency>
<dependency> <dependency>
......
spring-cloud-starter-zuul/pom.xml
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
<artifactId>spring-cloud-starter-ribbon</artifactId> <artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-archaius</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.zuul</groupId> <groupId>com.netflix.zuul</groupId>
<artifactId>zuul-core</artifactId> <artifactId>zuul-core</artifactId>
</dependency> </dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment