From 49a2f4ef9177f4ba272d044f26bdb4d9cfb3bac3 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@pivotal.io>
Date: Fri, 29 May 2020 16:52:15 -0400
Subject: [PATCH] Add ConditionalOnMissingBean to fix bean override error

---
 common/config-common/pom.xml                                    | 2 +-
 .../fn/common/config/SpelExpressionConverterConfiguration.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/config-common/pom.xml b/common/config-common/pom.xml
index efda9803..2717a242 100644
--- a/common/config-common/pom.xml
+++ b/common/config-common/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
diff --git a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java
index ac3309c5..5c95a320 100644
--- a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java
+++ b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java
@@ -20,6 +20,7 @@ import java.beans.Introspector;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,6 +36,7 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar;
 import org.springframework.integration.json.JsonPropertyAccessor;
 
 @Configuration
+@ConditionalOnMissingBean(SpelPropertyAccessorRegistrar.class)
 public class SpelExpressionConverterConfiguration {
 	@Bean
 	public static SpelPropertyAccessorRegistrar spelPropertyAccessorRegistrar() {