Skip to content

Commit 48d395c

Browse files
vjkoskelaBrandonArp
vjkoskela
authored and
BrandonArp
committed
Update and resolve dependencies. (#145)
1 parent 80338fc commit 48d395c

File tree

8 files changed

+170
-63
lines changed

8 files changed

+170
-63
lines changed

‎.jdkw‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JDKW_RELEASE=latest
22
JDKW_DIST=zulu
3-
JDKW_BUILD=8.27.0.7
4-
JDKW_VERSION=8.0.162
3+
JDKW_BUILD=8.31.0.1
4+
JDKW_VERSION=8.0.181
55
JDKW_VERBOSE=true

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ For example:
9393
"httpPort": 7090,
9494
"httpHealthCheckPath": "/mad/healthcheck",
9595
"httpStatusPath": "/mad/status",
96-
"jvmMetricsCollectionInterval": "PT.5S",
96+
"jvmMetricsCollectionInterval": "PT1.0S",
9797
"akkaConfiguration": {
9898
"akka": {
9999
"loggers": [

‎checkstyle-extra-suppressions.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
~ Copyright 2014 Groupon.com
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<!DOCTYPE suppressions PUBLIC
18+
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
19+
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
20+
21+
<suppressions>
22+
<!-- Master-2.0 will standardize performance tests -->
23+
<suppress checks="AvoidStaticImport" files=".*PT\.java"/>
24+
<suppress checks="JavadocVariable" files=".*PT\.java"/>
25+
<suppress checks="JavadocMethod" files=".*PT\.java"/>
26+
<suppress checks="EmptyBlock" files=".*PT\.java"/>
27+
<suppress checks="ExecutableStatementCount" files=".*PT\.java"/>
28+
<suppress checks="ThrowsCount" files=".*PT\.java"/>
29+
<suppress checks="JavadocVariable" files=".*PT\.java"/>
30+
31+
<!-- Master-2.0 will add package-info.java files -->
32+
<suppress checks="JavadocPackage" files=".*"/>
33+
</suppressions>

‎config/config.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ httpPort=7090
1313
# Metrics
1414
# ~~~~
1515
monitoringCluster="mad"
16-
#jvmMetricsCollectionInterval="PT.5S"
16+
#jvmMetricsCollectionInterval="PT1.0S"
1717

1818
# Logging
1919
# ~~~~

‎maven/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Maven download properties
2-
#Thu Feb 22 06:38:47 UTC 2018
2+
#Sun Jan 13 13:44:30 PST 2019
33
checksumAlgorithm=SHA1
44
verifyDownload=true
5-
distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
5+
distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

‎mvnw‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@ case "`uname`" in
5757
#
5858
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
5959
# for the new JDKs provided by Oracle.
60-
#
60+
#
6161
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
6262
#
6363
# Apple JDKs
6464
#
6565
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
6666
fi
67-
67+
6868
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
6969
#
7070
# Apple JDKs
7171
#
7272
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
7373
fi
74-
74+
7575
if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
7676
#
7777
# Oracle JDKs
7878
#
7979
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
80-
fi
80+
fi
8181

8282
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
8383
#
@@ -219,7 +219,7 @@ concat_lines() {
219219
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
220220
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
221221

222-
# Provide a "standardized" way to retrieve the CLI args that will
222+
# Provide a "standardized" way to retrieve the CLI args that will
223223
# work with both Windows and non-Windows executions.
224224
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
225225
export MAVEN_CMD_LINE_ARGS

‎pom.xml‎

Lines changed: 109 additions & 36 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.1.7</version>
21+
<version>1.1.11</version>
2222
<relativePath />
2323
</parent>
2424

@@ -73,53 +73,53 @@
7373
<!--Dependency versions-->
7474
<akka.version>2.5.16</akka.version>
7575
<akka.http.version>10.1.5</akka.http.version>
76-
<apache.httpclient.version>4.5.5</apache.httpclient.version>
77-
<apache.httpcore.version>4.4.9</apache.httpcore.version>
78-
<arpnetworking.commons.version>1.16.1</arpnetworking.commons.version>
79-
<aspectjrt.version>1.9.1</aspectjrt.version>
80-
<asynchttpclient.version>2.4.9</asynchttpclient.version>
81-
<cglib.version>3.2.6</cglib.version>
82-
<client.protocol.version>0.10.0</client.protocol.version>
83-
<fastutil.version>8.2.1</fastutil.version>
76+
<apache.httpclient.version>4.5.6</apache.httpclient.version>
77+
<apache.httpcore.version>4.4.10</apache.httpcore.version>
78+
<arpnetworking.commons.version>1.18.0</arpnetworking.commons.version>
79+
<aspectjrt.version>1.9.2</aspectjrt.version>
80+
<asynchttpclient.version>2.6.0</asynchttpclient.version>
81+
<cglib.version>3.2.10</cglib.version>
82+
<client.protocol.version>0.10.1</client.protocol.version>
83+
<fastutil.version>8.2.2</fastutil.version>
8484
<findbugs.annotations.version>3.0.1</findbugs.annotations.version>
8585
<guava.version>25.1-jre</guava.version>
86-
<guice.version>4.2.0</guice.version>
87-
<jackson.version>2.9.6</jackson.version>
88-
<javassist.version>3.22.0-GA</javassist.version>
89-
<javassist.maven.core.version>0.2.1</javassist.maven.core.version>
86+
<guice.version>4.2.2</guice.version>
87+
<jackson.version>2.9.8</jackson.version>
88+
<javassist.version>3.24.1-GA</javassist.version>
89+
<javassist.maven.core.version>0.2.2</javassist.maven.core.version>
9090
<jsr305.version>3.0.2</jsr305.version>
9191
<logback.version>1.2.3</logback.version>
92-
<logback.steno.version>1.18.1</logback.steno.version>
93-
<log4j.over.slf4j.version>1.7.12</log4j.over.slf4j.version>
94-
<metrics.aggregator.protocol.version>1.0.5</metrics.aggregator.protocol.version>
95-
<metrics.client.version>0.10.0</metrics.client.version>
96-
<metrics.client.http.version>0.9.1</metrics.client.http.version>
97-
<metrics.client.incubator.version>0.6.2</metrics.client.incubator.version>
98-
<metrics.jvm.extra.version>0.10.0</metrics.jvm.extra.version>
92+
<logback.steno.version>1.18.2</logback.steno.version>
93+
<log4j.over.slf4j.version>1.7.25</log4j.over.slf4j.version>
94+
<metrics.aggregator.protocol.version>1.0.6</metrics.aggregator.protocol.version>
95+
<metrics.client.version>0.10.1</metrics.client.version>
96+
<metrics.client.http.version>0.9.4</metrics.client.http.version>
97+
<metrics.client.incubator.version>0.6.3</metrics.client.incubator.version>
98+
<metrics.jvm.extra.version>0.10.1</metrics.jvm.extra.version>
9999
<oval.version>1.90</oval.version>
100-
<protobuf.version>3.6.0</protobuf.version>
100+
<protobuf.version>3.6.1</protobuf.version>
101101
<scala.version>2.11</scala.version>
102-
<scala.library.version>2.11.7</scala.library.version>
102+
<scala.library.version>2.11.12</scala.library.version>
103103
<slf4j.version>1.7.25</slf4j.version>
104104
<typesafe.config.version>1.3.3</typesafe.config.version>
105105
<vertx.core.version>2.1.6</vertx.core.version>
106106

107107
<!--Test dependency versions-->
108108
<commons.math3.version>3.6.1</commons.math3.version>
109-
<hamcrest.version>2.0.0.0</hamcrest.version>
109+
<hamcrest.version>2.1</hamcrest.version>
110110
<junit.benchmarks.version>0.7.2</junit.benchmarks.version>
111111
<junit.version>4.12</junit.version>
112-
<metrics.generator.version>1.2.2</metrics.generator.version>
113-
<mockito.version>2.19.0</mockito.version>
114-
<performance.test.version>1.1.0</performance.test.version>
112+
<metrics.generator.version>1.2.3</metrics.generator.version>
113+
<mockito.version>2.23.4</mockito.version>
114+
<performance.test.version>1.2.1</performance.test.version>
115115
<statsd.client.timgroup>3.1.0</statsd.client.timgroup>
116-
<wiremock.version>2.18.0</wiremock.version>
116+
<wiremock.version>2.20.0</wiremock.version>
117117

118118
<!-- Additional Plugins -->
119-
<aspectjtools.maven.plugin>1.9.1</aspectjtools.maven.plugin>
119+
<aspectjtools.maven.plugin>1.9.2</aspectjtools.maven.plugin>
120120
<aspectj.maven.plugin.version>1.8</aspectj.maven.plugin.version>
121121
<docker.maven.plugin.version>0.26.0</docker.maven.plugin.version>
122-
<javassist.maven.plugin.version>0.1.2</javassist.maven.plugin.version>
122+
<javassist.maven.plugin.version>0.2.2</javassist.maven.plugin.version>
123123
<maven.assembly.plugin.version>2.6</maven.assembly.plugin.version>
124124
<rpm.maven.plugin.version>2.1.5</rpm.maven.plugin.version>
125125

@@ -139,6 +139,9 @@
139139

140140
<!-- Project Overrides -->
141141
<buildDirectory>${project.basedir}/target</buildDirectory>
142+
143+
<!-- Additional Checkstyle Suppression -->
144+
<checkstyleExtraSuppressions>${project.basedir}/checkstyle-extra-suppressions.xml</checkstyleExtraSuppressions>
142145
</properties>
143146

144147
<build>
@@ -461,6 +464,13 @@
461464
<groupId>com.google.inject</groupId>
462465
<artifactId>guice</artifactId>
463466
<version>${guice.version}</version>
467+
<exclusions>
468+
<!-- TODO(ville): Guava is released for android and jre; guice depends on the former only -->
469+
<exclusion>
470+
<groupId>com.google.guava</groupId>
471+
<artifactId>guava</artifactId>
472+
</exclusion>
473+
</exclusions>
464474
</dependency>
465475
<dependency>
466476
<groupId>com.google.protobuf</groupId>
@@ -482,17 +492,46 @@
482492
<groupId>com.fasterxml.jackson.core</groupId>
483493
<artifactId>jackson-databind</artifactId>
484494
<version>${jackson.version}</version>
495+
<exclusions>
496+
<!-- TODO(ville): Remove this exclusion once the annotations package is consistently depended upon:
497+
https://github.com/FasterXML/jackson-bom/issues/15
498+
-->
499+
<exclusion>
500+
<groupId>com.fasterxml.jackson.core</groupId>
501+
<artifactId>jackson-annotations</artifactId>
502+
</exclusion>
503+
</exclusions>
485504
</dependency>
486505
<dependency>
487506
<groupId>com.fasterxml.jackson.datatype</groupId>
488507
<artifactId>jackson-datatype-guava</artifactId>
489508
<version>${jackson.version}</version>
490509
<scope>runtime</scope>
510+
<exclusions>
511+
<!-- TODO(ville): Jackson has a very slow update policy towards Guava; see:
512+
https://github.com/FasterXML/jackson-datatypes-collections/issues/23
513+
https://github.com/FasterXML/jackson-datatypes-collections/issues/24
514+
https://groups.google.com/forum/#!searchin/jackson-user/guava%7Csort:date/jackson-user/6AeY4UJMckE/_16cbhejAgAJ
515+
-->
516+
<exclusion>
517+
<groupId>com.google.guava</groupId>
518+
<artifactId>guava</artifactId>
519+
</exclusion>
520+
</exclusions>
491521
</dependency>
492522
<dependency>
493523
<groupId>com.fasterxml.jackson.module</groupId>
494524
<artifactId>jackson-module-guice</artifactId>
495525
<version>${jackson.version}</version>
526+
<exclusions>
527+
<!-- TODO(ville): Remove this exclusion once the annotations package is consistently depended upon:
528+
https://github.com/FasterXML/jackson-bom/issues/15
529+
-->
530+
<exclusion>
531+
<groupId>com.fasterxml.jackson.core</groupId>
532+
<artifactId>jackson-annotations</artifactId>
533+
</exclusion>
534+
</exclusions>
496535
</dependency>
497536
<dependency>
498537
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -505,6 +544,15 @@
505544
<artifactId>jackson-datatype-jsr310</artifactId>
506545
<version>${jackson.version}</version>
507546
<scope>runtime</scope>
547+
<exclusions>
548+
<!-- TODO(ville): Remove this exclusion once the annotations package is consistently depended upon:
549+
https://github.com/FasterXML/jackson-bom/issues/15
550+
-->
551+
<exclusion>
552+
<groupId>com.fasterxml.jackson.core</groupId>
553+
<artifactId>jackson-annotations</artifactId>
554+
</exclusion>
555+
</exclusions>
508556
</dependency>
509557
<dependency>
510558
<groupId>com.fasterxml.jackson.module</groupId>
@@ -583,6 +631,19 @@
583631
<groupId>io.vertx</groupId>
584632
<artifactId>vertx-core</artifactId>
585633
<version>${vertx.core.version}</version>
634+
<exclusions>
635+
<!-- TODO(ville): Old version of Vertx conflicts.
636+
We need to either remove Vert.x or upgrade; see master-2.0 for both
637+
-->
638+
<exclusion>
639+
<groupId>com.fasterxml.jackson.core</groupId>
640+
<artifactId>jackson-core</artifactId>
641+
</exclusion>
642+
<exclusion>
643+
<groupId>com.fasterxml.jackson.core</groupId>
644+
<artifactId>jackson-databind</artifactId>
645+
</exclusion>
646+
</exclusions>
586647
</dependency>
587648
<dependency>
588649
<groupId>org.apache.httpcomponents</groupId>
@@ -593,6 +654,9 @@
593654
<groupId>it.unimi.dsi</groupId>
594655
<artifactId>fastutil</artifactId>
595656
<version>${fastutil.version}</version>
657+
<!-- Jackson support not yet available:
658+
https://github.com/FasterXML/jackson-datatypes-collections/issues/38
659+
-->
596660
</dependency>
597661
<dependency>
598662
<groupId>org.aspectj</groupId>
@@ -623,22 +687,31 @@
623687
<artifactId>junit</artifactId>
624688
<version>${junit.version}</version>
625689
<scope>test</scope>
690+
<exclusions>
691+
<!-- TODO(ville): Remove once JUnit depends on modern hamcrest; see:
692+
http://hamcrest.org/JavaHamcrest/distributables
693+
-->
694+
<exclusion>
695+
<groupId>org.hamcrest</groupId>
696+
<artifactId>hamcrest-core</artifactId>
697+
</exclusion>
698+
</exclusions>
626699
</dependency>
627700
<dependency>
628-
<groupId>org.mockito</groupId>
629-
<artifactId>mockito-core</artifactId>
630-
<version>${mockito.version}</version>
701+
<groupId>org.hamcrest</groupId>
702+
<artifactId>hamcrest</artifactId>
703+
<version>${hamcrest.version}</version>
631704
<scope>test</scope>
632705
</dependency>
633706
<dependency>
634-
<groupId>org.hamcrest</groupId>
635-
<artifactId>java-hamcrest</artifactId>
636-
<version>${hamcrest.version}</version>
707+
<groupId>org.mockito</groupId>
708+
<artifactId>mockito-core</artifactId>
709+
<version>${mockito.version}</version>
637710
<scope>test</scope>
638711
</dependency>
639712
<dependency>
640713
<groupId>com.github.tomakehurst</groupId>
641-
<artifactId>wiremock</artifactId>
714+
<artifactId>wiremock-standalone</artifactId>
642715
<version>${wiremock.version}</version>
643716
<scope>test</scope>
644717
</dependency>

0 commit comments

Comments
 (0)