diff --git a/pom.xml b/pom.xml index d7943fa8d3..18bf89c490 100644 --- a/pom.xml +++ b/pom.xml @@ -610,9 +610,7 @@ spring-caching-2 spring-cloud-modules - spring-cloud-bus - spring-cloud-data-flow spring-core spring-core-2 @@ -654,7 +652,6 @@ spring-scheduling spring-security-modules spring-shell - spring-sleuth spring-soap spring-spel spring-state-machine diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log deleted file mode 100644 index 92a8488c7d..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log +++ /dev/null @@ -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 diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml deleted file mode 100644 index 678ba1c6ac..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-data-flow-stream-processing - 0.0.1-SNAPSHOT - spring-cloud-data-flow-stream-processing - pom - - - com.baeldung - spring-cloud-data-flow - 0.0.1-SNAPSHOT - - - - data-flow-server - data-flow-shell - time-source - time-processor - log-sink - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - \ No newline at end of file diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml index d2f3845922..bd62814e1d 100644 --- a/spring-cloud-modules/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -50,6 +50,9 @@ spring-cloud-sentinel spring-cloud-dapr spring-cloud-docker + spring-cloud-bus + spring-cloud-data-flow + spring-sleuth diff --git a/spring-cloud-bus/README.md b/spring-cloud-modules/spring-cloud-bus/README.md similarity index 100% rename from spring-cloud-bus/README.md rename to spring-cloud-modules/spring-cloud-bus/README.md diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-modules/spring-cloud-bus/pom.xml similarity index 86% rename from spring-cloud-bus/pom.xml rename to spring-cloud-modules/spring-cloud-bus/pom.xml index 2eab7d52a9..4caba15ca9 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/pom.xml @@ -10,10 +10,9 @@ pom - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT diff --git a/spring-cloud-bus/spring-cloud-config-client/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml similarity index 97% rename from spring-cloud-bus/spring-cloud-config-client/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml index 28e7568266..87889570a3 100644 --- a/spring-cloud-bus/spring-cloud-config-client/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml @@ -1,54 +1,55 @@ - - - 4.0.0 - spring-cloud-config-client - spring-cloud-config-client - jar - Demo Spring Cloud Config Client - - - com.baeldung.spring.cloud - spring-cloud-bus - 1.0.0-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-actuator - - - org.springframework.boot - spring-boot-actuator-autoconfigure - - - org.springframework.cloud - spring-cloud-starter-bus-amqp - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + 4.0.0 + spring-cloud-config-client + spring-cloud-config-client + jar + Demo Spring Cloud Config Client + + + com.baeldung.spring.cloud + spring-cloud-bus + 1.0.0-SNAPSHOT + + + + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-actuator + + + org.springframework.boot + spring-boot-actuator-autoconfigure + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml similarity index 94% rename from spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml index bb5c9607b8..e8bc5b9c5a 100644 --- a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml @@ -1,27 +1,27 @@ ---- -spring: - application: - name: config-client - profiles: - active: development - config: - import: configserver:http://root:s3cr3t@localhost:8888 - rabbitmq: - host: localhost - port: 5672 - username: guest - password: guest - cloud: - bus: - enabled: true - refresh: - enabled: true - config: - fail-fast: true -management: - endpoints: - web: - exposure: - include: "*" - security: +--- +spring: + application: + name: config-client + profiles: + active: development + config: + import: configserver:http://root:s3cr3t@localhost:8888 + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + cloud: + bus: + enabled: true + refresh: + enabled: true + config: + fail-fast: true +management: + endpoints: + web: + exposure: + include: "*" + security: enabled: false \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml diff --git a/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-bus/spring-cloud-config-server/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml similarity index 97% rename from spring-cloud-bus/spring-cloud-config-server/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml index 03616b26af..e6439fa56a 100644 --- a/spring-cloud-bus/spring-cloud-config-server/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml @@ -1,50 +1,50 @@ - - - 4.0.0 - spring-cloud-config-server - spring-cloud-config-server - jar - Demo Spring Cloud Config Server - - - com.baeldung.spring.cloud - spring-cloud-bus - 1.0.0-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-config-server - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.cloud - spring-cloud-config-monitor - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + 4.0.0 + spring-cloud-config-server + spring-cloud-config-server + jar + Demo Spring Cloud Config Server + + + com.baeldung.spring.cloud + spring-cloud-bus + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-config-server + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.cloud + spring-cloud-config-monitor + + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties similarity index 97% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties index 00ef9f0217..b27e14010e 100644 --- a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties @@ -1,14 +1,14 @@ -server.port=8888 -spring.cloud.config.server.git.uri= -spring.cloud.bus.enabled=true -spring.security.user.name=root -spring.security.user.password=s3cr3t -spring.rabbitmq.host=localhost -spring.rabbitmq.port=5672 -spring.rabbitmq.username=guest -spring.rabbitmq.password=guest - -encrypt.key-store.location=classpath:/config-server.jks -encrypt.key-store.password=my-s70r3-s3cr3t -encrypt.key-store.alias=config-server-key +server.port=8888 +spring.cloud.config.server.git.uri= +spring.cloud.bus.enabled=true +spring.security.user.name=root +spring.security.user.password=s3cr3t +spring.rabbitmq.host=localhost +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest + +encrypt.key-store.location=classpath:/config-server.jks +encrypt.key-store.password=my-s70r3-s3cr3t +encrypt.key-store.alias=config-server-key encrypt.key-store.secret=my-k34-s3cr3t \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-cli/README.md b/spring-cloud-modules/spring-cloud-cli/README.md similarity index 100% rename from spring-cloud-cli/README.md rename to spring-cloud-modules/spring-cloud-cli/README.md diff --git a/spring-cloud-cli/decrypt.sh b/spring-cloud-modules/spring-cloud-cli/decrypt.sh similarity index 100% rename from spring-cloud-cli/decrypt.sh rename to spring-cloud-modules/spring-cloud-cli/decrypt.sh diff --git a/spring-cloud-cli/encrypt.sh b/spring-cloud-modules/spring-cloud-cli/encrypt.sh similarity index 100% rename from spring-cloud-cli/encrypt.sh rename to spring-cloud-modules/spring-cloud-cli/encrypt.sh diff --git a/spring-cloud-cli/groovy.sh b/spring-cloud-modules/spring-cloud-cli/groovy.sh similarity index 100% rename from spring-cloud-cli/groovy.sh rename to spring-cloud-modules/spring-cloud-cli/groovy.sh diff --git a/spring-cloud-cli/groovy/eureka.groovy b/spring-cloud-modules/spring-cloud-cli/groovy/eureka.groovy similarity index 100% rename from spring-cloud-cli/groovy/eureka.groovy rename to spring-cloud-modules/spring-cloud-cli/groovy/eureka.groovy diff --git a/spring-cloud-cli/groovy/restapi.groovy b/spring-cloud-modules/spring-cloud-cli/groovy/restapi.groovy similarity index 100% rename from spring-cloud-cli/groovy/restapi.groovy rename to spring-cloud-modules/spring-cloud-cli/groovy/restapi.groovy diff --git a/spring-cloud-cli/install.sh b/spring-cloud-modules/spring-cloud-cli/install.sh similarity index 100% rename from spring-cloud-cli/install.sh rename to spring-cloud-modules/spring-cloud-cli/install.sh diff --git a/spring-cloud-cli/spring-cli-cmds.sh b/spring-cloud-modules/spring-cloud-cli/spring-cli-cmds.sh similarity index 100% rename from spring-cloud-cli/spring-cli-cmds.sh rename to spring-cloud-modules/spring-cloud-cli/spring-cli-cmds.sh diff --git a/spring-cloud-cli/yml/configserver.yml b/spring-cloud-modules/spring-cloud-cli/yml/configserver.yml similarity index 100% rename from spring-cloud-cli/yml/configserver.yml rename to spring-cloud-modules/spring-cloud-cli/yml/configserver.yml diff --git a/spring-cloud-cli/yml/eureka.yml b/spring-cloud-modules/spring-cloud-cli/yml/eureka.yml similarity index 100% rename from spring-cloud-cli/yml/eureka.yml rename to spring-cloud-modules/spring-cloud-cli/yml/eureka.yml diff --git a/spring-cloud-data-flow/README.md b/spring-cloud-modules/spring-cloud-data-flow/README.md similarity index 100% rename from spring-cloud-data-flow/README.md rename to spring-cloud-modules/spring-cloud-data-flow/README.md diff --git a/spring-cloud-data-flow/apache-spark-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md similarity index 100% rename from spring-cloud-data-flow/apache-spark-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md diff --git a/spring-cloud-data-flow/apache-spark-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml similarity index 95% rename from spring-cloud-data-flow/apache-spark-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml index 4f2ef6cd6c..b2b0c7d68a 100644 --- a/spring-cloud-data-flow/apache-spark-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml @@ -7,7 +7,7 @@ apache-spark-job - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java similarity index 100% rename from spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java diff --git a/spring-cloud-data-flow/batch-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md similarity index 100% rename from spring-cloud-data-flow/batch-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md diff --git a/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml similarity index 97% rename from spring-cloud-data-flow/batch-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml index edb7e34389..627724a6be 100644 --- a/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml @@ -11,7 +11,7 @@ Demo project for Spring Boot - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java diff --git a/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java diff --git a/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java diff --git a/spring-cloud-data-flow/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/pom.xml similarity index 77% rename from spring-cloud-data-flow/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/pom.xml index f81daeeabc..25a70642ec 100644 --- a/spring-cloud-data-flow/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/pom.xml @@ -1,25 +1,24 @@ - - - 4.0.0 - spring-cloud-data-flow - 0.0.1-SNAPSHOT - spring-cloud-data-flow - pom - - - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 - - - - spring-cloud-data-flow-stream-processing - spring-cloud-data-flow-etl - batch-job - apache-spark-job - - + + + 4.0.0 + spring-cloud-data-flow + 0.0.1-SNAPSHOT + spring-cloud-data-flow + pom + + + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT + + + + spring-cloud-data-flow-stream-processing + spring-cloud-data-flow-etl + batch-job + apache-spark-job + + \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml similarity index 97% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml index a2a9bf1980..3493e9a841 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml @@ -9,7 +9,7 @@ Example ETL Load Project - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow-etl 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml similarity index 97% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml index 067d25ec26..934cce1fdf 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml @@ -9,7 +9,7 @@ Example transform ETL step - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow-etl 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml similarity index 93% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml index ffdd153f15..17cc61d236 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml @@ -9,7 +9,7 @@ pom - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml similarity index 84% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml index 5dc8459e10..c521b77c4d 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml @@ -11,13 +11,19 @@ com.baeldung - parent-boot-1 + spring-cloud-data-flow-stream-processing 0.0.1-SNAPSHOT - ../../../parent-boot-1 + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.springframework.cloud spring-cloud-dataflow-dependencies @@ -62,6 +68,7 @@ 1.3.1.RELEASE Edgware.SR6 5.2.12.Final + 1.5.22.RELEASE \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 85% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java index d5b01c8b9c..7a5e4e695c 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java +++ b/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() { } } diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml similarity index 94% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml index 61c1b16581..5bf91a2c04 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml @@ -11,9 +11,8 @@ com.baeldung - parent-boot-1 + spring-cloud-data-flow-stream-processing 0.0.1-SNAPSHOT - ../../../parent-boot-1 diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml new file mode 100644 index 0000000000..6e6367ecad --- /dev/null +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + com.baeldung + spring-cloud-data-flow-stream-processing + 0.0.1-SNAPSHOT + spring-cloud-data-flow-stream-processing + pom + + + com.baeldung.spring.cloud + spring-cloud-data-flow + 0.0.1-SNAPSHOT + + + + data-flow-server + data-flow-shell + time-source + time-processor + log-sink + + + + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + + + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + test + + + + + 1.3.1.RELEASE + Edgware.SR6 + 5.2.12.Final + 1.11.20 + 3.1.0 + + + + \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-sleuth/README.md b/spring-cloud-modules/spring-sleuth/README.md similarity index 100% rename from spring-sleuth/README.md rename to spring-cloud-modules/spring-sleuth/README.md diff --git a/spring-sleuth/pom.xml b/spring-cloud-modules/spring-sleuth/pom.xml similarity index 87% rename from spring-sleuth/pom.xml rename to spring-cloud-modules/spring-sleuth/pom.xml index a6fba5ea56..15edcbdaa2 100644 --- a/spring-sleuth/pom.xml +++ b/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"> 4.0.0 spring-sleuth + com.baeldung.spring.cloud 1.0.0-SNAPSHOT spring-sleuth jar - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java b/spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java rename to spring-cloud-modules/spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java diff --git a/spring-sleuth/src/main/resources/application.properties b/spring-cloud-modules/spring-sleuth/src/main/resources/application.properties similarity index 100% rename from spring-sleuth/src/main/resources/application.properties rename to spring-cloud-modules/spring-sleuth/src/main/resources/application.properties diff --git a/spring-sleuth/src/main/resources/logback.xml b/spring-cloud-modules/spring-sleuth/src/main/resources/logback.xml similarity index 100% rename from spring-sleuth/src/main/resources/logback.xml rename to spring-cloud-modules/spring-sleuth/src/main/resources/logback.xml diff --git a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java