iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-9511: Fix spring-cloud-dapr module (#11726)

Browse Source
This commit is contained in:
kwoyke 2022-01-22 10:00:31 +01:00 committed by GitHub
parent 2cb4efdfd7
commit 92f7844844
6 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud/pom.xml
View File

@ -47,6 +47,7 @@
<module>spring-cloud-eureka-self-preservation</module> <module>spring-cloud-eureka-self-preservation</module>
<!--<module>spring-cloud-openfeign</module> --> <!-- Fixing in JAVA-2820 --> <!--<module>spring-cloud-openfeign</module> --> <!-- Fixing in JAVA-2820 -->
<module>spring-cloud-sentinel</module> <module>spring-cloud-sentinel</module>
<module>spring-cloud-dapr</module>
</modules> </modules>
<build> <build>

13
spring-cloud/spring-cloud-dapr/gateway/pom.xml
View File

@ -7,12 +7,10 @@
<artifactId>gateway</artifactId> <artifactId>gateway</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<!-- Spring Boot [2.6] is not compatible with this Spring Cloud release train, hence kept at 2.5 -->
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>com.baeldung.spring.cloud</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-cloud-dapr</artifactId>
<version>2.5.2</version> <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent> </parent>
<dependencyManagement> <dependencyManagement>
@ -20,7 +18,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>2020.0.3</version> <version>${spring-cloud-dependencies.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -44,8 +42,7 @@
</build> </build>
<properties> <properties>
<maven.compiler.source>11</maven.compiler.source> <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
<maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
</project> </project>

2
spring-cloud/spring-cloud-dapr/gateway/src/main/java/org/example/gateway/GatewayApp.java → spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java
View File

@ -1,4 +1,4 @@
package org.example.gateway; package com.baeldung.gateway;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

5
spring-cloud/spring-cloud-dapr/greeting/pom.xml
View File

@ -29,9 +29,4 @@
</plugins> </plugins>
</build> </build>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
</project> </project>

2
spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingApp.java → spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java
View File

@ -1,4 +1,4 @@
package org.example.hello; package com.baeldung.hello;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

2
spring-cloud/spring-cloud-dapr/greeting/src/main/java/org/example/hello/GreetingController.java → spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java
View File

@ -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.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;