Merge remote-tracking branch 'origin/master'

spring-cloud/pom.xml

@@ -10,7 +10,7 @@
         <module>spring-cloud-config</module>
         <module>spring-cloud-eureka</module>
         <module>spring-cloud-hystrix</module>
-        <module>spring-cloud-integration</module>
+        <module>spring-cloud-bootstrap</module>
     </modules>
     <packaging>pom</packaging>
 

spring-cloud/spring-cloud-bootstrap/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-integration</artifactId>
+        <artifactId>spring-cloud</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -17,9 +17,9 @@
         <module>resource</module>
     </modules>
 
-    <artifactId>part-1</artifactId>
+
+    <artifactId>spring-cloud-integration</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    
 </project>

spring-cloud/spring-cloud-integration/pom.xml

@@ -1,15 +0,0 @@
-<?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>
-
-    <groupId>com.baeldung.spring.cloud</groupId>
-    <artifactId>spring-cloud-integration</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>part-1</module>
-    </modules>
-</project>