From 92f784484457d45d1fd726ad6a522f64103b5a51 Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Sat, 22 Jan 2022 10:00:31 +0100
Subject: [PATCH] JAVA-9511: Fix spring-cloud-dapr module (#11726)

---
 spring-cloud/pom.xml                                |  1 +
 spring-cloud/spring-cloud-dapr/gateway/pom.xml      | 13 +++++--------
 .../baeldung}/gateway/GatewayApp.java               |  2 +-
 spring-cloud/spring-cloud-dapr/greeting/pom.xml     |  5 -----
 .../example => com/baeldung}/hello/GreetingApp.java |  2 +-
 .../baeldung}/hello/GreetingController.java         |  2 +-
 6 files changed, 9 insertions(+), 16 deletions(-)
 rename spring-cloud/spring-cloud-dapr/gateway/src/main/java/{org/example => com/baeldung}/gateway/GatewayApp.java (90%)
 rename spring-cloud/spring-cloud-dapr/greeting/src/main/java/{org/example => com/baeldung}/hello/GreetingApp.java (90%)
 rename spring-cloud/spring-cloud-dapr/greeting/src/main/java/{org/example => com/baeldung}/hello/GreetingController.java (94%)

diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index f6908f3680..ac810c9a77 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -47,6 +47,7 @@
         <module>spring-cloud-eureka-self-preservation</module>
         <!--<module>spring-cloud-openfeign</module> --> <!-- Fixing in JAVA-2820 -->
         <module>spring-cloud-sentinel</module>
+        <module>spring-cloud-dapr</module>
     </modules>
 
     <build>
diff --git a/spring-cloud/spring-cloud-dapr/gateway/pom.xml b/spring-cloud/spring-cloud-dapr/gateway/pom.xml
index ed805580b9..6545c61002 100644
--- a/spring-cloud/spring-cloud-dapr/gateway/pom.xml
+++ b/spring-cloud/spring-cloud-dapr/gateway/pom.xml
@@ -7,12 +7,10 @@
     <artifactId>gateway</artifactId>
     <version>1.0-SNAPSHOT</version>
 
-    <!-- Spring Boot [2.6] is not compatible with this Spring Cloud release train, hence kept at 2.5 -->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.2</version>
-        <relativePath />
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-dapr</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
@@ -20,7 +18,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>2020.0.3</version>
+                <version>${spring-cloud-dependencies.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -44,8 +42,7 @@
     </build>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/java/org/example/gateway/GatewayApp.java b/spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java
similarity index 90%
rename from spring-cloud/spring-cloud-dapr/gateway/src/main/java/org/example/gateway/GatewayApp.java
rename to spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java
index 7166b5b31f..fba04f61ee 100644
--- a/spring-cloud/spring-cloud-dapr/gateway/src/main/java/org/example/gateway/GatewayApp.java
+++ b/spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java
@@ -1,4 +1,4 @@
-package org.example.gateway;
+package com.baeldung.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud/spring-cloud-dapr/greeting/pom.xml b/spring-cloud/spring-cloud-dapr/greeting/pom.xml
index e054696002..22b4004cbf 100644
--- a/spring-cloud/spring-cloud-dapr/greeting/pom.xml
+++ b/spring-cloud/spring-cloud-dapr/greeting/pom.xml
@@ -29,9 +29,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingApp.java b/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java
similarity index 90%
rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingApp.java
rename to spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java
index 2feca49daa..96096c0963 100644
--- a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingApp.java
+++ b/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java
@@ -1,4 +1,4 @@
-package org.example.hello;
+package com.baeldung.hello;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingController.java b/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java
similarity index 94%
rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingController.java
rename to spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java
index 5210add4e0..d0e3c54e43 100644
--- a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingController.java
+++ b/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java
@@ -1,4 +1,4 @@
-package org.example.hello;
+package com.baeldung.hello;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;