From 4a0233f49aee2ca0a74ca399fd2f00fe53f91bdd Mon Sep 17 00:00:00 2001
From: slavisa-baeldung <slavisa.baeldung@gmail.com>
Date: Wed, 28 Sep 2016 23:40:29 +0200
Subject: [PATCH] BAEL-314 - removing part 1 module

---
 .../application-config/discovery.properties   |  0
 .../application-config/gateway.properties     |  0
 .../application-config/resource.properties    |  0
 .../{part-1 => }/config/pom.xml               |  0
 .../integration/config/ConfigApplication.java |  0
 .../src/main/resources/application.properties |  0
 .../{part-1 => }/discovery/pom.xml            |  0
 .../discovery/DiscoveryApplication.java       |  0
 .../src/main/resources/bootstrap.properties   |  0
 .../{part-1 => }/gateway/pom.xml              |  0
 .../resource/GatewayApplication.java          |  0
 .../src/main/resources/bootstrap.properties   |  0
 .../spring-cloud-integration/part-1/pom.xml   | 25 -------------------
 spring-cloud/spring-cloud-integration/pom.xml | 18 ++++++++++---
 .../{part-1 => }/resource/pom.xml             |  0
 .../resource/ResourceApplication.java         |  0
 .../src/main/resources/bootstrap.properties   |  0
 17 files changed, 14 insertions(+), 29 deletions(-)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/application-config/discovery.properties (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/application-config/gateway.properties (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/application-config/resource.properties (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/config/pom.xml (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/config/src/main/resources/application.properties (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/discovery/pom.xml (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/discovery/src/main/resources/bootstrap.properties (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/gateway/pom.xml (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/gateway/src/main/resources/bootstrap.properties (100%)
 delete mode 100644 spring-cloud/spring-cloud-integration/part-1/pom.xml
 rename spring-cloud/spring-cloud-integration/{part-1 => }/resource/pom.xml (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java (100%)
 rename spring-cloud/spring-cloud-integration/{part-1 => }/resource/src/main/resources/bootstrap.properties (100%)

diff --git a/spring-cloud/spring-cloud-integration/part-1/application-config/discovery.properties b/spring-cloud/spring-cloud-integration/application-config/discovery.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/application-config/discovery.properties
rename to spring-cloud/spring-cloud-integration/application-config/discovery.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/application-config/gateway.properties b/spring-cloud/spring-cloud-integration/application-config/gateway.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/application-config/gateway.properties
rename to spring-cloud/spring-cloud-integration/application-config/gateway.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/application-config/resource.properties b/spring-cloud/spring-cloud-integration/application-config/resource.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/application-config/resource.properties
rename to spring-cloud/spring-cloud-integration/application-config/resource.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/config/pom.xml b/spring-cloud/spring-cloud-integration/config/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/config/pom.xml
rename to spring-cloud/spring-cloud-integration/config/pom.xml
diff --git a/spring-cloud/spring-cloud-integration/part-1/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java b/spring-cloud/spring-cloud-integration/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java
rename to spring-cloud/spring-cloud-integration/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java
diff --git a/spring-cloud/spring-cloud-integration/part-1/config/src/main/resources/application.properties b/spring-cloud/spring-cloud-integration/config/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/config/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-integration/config/src/main/resources/application.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/discovery/pom.xml b/spring-cloud/spring-cloud-integration/discovery/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/discovery/pom.xml
rename to spring-cloud/spring-cloud-integration/discovery/pom.xml
diff --git a/spring-cloud/spring-cloud-integration/part-1/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java b/spring-cloud/spring-cloud-integration/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java
rename to spring-cloud/spring-cloud-integration/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java
diff --git a/spring-cloud/spring-cloud-integration/part-1/discovery/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/discovery/src/main/resources/bootstrap.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/discovery/src/main/resources/bootstrap.properties
rename to spring-cloud/spring-cloud-integration/discovery/src/main/resources/bootstrap.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/gateway/pom.xml b/spring-cloud/spring-cloud-integration/gateway/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/gateway/pom.xml
rename to spring-cloud/spring-cloud-integration/gateway/pom.xml
diff --git a/spring-cloud/spring-cloud-integration/part-1/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java b/spring-cloud/spring-cloud-integration/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java
rename to spring-cloud/spring-cloud-integration/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java
diff --git a/spring-cloud/spring-cloud-integration/part-1/gateway/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/gateway/src/main/resources/bootstrap.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/gateway/src/main/resources/bootstrap.properties
rename to spring-cloud/spring-cloud-integration/gateway/src/main/resources/bootstrap.properties
diff --git a/spring-cloud/spring-cloud-integration/part-1/pom.xml b/spring-cloud/spring-cloud-integration/part-1/pom.xml
deleted file mode 100644
index 770e26bca2..0000000000
--- a/spring-cloud/spring-cloud-integration/part-1/pom.xml
+++ /dev/null
@@ -1,25 +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>
-
-    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-integration</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modules>
-        <module>config</module>
-        <module>discovery</module>
-        <module>gateway</module>
-        <module>resource</module>
-    </modules>
-
-    <artifactId>part-1</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    
-</project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-integration/pom.xml b/spring-cloud/spring-cloud-integration/pom.xml
index 1d56995009..c14c277d7f 100644
--- a/spring-cloud/spring-cloud-integration/pom.xml
+++ b/spring-cloud/spring-cloud-integration/pom.xml
@@ -4,12 +4,22 @@
          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>
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>config</module>
+        <module>discovery</module>
+        <module>gateway</module>
+        <module>resource</module>
+    </modules>
+
+
     <artifactId>spring-cloud-integration</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>part-1</module>
-    </modules>
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-integration/part-1/resource/pom.xml b/spring-cloud/spring-cloud-integration/resource/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/resource/pom.xml
rename to spring-cloud/spring-cloud-integration/resource/pom.xml
diff --git a/spring-cloud/spring-cloud-integration/part-1/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java b/spring-cloud/spring-cloud-integration/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java
rename to spring-cloud/spring-cloud-integration/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java
diff --git a/spring-cloud/spring-cloud-integration/part-1/resource/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/resource/src/main/resources/bootstrap.properties
similarity index 100%
rename from spring-cloud/spring-cloud-integration/part-1/resource/src/main/resources/bootstrap.properties
rename to spring-cloud/spring-cloud-integration/resource/src/main/resources/bootstrap.properties