From efd019867a58b28697e5054fe768eb034b3f71a0 Mon Sep 17 00:00:00 2001
From: Brandon Arp <brandon.arp@smartsheet.com>
Date: Mon, 19 Dec 2016 13:05:07 -0800
Subject: [PATCH] more dep updates

---
 .jdkw                                              |  4 ++--
 pom.xml                                            | 14 +++++++-------
 .../clusteraggregator/GuiceModule.java             |  3 +--
 .../aggregation/AggMessageExtractor.java           |  4 ++--
 .../configuration/jackson/HoconFileSource.java     |  3 +--
 .../arpnetworking/tsdcore/sinks/WavefrontSink.java |  4 ++--
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.jdkw b/.jdkw
index 57c7c616..0e8f062c 100644
--- a/.jdkw
+++ b/.jdkw
@@ -1,2 +1,2 @@
-JDKW_VERSION=8u102
-JDKW_BUILD=b14
+JDKW_VERSION=8u112
+JDKW_BUILD=b15
diff --git a/pom.xml b/pom.xml
index bfb95718..37fadded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.arpnetworking.build</groupId>
     <artifactId>arpnetworking-parent-pom</artifactId>
-    <version>1.0.26</version>
+    <version>1.0.29</version>
     <relativePath />
   </parent>
 
@@ -108,7 +108,7 @@
     <apache.httpclient.version>4.5.2</apache.httpclient.version>
     <apache.httpcore.version>4.4.5</apache.httpcore.version>
     <arpnetworking.commons.version>1.7.3</arpnetworking.commons.version>
-    <aspectjrt.version>1.8.9</aspectjrt.version>
+    <aspectjrt.version>1.8.10</aspectjrt.version>
     <cglib.version>3.2.4</cglib.version>
     <commons.codec.version>1.10</commons.codec.version>
     <ebean.version>6.8.1</ebean.version>
@@ -118,16 +118,16 @@
     <guice.version>4.0</guice.version>
     <hamcrest.version>2.0.0.0</hamcrest.version>
     <hikari.version>2.5.1</hikari.version>
-    <asynchttpclient.version>2.0.11</asynchttpclient.version>
-    <h2.version>1.4.190</h2.version>
+    <asynchttpclient.version>2.0.24</asynchttpclient.version>
+    <h2.version>1.4.193</h2.version>
     <jackson.version>2.8.5</jackson.version>
     <javassist.version>3.21.0-GA</javassist.version>
     <javassist.maven.core.version>0.1.3</javassist.maven.core.version>
-    <javax.persistence.version>1.0</javax.persistence.version>
-    <joda.time.version>2.8.2</joda.time.version>
+    <javax.persistence.version>1.0.2</javax.persistence.version>
+    <joda.time.version>2.9.6</joda.time.version>
     <jsr305.version>3.0.1</jsr305.version>
     <junit.version>4.12</junit.version>
-    <junitparams.version>1.0.3</junitparams.version>
+    <junitparams.version>1.0.5</junitparams.version>
     <leveldb.version>0.7</leveldb.version>
     <leveldb.jni.version>1.8</leveldb.jni.version>
     <logback.version>1.1.8</logback.version>
diff --git a/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java b/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java
index c7c45ccc..63117d27 100644
--- a/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java
+++ b/src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java
@@ -65,7 +65,6 @@
 import com.arpnetworking.utility.ParallelLeastShardAllocationStrategy;
 import com.arpnetworking.utility.partitioning.PartitionSet;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
@@ -133,7 +132,7 @@ private Config provideAkkaConfig() {
                     ConfigParseOptions.defaults()
                             .setSyntax(ConfigSyntax.JSON));
         } catch (final IOException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java b/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java
index 877f24ab..897c0368 100644
--- a/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java
+++ b/src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java
@@ -18,8 +18,8 @@
 import akka.cluster.sharding.ShardRegion;
 import com.arpnetworking.clusteraggregator.models.CombinedMetricData;
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.arpnetworking.metrics.com.arpnetworking.steno.Logger;
-import com.arpnetworking.metrics.com.arpnetworking.steno.LoggerFactory;
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.arpnetworking.tsdcore.model.AggregatedData;
 import com.google.common.collect.Maps;
 
diff --git a/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java b/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java
index f28b3bf7..dbd01f06 100644
--- a/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java
+++ b/src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java
@@ -20,7 +20,6 @@
 import com.arpnetworking.steno.Logger;
 import com.arpnetworking.steno.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Throwables;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigRenderOptions;
@@ -73,7 +72,7 @@ private HoconFileSource(final Builder builder) {
                 final String hoconAsJson = config.resolve().root().render(ConfigRenderOptions.concise());
                 jsonNode = _objectMapper.readTree(hoconAsJson);
             } catch (final IOException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         } else if (builder._file.exists()) {
             LOGGER.warn()
diff --git a/src/main/java/com/arpnetworking/tsdcore/sinks/WavefrontSink.java b/src/main/java/com/arpnetworking/tsdcore/sinks/WavefrontSink.java
index 556fe641..d6621033 100644
--- a/src/main/java/com/arpnetworking/tsdcore/sinks/WavefrontSink.java
+++ b/src/main/java/com/arpnetworking/tsdcore/sinks/WavefrontSink.java
@@ -16,8 +16,8 @@
 package com.arpnetworking.tsdcore.sinks;
 
 import com.arpnetworking.clusteraggregator.models.CombinedMetricData;
-import com.arpnetworking.metrics.com.arpnetworking.steno.Logger;
-import com.arpnetworking.metrics.com.arpnetworking.steno.LoggerFactory;
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.arpnetworking.tsdcore.model.AggregatedData;
 import com.arpnetworking.tsdcore.model.FQDSN;
 import com.arpnetworking.tsdcore.model.PeriodicData;