diff --git a/.jdkw b/.jdkw
index 16e417d..36e45d1 100644
--- a/.jdkw
+++ b/.jdkw
@@ -1,5 +1,4 @@
 JDKW_RELEASE=latest
 JDKW_DIST=zulu
-JDKW_BUILD=8.38.0.13
-JDKW_VERSION=8.0.212
-JDKW_VERBOSE=true
+JDKW_BUILD=17.36.13-ca
+JDKW_VERSION=17.0.4
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 49c3f22..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.jdk
-sudo: false
-env:
-  global:
-  - TARGET=install
-  - secure: R9PFMZWhbxtTIWy7h5LRCAJepgrFdBzu7/3JvwIDuyaO8y92Zw9Zx3RvSUgx2XGSMRnrMqnFeA1ecW4o4p00kYHlR7P9XM/DJxv5ZLTDaPk/MYH+0V1GT+giYNnlHiExqROCHOd19Zfh6TmPHq6w57Ln5WUQ929Gn+zy5NAGz68TDG0MtqTp3zkeZIBq3xw9+P7rXqN4qvG0hD/9v9mWW66fBRZL+gRWMz+qmfSPWeO9NQp8t3tnnlZXfLLJkOG/fQUkm8UNQsYCnv2XckvdxBYLcOLxtPg+pvYMgUbA8w01LO+wbRcS56PUX1nzuxy1wh4bv9C1RuklbGGNi887uq0gC9o0ZzXk5yLyPrX7XapVIicsYXdZerj94aDKj/pqw19vnuJqQ4eBGhCSqy9ED+ZnDoarG30seVt5AD214Z79vv86IaH3cwYD88VthszmusCnGwpHz1BV5uHVyEk9prvwvs+aKqf+a/lHnswXGyWV828mtpG0ZAvYm9NkJhBCytuQXBI9xwXJJYhZfMpP/EKJWBNCH/dqfQ4w05zWITJdDpvixDHvuuD+2Blt81lIoJyeCxQCwsTTirGcaxCibvDeVsnvQThsYwFR89LFwY3nH9q8hFYI32rurX3bc9SpcU7MJlz/280HQt4wPqqPdKpTRVatwNOK7yxdX0NF5Sk=
-  - secure: jMZmqw0/uxZ6PbwTZXXWFTa4zwJpBEzEPXps8SHYHPIj3lGtyDbQ+e5iuDeN/l5iagyQHaGUb072K6ahQAeJoVIT2sFHRHdAZ1qygYdKMMcDM7xambH5JLsVM2raVlDjei8OxWN7iyThjGemqXk53e/6IszaL/kc4b+9jxgUnrErGg3uBTUvK1/bafOYij3anMkQFeLq4KL+p7vV9iD6drpMyRfygfKNwAtSRSixpP0rlF5SWgbdyYF+vPhiNx2kxgf7UJDN036fxKw0TxXr/X7uac1mdic14pV1alV0ts9vX6eXk2sl4mHHJyEQ27DNkTVXA2/pllFDDf5JMLylJkhbj2YMxzUKaKXlQj+VQQ0914L7QkKDfgpKnAtcBb7ooxartTGstm7q2yN0FRuc3KuCLP0pu1ldv53V1TXXC+oiy7YgO+K+iFe6xae+RArztYtjjRXi46zccRE+o/ugYRDmRoVA71GCWQVHi1BjeT1eo3mreNcDItWmuxWfgu+l77wWA24/BJw1ACv7D01lP+sBp7IaTM3Ck4Ct0zIRHVr6O6/nuB6vXVEvNq6OH7Z6bqMuHoo6nLj/KqCV/ZnOQDDBWMDZ/NyAdk9KJMQDuTANIgB8eZGb0w5klRirWAtrNLn65EOG9J+Y4L2uL5hugb8V1u7MVL7QP0Rbp/Wn+HI=
-  - secure: lzNUHmeWnJ6KM1aB0k/U4j2PPaIq2f/TnxIwrkmd/Cmj3VL1GJh7KJn7A84ifeMzmU6eH2E8KK4U2G4jR5C0MYiEJz+vUfNb4HWLisPEPcTKr1L2XHuSd+XnijscH9wQkrLrlPgs/XaYTiiIMXqEw4UIxjMbo4eKDLE9zEXpe7iDil+Mbut7u2+5L1D3HFClxG3l5cTKRR8S4Je68l1XUraMvJYxcR1uPqTZVmmqQ1oWrRFMW+RdbIRyok3h+tot4LulZZ0OFB7UIBI/KfD0/4WWCz3E79AXwm9uTRLuTAKl1yJTh46CAzskuGPjNkMjM5IJCxTK6OEF1A1JouQ4gCdSDMpJSIr0prWa4MZ6iv9OSihiDDSwX1u/gUI0bH47ikstWamlLV4EzVDEatQta81vVTwQqNcK6N6K2Af5a6sFuFksGgYKqpoIrY7UgeIu/rwupBE5AdrUoYPbzR6YzAqAfyEx9tBZ0XV6kxdThMp5hQ0QFixN36TInYfo6dHZHa3JwAc3uckchnl3UxYdubIaaiWeUfs3IsUygO54HMi/FnlBWwlnWVeaCcBB4w6Oc4rs07i6DZLIkPPbWdWEw9DO2+39bUFS6p9DgaqntZ6vgkyg53jjjjP3LP7YR6WLVg24HlHYw62u1E/ZUgrcQjQjAeeDWdw0P1x0pC80lW8=
-install: true
-before_script:
-- gpg --import arpnetworking.key
-- if [ \( -n "${TRAVIS_TAG}" \) -a  "${TRAVIS_PULL_REQUEST}" = "false" ]; then export TARGET="deploy -P release --settings settings.xml"; fi;
-script:
-- ./jdk-wrapper.sh ./mvnw clean ${TARGET} -U
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..8af99db
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,58 @@
+pipeline {
+  agent {
+    kubernetes {
+      defaultContainer 'ubuntu'
+      activeDeadlineSeconds 3600
+      idleMinutes 15
+    }
+  }
+  stages {
+    stage('Init') {
+      steps {
+        checkout scm
+	script {
+	  def m = (env.GIT_URL =~ /(\/|:)(([^\/]+)\/)?(([^\/]+?)(\.git)?)$/)
+	  if (m) {
+	    org = m.group(3)
+	    repo = m.group(5)
+	  }
+	}
+      }
+    }
+    stage('Setup build') {
+      when { not { buildingTag() } }
+      steps {
+        script {
+          target = "verify"
+        }
+      }
+    }
+    stage('Setup release') {
+      when { buildingTag(); not { changeRequest() }  }
+      steps {
+        script {
+          target = "deploy -P release --settings settings.xml"
+        }
+        sh 'gpg --batch --import arpnetworking.key'
+      }
+    }
+    stage('Build') {
+      steps {
+        withCredentials([usernamePassword(credentialsId: 'jenkins-dockerhub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD'),
+            usernamePassword(credentialsId: 'jenkins-ossrh', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS'),
+            string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
+          withMaven {
+            sh "./jdk-wrapper.sh ./mvnw $target -U -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true"
+          }
+        }
+      }
+    }
+  }
+  post('Analysis') {
+    always {
+      recordIssues(
+          enabledForFailure: true, aggregatingResults: true,
+          tools: [java(), checkStyle(reportEncoding: 'UTF-8'), spotBugs()])
+    }
+  }
+}
diff --git a/jdk-wrapper.sh b/jdk-wrapper.sh
index aa955d8..7c7ace0 100755
--- a/jdk-wrapper.sh
+++ b/jdk-wrapper.sh
@@ -17,6 +17,12 @@
 # For documentation please refer to:
 # https://github.com/KoskiLabs/jdk-wrapper/blob/master/README.md
 
+HTTP_PROTOCOL="http"
+FILE_PROTOCOL="file"
+
+LATEST_RELEASE="latest"
+SNAPSHOT_RELEASE="snapshot"
+
 log_err() {
   l_prefix=$(date  +'%H:%M:%S')
   printf "[%s] %s\\n" "${l_prefix}" "$@" 1>&2;
@@ -42,35 +48,63 @@ safe_command() {
 
 checksum() {
   l_file="$1"
-  checksum_exec=""
+  l_checksum_exec=""
+  l_checksum_args=""
   if command -v sha256sum > /dev/null; then
-    checksum_exec="sha256sum"
+    l_checksum_exec="sha256sum"
   elif command -v shasum > /dev/null; then
-    checksum_exec="shasum -a 256"
+    l_checksum_exec="shasum"
+    l_checksum_args="-a 256"
   elif command -v sha1sum > /dev/null; then
-    checksum_exec="sha1sum"
+    l_checksum_exec="sha1sum"
   elif command -v md5 > /dev/null; then
-    checksum_exec="md5"
+    l_checksum_exec="md5"
   fi
-  if [ -z "${checksum_exec}" ]; then
+  if [ -z "${l_checksum_exec}" ]; then
     log_err "ERROR: No supported checksum command found!"
     exit 1
   fi
-  "${checksum_exec}" < "${l_file}"
+  ${l_checksum_exec} ${l_checksum_args} < "${l_file}"
 }
 
 rand() {
   awk 'BEGIN {srand();printf "%d\n", (rand() * 10^8);}'
 }
 
-download_if_needed() {
-  file="$1"
-  path="$2"
-  if [ ! -f "${path}/${file}" ]; then
-    jdkw_url="${JDKW_BASE_URI}/releases/download/${JDKW_RELEASE}/${file}"
-    log_out "Downloading ${file} from ${jdkw_url}"
-    safe_command "curl ${curl_options} -f -k -L -o \"${path}/${file}\" \"${jdkw_url}\""
-    safe_command "chmod +x \"${path}/${file}\""
+get_protocol() {
+  case "${JDKW_BASE_URI}" in
+  http://*|https://*)
+    printf "%s" "${HTTP_PROTOCOL}"
+    ;;
+  file://*)
+    printf "%s" "${FILE_PROTOCOL}"
+    ;;
+  *)
+    log_err "ERROR: Unsupported protocol in JDKW_BASE_URI: ${JDKW_BASE_URI}"
+    exit 1
+  esac
+}
+
+obtain_if_needed() {
+  l_file="$1"
+  l_target_path="$2"
+  if [ ! -f "${l_target_path}/${l_file}" ]; then
+    case "${JDKW_BASE_URI}" in
+    http://*|https://*)
+      l_jdkw_url="${JDKW_BASE_URI}/releases/download/${JDKW_RELEASE}/${l_file}"
+      log_out "Downloading ${l_file} from ${l_jdkw_url}"
+      safe_command "curl ${curl_options} -f -k -L -o \"${l_target_path}/${l_file}\" \"${l_jdkw_url}\""
+      ;;
+    file://*)
+      l_jdkw_path="${JDKW_BASE_URI#file://}/${l_file}"
+      log_out "Copying ${l_file} from ${l_jdkw_path}"
+      safe_command "cp \"${l_jdkw_path}\" \"${l_target_path}/${l_file}\""
+      ;;
+    *)
+      log_err "ERROR: Unsupported protocol in JDKW_BASE_URI: ${JDKW_BASE_URI}"
+      exit 1
+    esac
+    safe_command "chmod +x \"${l_target_path}/${l_file}\""
   fi
 }
 
@@ -96,7 +130,6 @@ done < "${l_fifo}"
 safe_command "rm \"${l_fifo}\""
 
 # Process (but do not load) properties from command line arguments
-command=
 cmd_configuration=
 for arg in "$@"; do
   jdkw_arg=$(echo "${arg}" | grep '^JDKW_.*')
@@ -107,13 +140,6 @@ for arg in "$@"; do
   if [ -n "${jdkw_arg}" ]; then
     cmd_configuration="${cmd_configuration}${arg} "
   fi
-  case "${arg}" in
-    *\'*)
-       arg=$(printf "%s" "$arg" | sed "s/'/'\"'\"'/g")
-       ;;
-    *) : ;;
-  esac
-  command="${command} '${arg}'"
 done
 
 # Default base directory to current working directory
@@ -142,7 +168,10 @@ if [ -z "${JDKW_BASE_URI}" ]; then
     JDKW_BASE_URI="https://github.com/KoskiLabs/jdk-wrapper"
 fi
 if [ -z "${JDKW_RELEASE}" ]; then
-  JDKW_RELEASE="latest"
+  JDKW_RELEASE="${LATEST_RELEASE}"
+  if [ $(get_protocol) = "${FILE_PROTOCOL}" ]; then
+    JDKW_RELEASE="${SNAPSHOT_RELEASE}"
+  fi
   log_out "Defaulted to version ${JDKW_RELEASE}"
 fi
 if [ -z "${JDKW_TARGET}" ]; then
@@ -154,7 +183,7 @@ if [ -z "${JDKW_VERBOSE}" ]; then
 fi
 
 # Resolve latest version
-if [ "${JDKW_RELEASE}" = "latest" ]; then
+if [ "${JDKW_RELEASE}" = "${LATEST_RELEASE}" ]; then
   latest_version_json="${TMPDIR:-/tmp}/jdkw-latest-version-$$.$(rand)"
   safe_command "curl ${curl_options} -f -k -L -o \"${latest_version_json}\" -H 'Accept: application/json' \"${JDKW_BASE_URI}/releases/latest\""
   JDKW_RELEASE=$(sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/' < "${latest_version_json}")
@@ -164,6 +193,10 @@ fi
 
 # Ensure target directory exists
 jdkw_path="${JDKW_TARGET}/jdkw/${JDKW_RELEASE}"
+if [ -d "${jdkw_path}" ] && [ "${JDKW_RELEASE}" = "${SNAPSHOT_RELEASE}" ]; then
+  log_out "Removing target snapshot directory ${jdkw_path}"
+  safe_command "rm -rf \"${jdkw_path}\""
+fi
 if [ ! -d "${jdkw_path}" ]; then
   log_out "Creating target directory ${jdkw_path}"
   safe_command "mkdir -p \"${jdkw_path}\""
@@ -172,30 +205,8 @@ fi
 # Download the jdk wrapper version
 jdkw_impl="jdkw-impl.sh"
 jdkw_wrapper="jdk-wrapper.sh"
-download_if_needed "${jdkw_impl}" "${jdkw_path}"
-download_if_needed "${jdkw_wrapper}" "${jdkw_path}"
-
-# Execute the provided command
-
-# Run the command in the backround (with all the trouble that entails)
-# NOTE: Alternatively convert this to an exec if we don't need to output the
-# wrapper mismatch at the end; e.g. make that a hard precondition to running.
-set -m
-trap 'kill -TERM ${impl_pid}' TERM INT
-"${jdkw_path}/${jdkw_impl}" "$@" &
-impl_pid=$!
-fg
-wait ${impl_pid} > /dev/null 2>&1
-wait_result=$?
-if [ ${wait_result} -ne 127 ]; then
-  result=${wait_result}
-fi
-trap - TERM INT
-wait ${impl_pid} > /dev/null 2>&1
-wait_result=$?
-if [ ${wait_result} -ne 127 ]; then
-  result=${wait_result}
-fi
+obtain_if_needed "${jdkw_impl}" "${jdkw_path}"
+obtain_if_needed "${jdkw_wrapper}" "${jdkw_path}"
 
 # Check whether this wrapper is the one specified for this version
 jdkw_download="${jdkw_path}/${jdkw_wrapper}"
@@ -204,6 +215,13 @@ if [ "$(checksum "${jdkw_download}")" != "$(checksum "${jdkw_current}")" ]; then
   printf "\e[0;31m[WARNING]\e[0m Your jdk-wrapper.sh file does not match the one in your JDKW_RELEASE.\n"
   printf "\e[0;32mUpdate your jdk-wrapper.sh to match by running:\e[0m\n"
   printf "cp \"%s\" \"%s\"\n" "${jdkw_download}" "${jdkw_current}"
+  sleep 3
 fi
 
-exit ${result}
+# Execute the provided command
+# NOTE: The requirements proved quite difficult to run this without exec.
+# 1) Exit with the exit status of the child process
+# 2) Allow running the wrapper in the background and terminating the child process
+# 3) Allow the child process to read from standard input when not running in the background
+exec "${jdkw_path}/${jdkw_impl}" "$@"
+
diff --git a/maven/maven-wrapper.properties b/maven/maven-wrapper.properties
index 60c4522..9717dad 100644
--- a/maven/maven-wrapper.properties
+++ b/maven/maven-wrapper.properties
@@ -1,5 +1,5 @@
 #Maven download properties
-#Wed Sep 11 15:35:48 PDT 2019
-checksumAlgorithm=SHA1
+#Wed Jan 19 23:16:22 PST 2022
+distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
 verifyDownload=true
-distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
+checksumAlgorithm=SHA1
diff --git a/pom.xml b/pom.xml
index e1cd6e4..820da59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.arpnetworking.build</groupId>
     <artifactId>arpnetworking-parent-pom</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.9</version>
     <relativePath />
   </parent>
 
@@ -68,13 +68,13 @@
 
   <properties>
     <!--Dependency versions-->
-    <arpnetworking.commons.version>1.18.3</arpnetworking.commons.version>
-    <spotbugs.annotations.version>4.0.3</spotbugs.annotations.version>
+    <arpnetworking.commons.version>2.0.4</arpnetworking.commons.version>
+    <spotbugs.annotations.version>4.7.1</spotbugs.annotations.version>
     <hamcrest.version>2.2</hamcrest.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <junit.version>4.13</junit.version>
-    <mockito.version>2.23.4</mockito.version>
-    <slf4j.version>1.7.30</slf4j.version>
+    <junit.version>4.13.2</junit.version>
+    <mockito.version>4.7.0</mockito.version>
+    <slf4j.version>1.7.36</slf4j.version>
 
     <!-- Spotbugs -->
     <!-- NOTE: Custom version excludes sample code as well -->
diff --git a/spotbugs.exclude.xml b/spotbugs.exclude.xml
index ca51a0d..b203a38 100644
--- a/spotbugs.exclude.xml
+++ b/spotbugs.exclude.xml
@@ -26,7 +26,11 @@
          http://findbugs.sourceforge.net/bugDescriptions.html#DLS_DEAD_LOCAL_STORE
      -->
      <Match>
-         <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+         <Or>
+             <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+             <Bug pattern="EI_EXPOSE_REP" />
+             <Bug pattern="EI_EXPOSE_REP2" />
+         </Or>
      </Match>
 
      <!-- Match all RV_RETURN_VALUE_IGNORED_BAD_PRACTICE violations on all unit
diff --git a/src/main/java/com/arpnetworking/metrics/impl/TsdMetricsFactory.java b/src/main/java/com/arpnetworking/metrics/impl/TsdMetricsFactory.java
index 52557bf..72f4c05 100644
--- a/src/main/java/com/arpnetworking/metrics/impl/TsdMetricsFactory.java
+++ b/src/main/java/com/arpnetworking/metrics/impl/TsdMetricsFactory.java
@@ -236,7 +236,7 @@ public String toString() {
     /* package private */ static Optional<Sink> createSink(final Class<? extends Sink> sinkClass) {
         try {
             final Class<?> sinkBuilderClass = Class.forName(sinkClass.getName() + "$Builder");
-            final Object sinkBuilder = sinkBuilderClass.newInstance();
+            final Object sinkBuilder = sinkBuilderClass.getDeclaredConstructor().newInstance();
             final Method buildMethod = sinkBuilderClass.getMethod("build");
             return Optional.of((Sink) buildMethod.invoke(sinkBuilder));
             // CHECKSTYLE.OFF: IllegalCatch - Much cleaner than catching the half-dozen checked exceptions
diff --git a/src/test/java/com/arpnetworking/metrics/impl/AugmentedHistogramTest.java b/src/test/java/com/arpnetworking/metrics/impl/AugmentedHistogramTest.java
index 41a9d2f..d9854b8 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/AugmentedHistogramTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/AugmentedHistogramTest.java
@@ -15,6 +15,8 @@
  */
 package com.arpnetworking.metrics.impl;
 
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -55,54 +57,54 @@ public void testInvalidAugmentedHistogram() {
             sum += i * i;
         }
 
-        Assert.assertTrue(
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(null)
                         .setPrecision(7)
                         .setMinimum(1.0)
                         .setMaximum(10.0)
                         .setSum(sum)
-                        .build() instanceof NoOpAggregatedData);
-        Assert.assertTrue(
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(histogram)
                         .setPrecision(null)
                         .setMinimum(1.0)
                         .setMaximum(10.0)
                         .setSum(sum)
-                        .build() instanceof NoOpAggregatedData);
-        Assert.assertTrue(
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(histogram)
                         .setPrecision(7)
                         .setMinimum(null)
                         .setMaximum(10.0)
                         .setSum(sum)
-                        .build() instanceof NoOpAggregatedData);
-        Assert.assertTrue(
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(histogram)
                         .setPrecision(7)
                         .setMinimum(1.0)
                         .setMaximum(null)
                         .setSum(sum)
-                        .build() instanceof NoOpAggregatedData);
-        Assert.assertTrue(
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(histogram)
                         .setPrecision(7)
                         .setMinimum(1.0)
                         .setMaximum(10.0)
                         .setSum(null)
-                        .build() instanceof NoOpAggregatedData);
-        Assert.assertTrue(
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
+        MatcherAssert.assertThat(
                 new AugmentedHistogram.Builder()
                         .setHistogram(histogram)
                         .setPrecision(7)
                         .setMinimum(9999.0) // Min is greater than max
                         .setMaximum(0.9999)
                         .setSum(sum)
-                        .build() instanceof NoOpAggregatedData);
+                        .build(), Matchers.instanceOf(NoOpAggregatedData.class));
     }
 
     @Test
diff --git a/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsFactoryTest.java b/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsFactoryTest.java
index 79477ca..e3a19eb 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsFactoryTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsFactoryTest.java
@@ -32,7 +32,7 @@ public final class NoOpMetricsFactoryTest {
     public void testCreate() {
         final Metrics metrics = new NoOpMetricsFactory().create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof NoOpMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(NoOpMetrics.class));
     }
 
     @Test
diff --git a/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsTest.java b/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsTest.java
index f570176..d2e274d 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/NoOpMetricsTest.java
@@ -37,7 +37,7 @@ public final class NoOpMetricsTest {
     public void testCreateCounter() {
         final Metrics metrics = new NoOpMetrics();
         Assert.assertNotNull(metrics.createCounter("aCounter"));
-        Assert.assertTrue(metrics.createCounter("aCounter") instanceof NoOpCounter);
+        MatcherAssert.assertThat(metrics.createCounter("aCounter"), Matchers.instanceOf(NoOpCounter.class));
         Assert.assertNotSame(metrics.createCounter("aCounter"), metrics.createCounter("aCounter"));
     }
 
@@ -80,7 +80,7 @@ public void testResetCounter() {
     public void testCreateTimer() {
         final Metrics metrics = new NoOpMetrics();
         Assert.assertNotNull(metrics.createTimer("aTimer"));
-        Assert.assertTrue(metrics.createTimer("aTimer") instanceof NoOpTimer);
+        MatcherAssert.assertThat(metrics.createTimer("aTimer"), Matchers.instanceOf(NoOpTimer.class));
         Assert.assertNotSame(metrics.createTimer("aTimer"), metrics.createTimer("aTimer"));
     }
 
diff --git a/src/test/java/com/arpnetworking/metrics/impl/TsdCounterTest.java b/src/test/java/com/arpnetworking/metrics/impl/TsdCounterTest.java
index ddbf75f..6f386ae 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/TsdCounterTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/TsdCounterTest.java
@@ -98,7 +98,7 @@ public void testIncrementAfterClose() {
         final TsdCounter counter = new TsdCounter("counterName", isOpen, logger);
         counter.increment();
         isOpen.set(false);
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         counter.increment();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -110,7 +110,7 @@ public void testIncrementByValueAfterClose() {
         final TsdCounter counter = new TsdCounter("counterName", isOpen, logger);
         counter.increment(2L);
         isOpen.set(false);
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         counter.increment(2L);
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -122,7 +122,7 @@ public void testDecrementAfterClose() {
         final TsdCounter counter = new TsdCounter("counterName", isOpen, logger);
         counter.decrement();
         isOpen.set(false);
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         counter.decrement();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -134,7 +134,7 @@ public void testDecrementByValueAfterClose() {
         final TsdCounter counter = new TsdCounter("counterName", isOpen, logger);
         counter.decrement(2L);
         isOpen.set(false);
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         counter.decrement(2L);
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
diff --git a/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsFactoryTest.java b/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsFactoryTest.java
index 2738b0f..44dccee 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsFactoryTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsFactoryTest.java
@@ -23,6 +23,9 @@
 import com.arpnetworking.metrics.Metrics;
 import com.arpnetworking.metrics.MetricsFactory;
 import com.arpnetworking.metrics.Sink;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -51,9 +54,13 @@ public final class TsdMetricsFactoryTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        _mocks = MockitoAnnotations.openMocks(this);
     }
 
+    @After
+    public void after() throws Exception {
+        _mocks.close();
+    }
     @AfterClass
     public static void afterClass() {
         new File("./query.log").deleteOnExit();
@@ -65,16 +72,16 @@ public void testNewInstance() throws UnknownHostException {
                 "MyService",
                 "MyCluster");
 
-        Assert.assertTrue(metricsFactory.getHostResolver() instanceof BackgroundCachingHostResolver);
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getHostResolver(), Matchers.instanceOf(BackgroundCachingHostResolver.class));
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
     }
 
     @Test
@@ -87,14 +94,14 @@ public void testBuilderDefaults() throws UnknownHostException {
                 .build();
 
         Assert.assertSame(_mockHostResolver, metricsFactory.getHostResolver());
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         Mockito.verify(_mockHostResolver).get();
     }
 
@@ -109,14 +116,14 @@ public void testBuilderNullSinks() throws UnknownHostException {
                 .build();
 
         Assert.assertSame(_mockHostResolver, metricsFactory.getHostResolver());
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         Mockito.verify(_mockHostResolver).get();
     }
 
@@ -131,8 +138,8 @@ public void testBuilderNullHostResolver() throws UnknownHostException {
                 .setSinks(Collections.singletonList(sink))
                 .build();
 
-        Assert.assertTrue(metricsFactory.getHostResolver() instanceof BackgroundCachingHostResolver);
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getHostResolver(), Matchers.instanceOf(BackgroundCachingHostResolver.class));
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
@@ -140,7 +147,7 @@ public void testBuilderNullHostResolver() throws UnknownHostException {
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         metrics.close();
         Mockito.verify(sink).record(Mockito.any(Event.class));
     }
@@ -167,7 +174,7 @@ public void testBuilderHostResolverFailure() throws UnknownHostException {
                 Mockito.eq("Unable to construct TsdMetrics, metrics disabled; failures=[Unable to determine hostname]"),
                 Mockito.any(RuntimeException.class));
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         metrics.close();
 
         Mockito.verify(sink, Mockito.never()).record(Mockito.any(Event.class));
@@ -188,7 +195,7 @@ public void testBuilderSinks() {
         @SuppressWarnings("resource")
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         metrics.close();
         Mockito.verify(sink1).record(Mockito.any(Event.class));
         Mockito.verify(sink2).record(Mockito.any(Event.class));
@@ -204,7 +211,7 @@ public void testBuilderNoSinks() {
                 .build();
         Mockito.verify(logger).warn(Mockito.anyString());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
 
         @SuppressWarnings("resource")
         final Metrics metrics = metricsFactory.create();
@@ -221,11 +228,11 @@ public void testBuilderFailureClusterName() {
                 .build();
         Mockito.verify(logger).warn(Mockito.anyString());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
         @SuppressWarnings("resource")
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         metrics.close();
      }
 
@@ -239,11 +246,11 @@ public void testBuilderFailureServiceName() {
                 .build();
         Mockito.verify(logger).warn(Mockito.anyString());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
-        Assert.assertTrue(metricsFactory.getSinks().get(0) instanceof WarningSink);
+        MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
         @SuppressWarnings("resource")
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         metrics.close();
     }
 
@@ -259,7 +266,7 @@ public void testBuilderHostResolver() throws UnknownHostException {
                 .build();
 
         Assert.assertSame(_mockHostResolver, metricsFactory.getHostResolver());
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
@@ -267,7 +274,7 @@ public void testBuilderHostResolver() throws UnknownHostException {
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         Mockito.verify(_mockHostResolver).get();
 
         final ArgumentCaptor<Event> eventArgumentCaptor = ArgumentCaptor.forClass(Event.class);
@@ -290,7 +297,7 @@ public void testBuilderHostNameOverride() throws UnknownHostException {
                 .build();
 
         Assert.assertNotSame(_mockHostResolver, metricsFactory.getHostResolver());
-        Assert.assertTrue(metricsFactory.getUuidFactory() instanceof SplittableRandomUuidFactory);
+        MatcherAssert.assertThat(metricsFactory.getUuidFactory(), Matchers.instanceOf(SplittableRandomUuidFactory.class));
         Assert.assertEquals("MyService", metricsFactory.getServiceName());
         Assert.assertEquals("MyCluster", metricsFactory.getClusterName());
         Assert.assertEquals(1, metricsFactory.getSinks().size());
@@ -298,7 +305,7 @@ public void testBuilderHostNameOverride() throws UnknownHostException {
 
         final Metrics metrics = metricsFactory.create();
         Assert.assertNotNull(metrics);
-        Assert.assertTrue(metrics instanceof TsdMetrics);
+        MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
         Mockito.verify(_mockHostResolver, Mockito.never()).get();
 
         final ArgumentCaptor<Event> eventArgumentCaptor = ArgumentCaptor.forClass(Event.class);
@@ -344,7 +351,7 @@ public void testCreateDefaultSinksNone() {
         final List<Sink> sinks = TsdMetricsFactory.createDefaultSinks(Collections.emptyList());
         Assert.assertNotNull(sinks);
         Assert.assertEquals(1, sinks.size());
-        Assert.assertTrue(sinks.iterator().next() instanceof WarningSink);
+        MatcherAssert.assertThat(sinks.iterator().next(), Matchers.instanceOf(WarningSink.class));
     }
 
     @Test
@@ -353,7 +360,7 @@ public void testCreateDefaultSinksInvalid() {
                 Collections.singletonList("com.arpnetworking.metrics.impl.NonExistentSink"));
         Assert.assertNotNull(sinks);
         Assert.assertEquals(1, sinks.size());
-        Assert.assertTrue(sinks.iterator().next() instanceof WarningSink);
+        MatcherAssert.assertThat(sinks.iterator().next(), Matchers.instanceOf(WarningSink.class));
     }
 
     @Test
@@ -362,7 +369,7 @@ public void testCreateDefaultSinksValid() {
                 Collections.singletonList("com.arpnetworking.metrics.impl.TsdMetricsFactoryTest$ValidDefaultSink"));
         Assert.assertNotNull(sinks);
         Assert.assertEquals(1, sinks.size());
-        Assert.assertTrue(sinks.iterator().next() instanceof ValidDefaultSink);
+        MatcherAssert.assertThat(sinks.iterator().next(), Matchers.instanceOf(ValidDefaultSink.class));
     }
 
     @Test
@@ -373,7 +380,7 @@ public void testCreateDefaultSinksMultipleUseFirst() {
                         "com.arpnetworking.metrics.impl.NonExistentSink"));
         Assert.assertNotNull(sinks);
         Assert.assertEquals(1, sinks.size());
-        Assert.assertTrue(sinks.iterator().next() instanceof ValidDefaultSink);
+        MatcherAssert.assertThat(sinks.iterator().next(), Matchers.instanceOf(ValidDefaultSink.class));
     }
 
     @Test
@@ -385,14 +392,14 @@ public void testCreateDefaultSinksMultipleSkipInvalid() {
                         "com.arpnetworking.metrics.impl.TsdMetricsFactoryTest$ValidDefaultSink"));
         Assert.assertNotNull(sinks);
         Assert.assertEquals(1, sinks.size());
-        Assert.assertTrue(sinks.iterator().next() instanceof ValidDefaultSink);
+        MatcherAssert.assertThat(sinks.iterator().next(), Matchers.instanceOf(ValidDefaultSink.class));
     }
 
     @Test
     public void testCreateSinkSuccess() {
         final Optional<Sink> sink = TsdMetricsFactory.createSink(WarningSink.class);
         Assert.assertTrue(sink.isPresent());
-        Assert.assertTrue(sink.get() instanceof WarningSink);
+        MatcherAssert.assertThat(sink.get(), Matchers.instanceOf(WarningSink.class));
     }
 
     @Test
@@ -406,7 +413,7 @@ public void testGetSinkExisting() {
         final Optional<Class<? extends Sink>> sinkClass = TsdMetricsFactory.getSinkClass(
                 "com.arpnetworking.metrics.impl.WarningSink");
         Assert.assertTrue(sinkClass.isPresent());
-        Assert.assertTrue(WarningSink.class.equals(sinkClass.get()));
+        Assert.assertEquals(WarningSink.class, sinkClass.get());
     }
 
     @Test
@@ -420,6 +427,7 @@ public void testGetSinkDoesNotExist() {
     private HostResolver _mockHostResolver;
     @Mock
     private UuidFactory _mockUuidFactory;
+    private AutoCloseable _mocks;
 
     /**
      * Invalid default sink. This sink is an invalid default sink because it
diff --git a/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsTest.java b/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsTest.java
index 5872ad6..2dfb788 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/TsdMetricsTest.java
@@ -452,7 +452,7 @@ public void testCloseNotOpen() {
         @SuppressWarnings("resource")
         final TsdMetrics metrics = createTsdMetrics(logger, sink);
         metrics.close();
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         metrics.close();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -527,7 +527,7 @@ public void testStopTimerAlreadyStopped() {
         final TsdMetrics metrics = createTsdMetrics(logger, sink);
         metrics.startTimer("timer-already-stopped");
         metrics.stopTimer("timer-already-stopped");
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         metrics.stopTimer("timer-already-stopped");
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
diff --git a/src/test/java/com/arpnetworking/metrics/impl/TsdTimerTest.java b/src/test/java/com/arpnetworking/metrics/impl/TsdTimerTest.java
index 01fa0f9..ed082ea 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/TsdTimerTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/TsdTimerTest.java
@@ -82,7 +82,7 @@ public void testAlreadyStopped() {
         @SuppressWarnings("resource")
         final TsdTimer timer = new TsdTimer("timerName", isOpen, logger);
         timer.close();
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         timer.close();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -107,7 +107,7 @@ public void testAlreadyAborted() {
         @SuppressWarnings("resource")
         final TsdTimer timer = new TsdTimer("timerName", isOpen, logger);
         timer.abort();
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         timer.abort();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -119,7 +119,7 @@ public void testStopAfterAbort() {
         @SuppressWarnings("resource")
         final TsdTimer timer = new TsdTimer("timerName", isOpen, logger);
         timer.abort();
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         timer.close();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
@@ -131,7 +131,7 @@ public void testAbortAfterStop() {
         @SuppressWarnings("resource")
         final TsdTimer timer = new TsdTimer("timerName", isOpen, logger);
         timer.close();
-        Mockito.verifyZeroInteractions(logger);
+        Mockito.verifyNoInteractions(logger);
         timer.abort();
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(Matchers.any(String.class)));
     }
diff --git a/src/test/java/com/arpnetworking/metrics/impl/WarningSinkTest.java b/src/test/java/com/arpnetworking/metrics/impl/WarningSinkTest.java
index fa7d3f1..18bff94 100644
--- a/src/test/java/com/arpnetworking/metrics/impl/WarningSinkTest.java
+++ b/src/test/java/com/arpnetworking/metrics/impl/WarningSinkTest.java
@@ -57,7 +57,7 @@ public void testWarningSink() {
 
         sink.record(event);
 
-        Mockito.verifyZeroInteractions(event);
+        Mockito.verifyNoInteractions(event);
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(
                 Matchers.containsString(reasons.toString())));
     }
@@ -74,7 +74,7 @@ public void testWarningSinkBuilderNullReasons() {
 
         sink.record(event);
 
-        Mockito.verifyZeroInteractions(event);
+        Mockito.verifyNoInteractions(event);
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(
                 Matchers.containsString("Reasons must be a non-null list")));
     }
@@ -90,7 +90,7 @@ public void testWarningSinkBuilderEmptyReasons() {
 
         sink.record(event);
 
-        Mockito.verifyZeroInteractions(event);
+        Mockito.verifyNoInteractions(event);
         Mockito.verify(logger).warn(MockitoHamcrest.argThat(
                 Matchers.containsString("Reasons must be a non-empty list")));
     }