From 208a26930cf8781e15a10c00cdf3ff8baa4e6e78 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sun, 2 Oct 2022 09:47:15 -0500
Subject: [PATCH] Fix spel converter auto-config

---
 .../common/config/SpelExpressionConverterConfiguration.java   | 4 ++--
 ...ringframework.boot.autoconfigure.AutoConfiguration.imports | 1 +
 consumer/analytics-consumer/pom.xml                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

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 5d796075..a1f73150 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,11 +20,11 @@ import java.beans.Introspector;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.expression.EvaluationContext;
@@ -36,7 +36,7 @@ import org.springframework.integration.config.IntegrationConverter;
 import org.springframework.integration.expression.SpelPropertyAccessorRegistrar;
 import org.springframework.integration.json.JsonPropertyAccessor;
 
-@Configuration
+@AutoConfiguration
 @AutoConfigureAfter(name = "org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration")
 @ConditionalOnMissingClass("org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration")
 public class SpelExpressionConverterConfiguration {
diff --git a/common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..b62b5d1b
--- /dev/null
+++ b/common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.cloud.fn.common.config.SpelExpressionConverterConfiguration
diff --git a/consumer/analytics-consumer/pom.xml b/consumer/analytics-consumer/pom.xml
index 448286d8..c1457651 100644
--- a/consumer/analytics-consumer/pom.xml
+++ b/consumer/analytics-consumer/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-wavefront</artifactId>
-			<version>1.5.1</version>
+			<version>1.9.4</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>