From d0ecc39457fa1de0f016792ce11feaba28534af7 Mon Sep 17 00:00:00 2001
From: Glenn Oppegard <goppegard@vmware.com>
Date: Tue, 10 Aug 2021 16:41:26 -0600
Subject: [PATCH 1/2] Unshade dependencies

MONIT-23637
---
 pom.xml | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index dbd1a13a..285b1e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,47 +63,6 @@
                     <target>${sdk.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                  <execution>
-                    <phase>package</phase>
-                    <goals>
-                      <goal>shade</goal>
-                    </goals>
-                    <configuration>
-                        <minimizeJar>true</minimizeJar>
-                        <artifactSet>
-                            <includes>
-                                <include>com.tdunning:t-digest</include>
-                                <include>com.google.guava</include>
-                            </includes>
-                        </artifactSet>
-                        <relocations>
-                            <relocation>
-                                <pattern>com.tdunning.math</pattern>
-                                <shadedPattern>com.wavefront.java_sdk.com.tdunning.math</shadedPattern>
-                            </relocation>
-                            <relocation>
-                                <pattern>com.google</pattern>
-                                <shadedPattern>com.wavefront.java_sdk.com.google</shadedPattern>
-                            </relocation>
-                        </relocations>
-                        <filters>
-                            <filter>
-                                <artifact>*:*</artifact>
-                                <excludes>
-                                    <exclude>META-INF/license/**</exclude>
-                                    <exclude>mozilla/**</exclude>
-                                </excludes>
-                            </filter>
-                        </filters>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>

From ca50fc6af4f21c1eb0fa0274239960e3cdaa772f Mon Sep 17 00:00:00 2001
From: Glenn Oppegard <goppegard@vmware.com>
Date: Tue, 10 Aug 2021 18:00:21 -0600
Subject: [PATCH 2/2] Update jackson-databind, guava, junit-jupiter-api,
 easymock

- jackson-databind 2.12.4
- guava 30.1.1-jre
- junit-jupiter-api 5.7.2
- easymock 4.3

MONIT-23637
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 285b1e1a..04c6d68f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,19 +92,19 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.0.pr1</version>
+            <version>2.12.4</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1-jre</version>
+            <version>30.1.1-jre</version>
         </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.3.1</version>
+            <version>5.7.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -117,7 +117,7 @@
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
             <scope>test</scope>
-            <version>3.6</version>
+            <version>4.3</version>
         </dependency>
     </dependencies>