Java 11493 (#12349)

* moved spring-cloud-bus (submodule) to spring-cloud-modules (parent)

* moved spring-cloud-cli (submodule) to spring-cloud-modules (parent)

* moved spring-cloud-data-flow (submodule) to spring-cloud-modules (parent)

* moved spring-sleuth (submodule) to spring-cloud-modules (parent)

* Deleted submodules that we moved to  spring-cloud-modules

* deleted old modules from parent pom

Co-authored-by: panagiotiskakos <panagiotis.kakos@libra-is.com>

pom.xml

@@ -610,9 +610,7 @@
                 <module>spring-caching-2</module>
 
                 <module>spring-cloud-modules</module>
-                <module>spring-cloud-bus</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-cloud-data-flow</module>
 
                 <module>spring-core</module>
                 <module>spring-core-2</module>
@@ -654,7 +652,6 @@
                 <module>spring-scheduling</module>
                 <module>spring-security-modules</module>
                 <module>spring-shell</module>
-                <module>spring-sleuth</module>
                 <module>spring-soap</module>
                 <module>spring-spel</module>
                 <module>spring-state-machine</module>

spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log

@@ -1,2 +0,0 @@
-// dataflow 1.2.0.RELEASE log opened at 2016-10-20 13:13:20
-// dataflow 1.2.0.RELEASE log opened at 2016-10-24 16:51:17

spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml

@@ -1,34 +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</groupId>
-    <artifactId>spring-cloud-data-flow-stream-processing</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-cloud-data-flow-stream-processing</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>spring-cloud-data-flow</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <modules>
-        <module>data-flow-server</module>
-        <module>data-flow-shell</module>
-        <module>time-source</module>
-        <module>time-processor</module>
-        <module>log-sink</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

spring-cloud-modules/pom.xml

@@ -50,6 +50,9 @@
         <module>spring-cloud-sentinel</module>
         <module>spring-cloud-dapr</module>
         <module>spring-cloud-docker</module>
+        <module>spring-cloud-bus</module>
+        <module>spring-cloud-data-flow</module>
+        <module>spring-sleuth</module>
     </modules>
 
     <build>

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

@@ -10,10 +10,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>spring-cloud-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml

@@ -1,54 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
+    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>
+    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-cloud-config-client</artifactId>
+    <artifactId>spring-cloud-config-client</artifactId>
-    <name>spring-cloud-config-client</name>
+    <name>spring-cloud-config-client</name>
-    <packaging>jar</packaging>
+    <packaging>jar</packaging>
-    <description>Demo Spring Cloud Config Client</description>
+    <description>Demo Spring Cloud Config Client</description>
-
+
-    <parent>
+    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-bus</artifactId>
+        <artifactId>spring-cloud-bus</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+    </parent>
-
+
-    <dependencies>
+
-        <dependency>
+    <dependencies>
-            <groupId>org.springframework.cloud</groupId>
+        <dependency>
-            <artifactId>spring-cloud-starter-config</artifactId>
+            <groupId>org.springframework.cloud</groupId>
-        </dependency>
+            <artifactId>spring-cloud-starter-config</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>org.springframework.boot</groupId>
+        <dependency>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>org.springframework.boot</groupId>
-        </dependency>
+            <artifactId>spring-boot-starter-web</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>org.springframework.boot</groupId>
+        <dependency>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>org.springframework.boot</groupId>
-            <scope>test</scope>
+            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
+            <scope>test</scope>
-        <dependency>
+        </dependency>
-            <groupId>org.springframework.boot</groupId>
+        <dependency>
-            <artifactId>spring-boot-actuator</artifactId>
+            <groupId>org.springframework.boot</groupId>
-        </dependency>
+            <artifactId>spring-boot-actuator</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>org.springframework.boot</groupId>
+        <dependency>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <groupId>org.springframework.boot</groupId>
-        </dependency>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>org.springframework.cloud</groupId>
+        <dependency>
-            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+            <groupId>org.springframework.cloud</groupId>
-        </dependency>
+            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
-    </dependencies>
+        </dependency>
-
+    </dependencies>
-    <build>
+
-        <plugins>
+    <build>
-            <plugin>
+        <plugins>
-                <groupId>org.springframework.boot</groupId>
+            <plugin>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.springframework.boot</groupId>
-            </plugin>
+                <artifactId>spring-boot-maven-plugin</artifactId>
-        </plugins>
+            </plugin>
-    </build>
+        </plugins>
-
+    </build>
+
 </project>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml

@@ -1,27 +1,27 @@
----
+---
-spring:
+spring:
-  application:
+  application:
-    name: config-client
+    name: config-client
-  profiles:
+  profiles:
-    active: development
+    active: development
-  config:
+  config:
-    import: configserver:http://root:s3cr3t@localhost:8888
+    import: configserver:http://root:s3cr3t@localhost:8888
-  rabbitmq:
+  rabbitmq:
-    host: localhost
+    host: localhost
-    port: 5672
+    port: 5672
-    username: guest
+    username: guest
-    password: guest
+    password: guest
-  cloud:
+  cloud:
-    bus:
+    bus:
-      enabled: true
+      enabled: true
-      refresh:
+      refresh:
-        enabled: true
+        enabled: true
-    config:
+    config:
-      fail-fast: true
+      fail-fast: true
-management:
+management:
-  endpoints:
+  endpoints:
-    web:
+    web:
-      exposure:
+      exposure:
-        include: "*"
+        include: "*"
-  security:
+  security:
     enabled: false

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml

@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
+    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>
+    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-cloud-config-server</artifactId>
+    <artifactId>spring-cloud-config-server</artifactId>
-    <name>spring-cloud-config-server</name>
+    <name>spring-cloud-config-server</name>
-    <packaging>jar</packaging>
+    <packaging>jar</packaging>
-    <description>Demo Spring Cloud Config Server</description>
+    <description>Demo Spring Cloud Config Server</description>
-
+
-    <parent>
+    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-bus</artifactId>
+        <artifactId>spring-cloud-bus</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+    </parent>
-
+
-    <dependencies>
+    <dependencies>
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-server</artifactId>
+            <artifactId>spring-cloud-config-server</artifactId>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <scope>test</scope>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-monitor</artifactId>
+            <artifactId>spring-cloud-config-monitor</artifactId>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-        </dependency>
+        </dependency>
-    </dependencies>
+    </dependencies>
-
+
-    <build>
+    <build>
-        <plugins>
+        <plugins>
-            <plugin>
+            <plugin>
-                <groupId>org.springframework.boot</groupId>
+                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
+            </plugin>
-        </plugins>
+        </plugins>
-    </build>
+    </build>
-
+
 </project>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties

@@ -1,14 +1,14 @@
-server.port=8888
+server.port=8888
-spring.cloud.config.server.git.uri=
+spring.cloud.config.server.git.uri=
-spring.cloud.bus.enabled=true
+spring.cloud.bus.enabled=true
-spring.security.user.name=root
+spring.security.user.name=root
-spring.security.user.password=s3cr3t
+spring.security.user.password=s3cr3t
-spring.rabbitmq.host=localhost
+spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
+spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
+spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
+spring.rabbitmq.password=guest
-
+
-encrypt.key-store.location=classpath:/config-server.jks
+encrypt.key-store.location=classpath:/config-server.jks
-encrypt.key-store.password=my-s70r3-s3cr3t
+encrypt.key-store.password=my-s70r3-s3cr3t
-encrypt.key-store.alias=config-server-key
+encrypt.key-store.alias=config-server-key
 encrypt.key-store.secret=my-k34-s3cr3t

spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml

@@ -7,7 +7,7 @@
     <name>apache-spark-job</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml

@@ -11,7 +11,7 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/pom.xml

@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
+    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>
+    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-cloud-data-flow</artifactId>
+    <artifactId>spring-cloud-data-flow</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-cloud-data-flow</name>
+    <name>spring-cloud-data-flow</name>
-    <packaging>pom</packaging>
+    <packaging>pom</packaging>
-
+
-    <parent>
+    <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>spring-cloud-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+    </parent>
-    </parent>
+
-
+    <modules>
-    <modules>
+        <module>spring-cloud-data-flow-stream-processing</module>
-        <module>spring-cloud-data-flow-stream-processing</module>
+        <module>spring-cloud-data-flow-etl</module>
-        <module>spring-cloud-data-flow-etl</module>
+        <module>batch-job</module>
-        <module>batch-job</module>
+        <module>apache-spark-job</module>
-        <module>apache-spark-job</module>
+    </modules>
-    </modules>
+
-
 </project>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml

@@ -9,7 +9,7 @@
     <description>Example ETL Load Project</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow-etl</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml

@@ -9,7 +9,7 @@
     <description>Example transform ETL step</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow-etl</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml

@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml

@@ -11,13 +11,19 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-cloud-data-flow-stream-processing</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
     </parent>
 
     <dependencyManagement>
         <dependencies>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-dependencies</artifactId>
+                    <version>${spring-boot.version}</version>
+                    <type>pom</type>
+                    <scope>import</scope>
+                </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dataflow-dependencies</artifactId>
@@ -62,6 +68,7 @@
         <spring-cloud-dataflow-dependencies.version>1.3.1.RELEASE</spring-cloud-dataflow-dependencies.version>
         <spring-cloud-dependencies.version>Edgware.SR6</spring-cloud-dependencies.version>
         <hibernate.compatible.version>5.2.12.Final</hibernate.compatible.version>
+        <spring-boot.version>1.5.22.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java

@@ -11,6 +11,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class SpringContextTest {
 
     @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    public void contextLoads() {
     }
 }

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml

@@ -11,9 +11,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-cloud-data-flow-stream-processing</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
     </parent>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml

@@ -0,0 +1,55 @@
+<?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</groupId>
+    <artifactId>spring-cloud-data-flow-stream-processing</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-cloud-data-flow-stream-processing</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-data-flow</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>data-flow-server</module>
+        <module>data-flow-shell</module>
+        <module>time-source</module>
+        <module>time-processor</module>
+        <module>log-sink</module>
+    </modules>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>${rest-assured.version}</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-test</artifactId>-->
+<!--            <version>1.5.22.release</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <spring-cloud-dataflow-dependencies.version>1.3.1.RELEASE</spring-cloud-dataflow-dependencies.version>
+        <spring-cloud-dependencies.version>Edgware.SR6</spring-cloud-dependencies.version>
+        <hibernate.compatible.version>5.2.12.Final</hibernate.compatible.version>
+        <byte-buddy.version>1.11.20</byte-buddy.version>
+        <rest-assured.version>3.1.0</rest-assured.version>
+    </properties>
+
+
+</project>

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

@@ -4,15 +4,15 @@
     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>spring-sleuth</artifactId>
+    <groupId>com.baeldung.spring.cloud</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-sleuth</name>
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>spring-cloud-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencyManagement>