diff --git a/pom.xml b/pom.xml
index 9e2d70e94..e2eff0460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
spring-cloud-netflix-turbine
spring-cloud-netflix-turbine-stream
spring-cloud-netflix-sidecar
+ spring-cloud-starter-archaius
spring-cloud-starter-atlas
spring-cloud-starter-eureka
spring-cloud-starter-eureka-server
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index 377b3e3d4..83e338a72 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -59,6 +59,13 @@
archaius-core
true
+
+
+ commons-configuration
+ commons-configuration
+ true
+
+
com.netflix.servo
servo-core
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 6b642d6d6..1437e3410 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -16,7 +16,7 @@
1.1.0.BUILD-SNAPSHOT
1.1.0.BUILD-SNAPSHOT
1.0.0.BUILD-SNAPSHOT
- 0.6.5
+ 0.7.3
1.3.4
8.12.1
1.4.21
@@ -45,6 +45,11 @@
pom
import
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+ ${project.version}
+
org.springframework.cloud
spring-cloud-starter-atlas
@@ -177,6 +182,13 @@
+
+
+ commons-configuration
+ commons-configuration
+ 1.8
+
+
com.sun.jersey
jersey-servlet
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index 7e78d4b31..c8e1224c5 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -72,6 +72,13 @@
archaius-core
true
+
+
+ commons-configuration
+ commons-configuration
+ true
+
+
com.netflix.ribbon
ribbon
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index dc87eaeb2..7115a5eb3 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -72,6 +72,13 @@
com.netflix.archaius
archaius-core
+
+
+ commons-configuration
+ commons-configuration
+ true
+
+
javax.inject
javax.inject
diff --git a/spring-cloud-starter-archaius/pom.xml b/spring-cloud-starter-archaius/pom.xml
new file mode 100644
index 000000000..06648f11b
--- /dev/null
+++ b/spring-cloud-starter-archaius/pom.xml
@@ -0,0 +1,58 @@
+
+
+ 4.0.0
+
+ org.springframework.cloud
+ spring-cloud-netflix
+ 1.1.0.BUILD-SNAPSHOT
+ ..
+
+ spring-cloud-starter-archaius
+ spring-cloud-starter-archaius
+ Spring Cloud Starter
+ http://projects.spring.io/spring-cloud
+
+ Pivotal Software, Inc.
+ http://www.spring.io
+
+
+ ${basedir}/../..
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter
+
+
+ org.springframework.cloud
+ spring-cloud-netflix-core
+
+
+ com.netflix.archaius
+ archaius-core
+
+
+
+ commons-configuration
+ commons-configuration
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.google.guava
+ guava
+
+
+
+
diff --git a/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.provides
new file mode 100644
index 000000000..b8f657ede
--- /dev/null
+++ b/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: archaius-core
\ No newline at end of file
diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml
index bb650d396..7a2592d8d 100644
--- a/spring-cloud-starter-eureka-server/pom.xml
+++ b/spring-cloud-starter-eureka-server/pom.xml
@@ -28,6 +28,10 @@
org.springframework.cloud
spring-cloud-netflix-eureka-server
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
org.springframework.cloud
spring-cloud-starter-ribbon
diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml
index 3ddc82d40..cf888132a 100644
--- a/spring-cloud-starter-eureka/pom.xml
+++ b/spring-cloud-starter-eureka/pom.xml
@@ -42,6 +42,10 @@
com.netflix.eureka
eureka-client
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
org.springframework.cloud
spring-cloud-starter-ribbon
diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml
index d54d1cdd2..91ac0dd00 100644
--- a/spring-cloud-starter-feign/pom.xml
+++ b/spring-cloud-starter-feign/pom.xml
@@ -52,5 +52,9 @@
org.springframework.cloud
spring-cloud-starter-ribbon
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml
index 557594ba7..999407c35 100644
--- a/spring-cloud-starter-hystrix-dashboard/pom.xml
+++ b/spring-cloud-starter-hystrix-dashboard/pom.xml
@@ -32,5 +32,9 @@
org.springframework.cloud
spring-cloud-netflix-hystrix-dashboard
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml
index ad30d4e3c..aafc0ec15 100644
--- a/spring-cloud-starter-hystrix/pom.xml
+++ b/spring-cloud-starter-hystrix/pom.xml
@@ -28,6 +28,10 @@
org.springframework.cloud
spring-cloud-netflix-core
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
com.netflix.hystrix
hystrix-core
diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml
index e984ca677..641871c1b 100644
--- a/spring-cloud-starter-ribbon/pom.xml
+++ b/spring-cloud-starter-ribbon/pom.xml
@@ -28,6 +28,10 @@
org.springframework.cloud
spring-cloud-netflix-core
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
com.netflix.ribbon
ribbon
diff --git a/spring-cloud-starter-turbine-stream/pom.xml b/spring-cloud-starter-turbine-stream/pom.xml
index 8195f9007..3bfcc8a51 100644
--- a/spring-cloud-starter-turbine-stream/pom.xml
+++ b/spring-cloud-starter-turbine-stream/pom.xml
@@ -35,6 +35,10 @@
org.springframework.cloud
spring-cloud-commons
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
org.springframework.cloud
spring-cloud-netflix-turbine-stream
diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml
index a99c1892c..8cdd6a7c2 100644
--- a/spring-cloud-starter-zuul/pom.xml
+++ b/spring-cloud-starter-zuul/pom.xml
@@ -40,6 +40,10 @@
org.springframework.cloud
spring-cloud-starter-ribbon
+
+ org.springframework.cloud
+ spring-cloud-starter-archaius
+
com.netflix.zuul
zuul-core