Skip to content

Commit efd0198

Browse files
committed
more dep updates
1 parent 5d10c62 commit efd0198

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

.jdkw

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
JDKW_VERSION=8u102
2-
JDKW_BUILD=b14
1+
JDKW_VERSION=8u112
2+
JDKW_BUILD=b15

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>1.0.26</version>
21+
<version>1.0.29</version>
2222
<relativePath />
2323
</parent>
2424

@@ -108,7 +108,7 @@
108108
<apache.httpclient.version>4.5.2</apache.httpclient.version>
109109
<apache.httpcore.version>4.4.5</apache.httpcore.version>
110110
<arpnetworking.commons.version>1.7.3</arpnetworking.commons.version>
111-
<aspectjrt.version>1.8.9</aspectjrt.version>
111+
<aspectjrt.version>1.8.10</aspectjrt.version>
112112
<cglib.version>3.2.4</cglib.version>
113113
<commons.codec.version>1.10</commons.codec.version>
114114
<ebean.version>6.8.1</ebean.version>
@@ -118,16 +118,16 @@
118118
<guice.version>4.0</guice.version>
119119
<hamcrest.version>2.0.0.0</hamcrest.version>
120120
<hikari.version>2.5.1</hikari.version>
121-
<asynchttpclient.version>2.0.11</asynchttpclient.version>
122-
<h2.version>1.4.190</h2.version>
121+
<asynchttpclient.version>2.0.24</asynchttpclient.version>
122+
<h2.version>1.4.193</h2.version>
123123
<jackson.version>2.8.5</jackson.version>
124124
<javassist.version>3.21.0-GA</javassist.version>
125125
<javassist.maven.core.version>0.1.3</javassist.maven.core.version>
126-
<javax.persistence.version>1.0</javax.persistence.version>
127-
<joda.time.version>2.8.2</joda.time.version>
126+
<javax.persistence.version>1.0.2</javax.persistence.version>
127+
<joda.time.version>2.9.6</joda.time.version>
128128
<jsr305.version>3.0.1</jsr305.version>
129129
<junit.version>4.12</junit.version>
130-
<junitparams.version>1.0.3</junitparams.version>
130+
<junitparams.version>1.0.5</junitparams.version>
131131
<leveldb.version>0.7</leveldb.version>
132132
<leveldb.jni.version>1.8</leveldb.jni.version>
133133
<logback.version>1.1.8</logback.version>

src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import com.arpnetworking.utility.ParallelLeastShardAllocationStrategy;
6666
import com.arpnetworking.utility.partitioning.PartitionSet;
6767
import com.fasterxml.jackson.databind.ObjectMapper;
68-
import com.google.common.base.Throwables;
6968
import com.google.inject.AbstractModule;
7069
import com.google.inject.Injector;
7170
import com.google.inject.Provides;
@@ -133,7 +132,7 @@ private Config provideAkkaConfig() {
133132
ConfigParseOptions.defaults()
134133
.setSyntax(ConfigSyntax.JSON));
135134
} catch (final IOException e) {
136-
throw Throwables.propagate(e);
135+
throw new RuntimeException(e);
137136
}
138137
}
139138

src/main/java/com/arpnetworking/clusteraggregator/aggregation/AggMessageExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import akka.cluster.sharding.ShardRegion;
1919
import com.arpnetworking.clusteraggregator.models.CombinedMetricData;
2020
import com.arpnetworking.metrics.aggregation.protocol.Messages;
21-
import com.arpnetworking.metrics.com.arpnetworking.steno.Logger;
22-
import com.arpnetworking.metrics.com.arpnetworking.steno.LoggerFactory;
21+
import com.arpnetworking.steno.Logger;
22+
import com.arpnetworking.steno.LoggerFactory;
2323
import com.arpnetworking.tsdcore.model.AggregatedData;
2424
import com.google.common.collect.Maps;
2525

src/main/java/com/arpnetworking/configuration/jackson/HoconFileSource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.arpnetworking.steno.Logger;
2121
import com.arpnetworking.steno.LoggerFactory;
2222
import com.fasterxml.jackson.databind.JsonNode;
23-
import com.google.common.base.Throwables;
2423
import com.typesafe.config.Config;
2524
import com.typesafe.config.ConfigFactory;
2625
import com.typesafe.config.ConfigRenderOptions;
@@ -73,7 +72,7 @@ private HoconFileSource(final Builder builder) {
7372
final String hoconAsJson = config.resolve().root().render(ConfigRenderOptions.concise());
7473
jsonNode = _objectMapper.readTree(hoconAsJson);
7574
} catch (final IOException e) {
76-
throw Throwables.propagate(e);
75+
throw new RuntimeException(e);
7776
}
7877
} else if (builder._file.exists()) {
7978
LOGGER.warn()

src/main/java/com/arpnetworking/tsdcore/sinks/WavefrontSink.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package com.arpnetworking.tsdcore.sinks;
1717

1818
import com.arpnetworking.clusteraggregator.models.CombinedMetricData;
19-
import com.arpnetworking.metrics.com.arpnetworking.steno.Logger;
20-
import com.arpnetworking.metrics.com.arpnetworking.steno.LoggerFactory;
19+
import com.arpnetworking.steno.Logger;
20+
import com.arpnetworking.steno.LoggerFactory;
2121
import com.arpnetworking.tsdcore.model.AggregatedData;
2222
import com.arpnetworking.tsdcore.model.FQDSN;
2323
import com.arpnetworking.tsdcore.model.PeriodicData;

0 commit comments

Comments
 (0)