Merge branch 'eugenp:master' into master

spring-cloud-modules/spring-cloud-archaius/pom.xml

@@ -16,12 +16,12 @@
     </parent>
 
     <modules>
-        <module>additional-sources-simple</module>
-        <module>basic-config</module>
-        <module>dynamodb-config</module>
-        <module>extra-configs</module>
-        <module>jdbc-config</module>
-        <module>zookeeper-config</module>
+        <module>spring-cloud-archaius-additionalsources</module>
+        <module>spring-cloud-archaius-basic-config</module>
+        <module>spring-cloud-archaius-dynamodb-config</module>
+        <module>spring-cloud-archaius-extra-configs</module>
+        <module>spring-cloud-archaius-jdbc-config</module>
+        <module>spring-cloud-archaius-zookeeper-config</module>
     </modules>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-additionalsources/pom.xml

@@ -3,9 +3,9 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>
-    <artifactId>basic-config</artifactId>
+    <artifactId>spring-cloud-archaius-additional-sources-simple</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>basic-config</name>
+    <name>spring-cloud-archaius-additionalsources</name>
     <packaging>jar</packaging>
 
     <parent>

spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-basic-config/pom.xml

@@ -3,9 +3,9 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>
-    <artifactId>additional-sources-simple</artifactId>
+    <artifactId>spring-cloud-archaius-basic-config</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>additional-sources-simple</name>
+    <name>spring-cloud-archaius-basic-config</name>
     <packaging>jar</packaging>
 
     <parent>

spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml

@@ -3,8 +3,8 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>
-    <artifactId>dynamodb-config</artifactId>
-    <name>dynamodb-config</name>
+    <artifactId>spring-cloud-archaius-dynamodb-config</artifactId>
+    <name>spring-cloud-archaius-dynamodb-config</name>
     <packaging>jar</packaging>
 
     <parent>