From 3069aa0ac8183fe5b2a96bfd86159892a1cdd8dc Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Thu, 23 Jul 2020 15:04:18 +0200
Subject: [PATCH] Fix a blocker issue related to the WF SDK

 - Temporarily override the WF SDK version coming with Micrometer to 2.6.0
   needed to resolve WF blocker issue: https://github.com/wavefrontHQ/wavefront-sdk-java/pull/152 causing the application to never exit.
---
 applications/stream-applications-core/pom.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index 1d5307f6..71e505d1 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -286,10 +286,6 @@
                                 <groupId>io.micrometer</groupId>
                                 <artifactId>micrometer-registry-prometheus</artifactId>
                             </dependency>
-                            <dependency>
-                                <groupId>io.micrometer</groupId>
-                                <artifactId>micrometer-registry-wavefront</artifactId>
-                            </dependency>
                             <dependency>
                                 <groupId>io.micrometer.prometheus</groupId>
                                 <artifactId>prometheus-rsocket-spring</artifactId>
@@ -299,6 +295,19 @@
                                 <groupId>io.micrometer</groupId>
                                 <artifactId>micrometer-registry-datadog</artifactId>
                             </dependency>
+                            <dependency>
+                                <groupId>io.micrometer</groupId>
+                                <artifactId>micrometer-registry-wavefront</artifactId>
+                            </dependency>
+                            <!-- Override the WF SDK dependency to resolve the https://github.com/wavefrontHQ/wavefront-sdk-java/pull/152
+								 TODO: removed this dependency when Micrometer and Boot catch up with WF SDC 2.6.+ (likely Micrometer 1.5.3+).
+								 -->
+                            <dependency>
+                                <groupId>com.wavefront</groupId>
+                                <artifactId>wavefront-sdk-java</artifactId>
+                                <version>2.6.0</version>
+                            </dependency>
+
                             <dependency>
                                 <groupId>io.pivotal.cfenv</groupId>
                                 <artifactId>java-cfenv-boot</artifactId>