From 51cdcc7c37d9c57fbcab3f2b6523ff9fd63d7344 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 22 Apr 2022 15:11:09 +0200
Subject: [PATCH] GH-2340 Fix CCE in extended properties

Upgrade jackson core

Resolves #2340
---
 .../cloud/stream/binding/BindingService.java                | 6 +++++-
 pom.xml                                                     | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java
index 25fc0f2f8..81e2e4a24 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java
@@ -145,7 +145,11 @@ public class BindingService {
 							continue;
 						}
 
-						ConsumerProperties consumerPropertiesTemp = new ExtendedConsumerProperties<>("");
+						Object extensiion = consumerProperties instanceof ExtendedConsumerProperties
+								? ((ExtendedConsumerProperties) consumerProperties).getExtension()
+										: null;
+
+						ConsumerProperties consumerPropertiesTemp = new ExtendedConsumerProperties<>(extensiion);
 						BeanUtils.copyProperties(consumerProperties, consumerPropertiesTemp);
 
 						consumerPropertiesTemp.setInstanceIndex(index);
diff --git a/pom.xml b/pom.xml
index 7d85deae5..fe59c308b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,11 @@
 				<artifactId>objenesis</artifactId>
 				<version>${objenesis.version}</version>
 			</dependency>
+			<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-core</artifactId>
+		    <version>2.13.2</version>
+		</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream</artifactId>