Updating to WFD to Spring Cloud Bindings 2.x. Addressing issue #386

vmware-tanzu · Dec 4, 2023 · 4d37567 · 4d37567
1 parent 5a678ea
commit 4d37567
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/where-for-dinner/where-for-dinner-availability/pom.xml b/where-for-dinner/where-for-dinner-availability/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
-		<spring-cloud-bindings.version>1.13.0</spring-cloud-bindings.version>		
+		<spring-cloud-bindings.version>2.0.2</spring-cloud-bindings.version>		
 		<snakeyaml.version>1.33</snakeyaml.version>
 		<springdoc.version>2.1.0</springdoc.version>	
 	</properties>

diff --git a/where-for-dinner/where-for-dinner-notify/pom.xml b/where-for-dinner/where-for-dinner-notify/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>		
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
-		<spring-cloud-bindings.version>1.13.0</spring-cloud-bindings.version>	
+		<spring-cloud-bindings.version>2.0.2</spring-cloud-bindings.version>	
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/where-for-dinner/where-for-dinner-search-proc/pom.xml b/where-for-dinner/where-for-dinner-search-proc/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
-		<spring-cloud-bindings.version>1.13.0</spring-cloud-bindings.version>	
+		<spring-cloud-bindings.version>2.0.2</spring-cloud-bindings.version>	
 	</properties>
 	<dependencies>
 		<dependency>
@@ -138,10 +138,6 @@
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
 						</exclude>
-						<exclude>
-							<groupId>org.springframework.cloud</groupId>
-							<artifactId>spring-cloud-bindings</artifactId>
-						</exclude>
 					</excludes>
 				</configuration>
 			</plugin>

diff --git a/where-for-dinner/where-for-dinner-search-proc/src/main/resources/application.yml b/where-for-dinner/where-for-dinner-search-proc/src/main/resources/application.yml
@@ -119,17 +119,11 @@ where-for-dinner:
 spring:
   config.activate.on-profile: redis
 
-  redis:
-    ssl: false
-    port: 6379
-
   data:
     redis:
-      # Workaround for https://github.com/spring-cloud/spring-cloud-bindings/issues/87:
-      host: ${spring.redis.host}
-      password: ${spring.redis.password}
-      port: ${spring.redis.port}
-      ssl.eanbled: ${spring.redis.ssl}
+      ssl:
+        enabled: false
+      port: 6379
 
 management:
   health:

diff --git a/where-for-dinner/where-for-dinner-search/pom.xml b/where-for-dinner/where-for-dinner-search/pom.xml
@@ -17,7 +17,7 @@
 		<java.version>17</java.version>
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 		<revision>0.0.1-SNAPSHOT</revision>		
-		<spring-cloud-bindings.version>1.13.0</spring-cloud-bindings.version>
+		<spring-cloud-bindings.version>2.0.2</spring-cloud-bindings.version>
 		<snakeyaml.version>1.33</snakeyaml.version>
 		<springdoc.version>2.1.0</springdoc.version>
 	</properties>
@@ -155,10 +155,6 @@
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
 						</exclude>
-						<exclude>
-							<groupId>org.springframework.cloud</groupId>
-							<artifactId>spring-cloud-bindings</artifactId>
-						</exclude>
 					</excludes>
 				</configuration>
 			</plugin>