From 59955f81df11aed63d2c01ef866f2c5fc33e0e0d Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Fri, 16 Apr 2021 13:42:57 +0100
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version (#201)

* Excavator: Upgrades Baseline to the latest version

* Ensure root project name is set

* More progress

* Fix immutables

* Remove dropwizard 0.x stuff

* errorProneApply

* spotless

* errorprone for tests too

* Add generated changelog entries

* Create baseline-class-uniqueness.lock

* Remove unnecessary baseline applications

* Update baseline config

* checkstyle

* Check unused constraints

Co-authored-by: Callum Rogers <callumr@palantir.com>
---
 .../checkstyle/checkstyle-suppressions.xml    |  14 +-
 .baseline/checkstyle/checkstyle.xml           | 133 ++++++++-----
 .baseline/copyright/999_palantir.txt          |   1 +
 .../dotfile.settings/org.eclipse.jdt.ui.prefs |   4 +-
 .../idea/intellij-java-palantir-style.xml     |  46 ++++-
 CHANGELOG                                     |   0
 build.gradle                                  |  43 +----
 changelog/@unreleased/pr-201.v2.yml           |   5 +
 .../baseline-class-uniqueness.lock            |  11 ++
 .../build.gradle                              |  12 +-
 .../crypto/EncryptConfigValueCommand.java     |  23 +--
 .../crypto/EncryptedConfigValueBundle.java    |   2 +-
 .../config/crypto/GenerateKeyCommand.java     |  23 +--
 .../crypto/VariableSubstitutionTest.java      |   2 +-
 encrypted-config-value-bundle/build.gradle    |  16 --
 .../ConfigurationDecryptionException.java     |  28 ---
 .../crypto/EncryptConfigValueCommand.java     |  64 ------
 .../crypto/EncryptedConfigValueBundle.java    |  46 -----
 .../config/crypto/GenerateKeyCommand.java     |  70 -------
 .../SubstitutingConfigurationFactory.java     | 107 ----------
 .../crypto/EncryptConfigValueCommandTest.java |  96 ---------
 .../config/crypto/GenerateKeyCommandTest.java |  70 -------
 .../SubstitutingConfigurationFactoryTest.java |  86 ---------
 .../crypto/VariableSubstitutionTest.java      |  70 -------
 .../jackson/JsonNodeStringReplacerTest.java   | 182 ------------------
 .../palantir/config/crypto/util/Person.java   |  36 ----
 .../config/crypto/util/TestConfig.java        |  76 --------
 .../src/test/resources/test.key               |   1 -
 .../src/test/resources/testConfig.yml         |  13 --
 .../test/resources/testConfigWithError.yml    |  13 --
 .../algorithm/rsa/RsaOaepEncrypter.java       |   2 +-
 .../palantir/config/crypto/AlgorithmTest.java |   2 +-
 gradle/immutables-processors.gradle           |   4 +-
 settings.gradle                               |   3 +-
 version.props                                 |  22 ---
 versions.lock                                 |  98 ++++++++++
 versions.props                                |  13 ++
 37 files changed, 297 insertions(+), 1140 deletions(-)
 create mode 100644 .baseline/copyright/999_palantir.txt
 delete mode 100644 CHANGELOG
 create mode 100644 changelog/@unreleased/pr-201.v2.yml
 create mode 100644 encrypted-config-value-bundle-dropwizard1/baseline-class-uniqueness.lock
 delete mode 100644 encrypted-config-value-bundle/build.gradle
 delete mode 100644 encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/ConfigurationDecryptionException.java
 delete mode 100644 encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
 delete mode 100644 encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
 delete mode 100644 encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
 delete mode 100644 encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/SubstitutingConfigurationFactory.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/EncryptConfigValueCommandTest.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/GenerateKeyCommandTest.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/SubstitutingConfigurationFactoryTest.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/jackson/JsonNodeStringReplacerTest.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/Person.java
 delete mode 100644 encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/TestConfig.java
 delete mode 100644 encrypted-config-value-bundle/src/test/resources/test.key
 delete mode 100644 encrypted-config-value-bundle/src/test/resources/testConfig.yml
 delete mode 100644 encrypted-config-value-bundle/src/test/resources/testConfigWithError.yml
 delete mode 100644 version.props
 create mode 100644 versions.lock
 create mode 100644 versions.props

diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 5b9a462f..c0f855b1 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!-- IMPORTANT ECLIPSE NOTE: If you change this file, you must restart Eclipse
  for your changes to take effect in its Checkstyle integration. -->
@@ -12,6 +11,11 @@
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemOut" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemErr" />
+
+    <!-- Suppress test resources -->
+    <suppress files="[/\\]src[/\\]test[/\\]resources.*" checks="." />
 
     <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
     <suppress files="package-info.java" checks="JavadocStyle" />
@@ -21,7 +25,5 @@
     <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="NewlineAtEndOfFile" />
 
     <!-- Generated code should not be subjected to checkstyle. -->
-    <suppress files="[/\\].*[/\\]generated_src[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated_testSrc[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated[/\\]" checks="." />
+    <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="." />
 </suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 0000e6bf..af0eb264 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Palantir Baseline Checkstyle configuration.
@@ -18,15 +18,6 @@
     <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
         <property name="lineSeparator" value="lf"/>
     </module>
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
-        <property name="fileExtensions" value=".java,.ts"/>
-    </module>
-    <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
-        <property name="fileExtensions" value="java"/>
-        <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
-        <property name="message" value="@VisibleForTesting members should be package-private."/>
-    </module>
     <module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
         <property name="format" value="&lt;&lt;&lt;&lt;&lt;&lt;&lt;"/>
         <property name="message" value="Found (&lt;&lt;&lt;&lt;&lt;&lt;&lt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
@@ -40,21 +31,33 @@
         <property name="message" value="Whitespace at end-of-line"/>
     </module>
     <module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
-	<property name="fileExtensions" value="java"/>
+        <property name="fileExtensions" value="java"/>
         <property name="format" value="^\n\n$"/>
         <property name="message" value="Two consecutive blank lines are not permitted."/>
     </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
+    <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
+        <!-- custom-suppressions.xml allows users to specify suppresions that will not be overriden by baselineUpdateConfig -->
+        <property name="file" value="${config_loc}/custom-suppressions.xml"/>
+        <property name="optional" value="true"/>
+    </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-        <property name="checkFormat" value="$1"/>
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+    <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     </module>
     <module name="TreeWalker">
+        <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
         <module name="AbbreviationAsWordInName"> <!-- Java Style Guide: Camel case : defined -->
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -78,12 +81,7 @@
         </module>
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
-            <property name="excludes" value="
-                java.util.Collections.*,
-                java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+            <property name="excludes" value="com.google.common.base.Preconditions.*, com.palantir.logsafe.Preconditions.*, java.util.Collections.*, java.util.stream.Collectors.*, org.apache.commons.lang3.Validate.*, org.assertj.core.api.Assertions.*, org.mockito.Mockito.*"/>
         </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -105,8 +103,6 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FileContentsHolder"/> <!-- Required for SuppressionCommentFilter -->
-        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
             <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
@@ -123,10 +119,30 @@
             <property name="illegalPkgs" value="junit.framework"/>
             <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
         </module>
+        <module name="IllegalImport"> <!-- Only relevant for pre-Java 11 because javafx is gone completely in Java 11 -->
+            <property name="id" value="BanJavafx"/>
+            <property name="illegalPkgs" value="javafx"/>
+            <message key="import.illegal" value="Must not import javafx classes because some OpenJDK builds do not include javafx."/>
+        </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
-            <property name="illegalPkgs" value="sun, org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/>
             <message key="import.illegal" value="Must not import repackaged classes."/>
         </module>
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
+            <property name="id" value="BanShadedClasses"/>
+            <property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
+            <property name="regexp" value="true"/>
+            <message key="import.illegal" value="Must not import repackaged classes."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
+            <property name="regexp" value="true"/>
+            <message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="sun"/>
+            <message key="import.illegal" value="Must not use Oracle's Java implementation details. See http://www.oracle.com/technetwork/java/faq-sun-packages-142232.html ."/>
+        </module>
         <module name="IllegalImport">
             <property name="illegalPkgs" value="org.apache.commons.lang"/>
             <message key="import.illegal" value="lang is deprecated, use lang3 instead."/>
@@ -136,9 +152,14 @@
             <message key="import.illegal" value="math is deprecated, use math3 instead."/>
         </module>
         <module name="IllegalImport">
+            <property name="id" value="BanLoggingImplementations"/>
             <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
             <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
         </module>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="com.google.common.base.Optional, com.google.common.base.Supplier"/>
+            <message key="import.illegal" value="Use the Java8 version of Guava objects."/>
+        </module>
         <module name="IllegalInstantiation"> <!-- Java Coding Guidelines: Never instantiate primitive types -->
             <property name="classes" value="java.lang.Boolean"/>
             <property name="classes" value="java.lang.Byte"/>
@@ -155,11 +176,17 @@
             <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
         </module>
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
-            <property name="illegalClassNames" value="java.util.HashSet, java.util.HashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+            <property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+        </module>
+        <module name="IllegalType">
+            <property name="id" value="BanGuavaCaches"/>
+            <property name="illegalClassNames" value="com.google.common.cache.CacheBuilder, com.google.common.cache.Cache, com.google.common.cache.LoadingCache"/>
+            <message key="illegal.type" value="Do not use Guava caches, they are outperformed by and harder to use than Caffeine caches"/>
         </module>
         <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
             <property name="groups" value="/.*/"/>
             <property name="option" value="top"/>
+            <property name="separated" value="true"/>
             <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>
         <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
@@ -167,13 +194,7 @@
             <property name="lineWrappingIndentation" value="8"/>
         </module>
         <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
-        <module name="LeftCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
-            <property name="maxLineLength" value="120"/>
-        </module>
-        <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
+        <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
         <module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
             <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
@@ -257,6 +278,11 @@
             <property name="format" value="CoreMatchers\.equalTo"/>
             <property name="message" value="Use Assert.assertEquals()."/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanJacksonFindAndRegisterModulesMethod"/>
+            <property name="format" value="findAndRegisterModules"/>
+            <property name="message" value="Use ObjectMapper#registerModule(&lt;yourModule&gt;) explicitly. ObjectMapper#findAndRegisterModules() is dangerous because it will change behaviour depending on which modules are on your classpath (including transitive dependencies)."/>
+        </module>
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
             <property name="format" value="CoreMatchers\.notNull"/>
             <property name="message" value="Use better assertion method(s): Assert.assertEquals(), assertNull(), assertSame(), etc."/>
@@ -307,25 +333,34 @@
             <property name="message" value="printStackTrace is not generally allowed."/>
             <property name="ignoreComments" value="true"/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemOut"/>
+            <property name="format" value="System\.out\."/>
+            <property name="message" value="Logging with System.out is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemErr"/>
+            <property name="format" value="System\.err\."/>
+            <property name="message" value="Logging with System.err is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bCharsets\."/>
             <property name="message" value="Use JDK StandardCharsets instead of alternatives."/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bCharset.defaultCharset\("/>
-            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF-8) instead of default."/>
+            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF_8) instead of default."/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bIOUtils\.toString\("/>
             <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
         </module>
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="static enum"/>
-            <property name="message" value="Redundant ''static'' modifier."/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
-            <property name="message" value="TODO format: // TODO(flastname): explanation"/>
+            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
+            <property name="ignoreCase" value="true"/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
@@ -333,11 +368,11 @@
         </module>
         <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
             <property name="option" value="same"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
         </module>
         <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
             <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
             <property name="tokens" value="DOT"/>
@@ -355,12 +390,11 @@
         <module name="SuppressWarnings">
             <property name="format" value="serial"/>
         </module>
-        <module name="SuppressWarningsHolder" />  <!-- Required for SuppressWarningsFilter -->
+        <module name="SuppressWarningsHolder"/>  <!-- Required for SuppressWarningsFilter -->
         <module name="TypeName"> <!-- Java Style Guide: Class names -->
             <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
-        <module name="UnnecessaryParentheses"/>
         <module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
             <property name="processJavadoc" value="true"/>
         </module>
@@ -372,6 +406,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -384,15 +419,14 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
-        <module name="DesignForExtension"/> <!-- Java Coding Guidelines: Design for extension -->
+        <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+        </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="99999999"/>
             <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
         <module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
@@ -416,10 +450,9 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
         <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>
diff --git a/.baseline/copyright/999_palantir.txt b/.baseline/copyright/999_palantir.txt
new file mode 100644
index 00000000..2f090b19
--- /dev/null
+++ b/.baseline/copyright/999_palantir.txt
@@ -0,0 +1 @@
+(c) Copyright ${today.year} Palantir Technologies Inc. All rights reserved.
diff --git a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
index f2990d96..cd9ac9c7 100644
--- a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.ondemandthreshold=999
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=999
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 54e7e9dd..f41e2b8a 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -16,7 +16,7 @@
         <option name="BINARY_OPERATION_WRAP" value="1" />
         <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
         <option name="CALL_PARAMETERS_WRAP" value="1" />
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
         <option name="DOWHILE_BRACE_FORCE" value="3" />
         <option name="EXTENDS_KEYWORD_WRAP" value="1" />
         <option name="EXTENDS_LIST_WRAP" value="1" />
@@ -30,9 +30,10 @@
             <package name="" static="false" withSubpackages="true" />
           </value>
         </option>
+        <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
         <GroovyCodeStyleSettings>
-          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-          <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+          <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
           <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
             <value />
           </option>
@@ -43,6 +44,18 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <DO_NOT_IMPORT_INNER>
+            <CLASS name="Builder" />
+            <CLASS name="Callback" />
+            <CLASS name="Class" />
+            <CLASS name="Entry" />
+            <CLASS name="Enum" />
+            <CLASS name="Factory" />
+            <CLASS name="Type" />
+            <CLASS name="Key" />
+            <CLASS name="Id" />
+            <CLASS name="Provider" />
+          </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>
         <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
         <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
@@ -50,11 +63,13 @@
         <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
         <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
         <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
         <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
         <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
         <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
         <option name="METHOD_PARAMETERS_WRAP" value="1" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
         <option name="OTHER_INDENT_OPTIONS">
           <value>
             <option name="INDENT_SIZE" value="4" />
@@ -66,7 +81,7 @@
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
             <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
-         </option>
+        </option>
         <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
           <value />
         </option>
@@ -84,31 +99,44 @@
           <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
           <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
           <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
           <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
           <option name="BINARY_OPERATION_WRAP" value="1" />
           <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="5" />
           <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="ENUM_CONSTANTS_WRAP" value="2" />
           <option name="EXTENDS_KEYWORD_WRAP" value="1" />
           <option name="EXTENDS_LIST_WRAP" value="1" />
           <option name="FIELD_ANNOTATION_WRAP" value="1" />
           <option name="FOR_BRACE_FORCE" value="3" />
           <option name="FOR_STATEMENT_WRAP" value="1" />
           <option name="IF_BRACE_FORCE" value="3" />
-          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
           <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
           <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
           <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
           <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+          <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
           <option name="RESOURCE_LIST_WRAP" value="5" />
+          <option name="RIGHT_MARGIN" value="120" />
           <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
           <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
           <option name="THROWS_KEYWORD_WRAP" value="1" />
           <option name="THROWS_LIST_WRAP" value="1" />
           <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="WRAP_ON_TYPING" value="1" />
           <arrangement>
             <rules>
               <section>
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index e69de29b..00000000
diff --git a/build.gradle b/build.gradle
index 123d987d..70e9445b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,10 +8,9 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.0.1'
-        classpath 'com.netflix.nebula:nebula-dependency-recommender:6.0.0'
-        classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'
         classpath 'com.palantir.gradle.docker:gradle-docker:0.12.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.20.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.76.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.28.0'
     }
 }
 
@@ -26,40 +25,18 @@ repositories {
     jcenter()
 }
 
+apply plugin: 'com.palantir.baseline'
+apply plugin: 'com.palantir.consistent-versions'
 apply plugin: 'com.palantir.external-publish'
-apply plugin: 'com.palantir.baseline-config'
-apply plugin: 'com.palantir.baseline-idea'
 apply plugin: 'org.inferred.processors'
 
-dependencies {
-    baseline 'com.palantir.baseline:gradle-baseline-java-config:0.20.1@zip'
-}
-
 allprojects {
-    apply plugin: 'nebula.dependency-recommender'
-    apply plugin: 'com.palantir.configuration-resolver'
-
     version gitVersion()
     group 'com.palantir.config.crypto'
-
-    dependencyRecommendations {
-        strategy OverrideTransitives
-        propertiesFile file: project.rootProject.file('version.props')
-    }
-
-    configurations.all {
-        resolutionStrategy {
-            failOnVersionConflict()
-        }
-    }
 }
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'com.palantir.baseline-checkstyle'
-    apply plugin: 'com.palantir.baseline-eclipse'
-    apply plugin: 'com.palantir.baseline-error-prone'
-    apply plugin: 'com.palantir.baseline-idea'
     apply plugin: 'org.inferred.processors'
     apply plugin: 'maven-publish'
 
@@ -69,19 +46,7 @@ subprojects {
         jcenter()
     }
 
-    javadoc {
-        classpath = sourceSets.main.compileClasspath + configurations.processor
-    }
-
     sourceCompatibility = 1.8
 
     tasks.check.dependsOn(javadoc)
-
-    compileJava {
-        options.compilerArgs += [
-            '-XepDisableWarningsInGeneratedCode',
-            '-Xep:OptionalEquality:WARN',
-            '-Werror' 
-        ]
-    }
 }
diff --git a/changelog/@unreleased/pr-201.v2.yml b/changelog/@unreleased/pr-201.v2.yml
new file mode 100644
index 00000000..d543a385
--- /dev/null
+++ b/changelog/@unreleased/pr-201.v2.yml
@@ -0,0 +1,5 @@
+type: break
+break:
+  description: The `encrypted-config-value-bundle` supporting the ancient Dropwizard 0.x is removed.
+  links:
+  - https://github.com/palantir/encrypted-config-value/pull/201
diff --git a/encrypted-config-value-bundle-dropwizard1/baseline-class-uniqueness.lock b/encrypted-config-value-bundle-dropwizard1/baseline-class-uniqueness.lock
new file mode 100644
index 00000000..a99bed56
--- /dev/null
+++ b/encrypted-config-value-bundle-dropwizard1/baseline-class-uniqueness.lock
@@ -0,0 +1,11 @@
+# Danger! Multiple jars contain identically named classes. This may cause different behaviour depending on classpath ordering.
+# Run ./gradlew checkClassUniqueness --write-locks to update this file
+
+## runtimeClasspath
+[javax.inject:javax.inject, org.glassfish.hk2.external:javax.inject]
+  - javax.inject.Inject
+  - javax.inject.Named
+  - javax.inject.Provider
+  - javax.inject.Qualifier
+  - javax.inject.Scope
+  - javax.inject.Singleton
diff --git a/encrypted-config-value-bundle-dropwizard1/build.gradle b/encrypted-config-value-bundle-dropwizard1/build.gradle
index 0b4afc52..6d270f01 100644
--- a/encrypted-config-value-bundle-dropwizard1/build.gradle
+++ b/encrypted-config-value-bundle-dropwizard1/build.gradle
@@ -1,23 +1,15 @@
 apply plugin: 'com.palantir.external-publish-jar'
 apply from: "${rootDir}/gradle/immutables-processors.gradle"
 
-dependencyRecommendations {
-    strategy OverrideTransitives
-    map recommendations: [
-        'com.fasterxml.jackson.core:*': '2.7.6',
-        'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml': '2.7.6'
-    ]
-}
-
 dependencies {
     compile project(':encrypted-config-value-module')
     compile 'com.google.guava:guava'
     compile 'com.fasterxml.jackson.core:jackson-databind'
-    compile 'io.dropwizard:dropwizard-core:1.0.0'
+    compile 'io.dropwizard:dropwizard-core'
 
     testCompile 'org.hamcrest:hamcrest-all'
     testCompile 'junit:junit'
-    testCompile 'io.dropwizard:dropwizard-testing:1.0.0'
+    testCompile 'io.dropwizard:dropwizard-testing'
 }
 
 tasks.check.dependsOn(javadoc)
diff --git a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
index 23d1c887..d402e916 100644
--- a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
+++ b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
@@ -28,28 +28,29 @@ public final class EncryptConfigValueCommand extends Command {
     public static final String KEYFILE = "keyfile";
     public static final String VALUE = "value";
 
-    protected EncryptConfigValueCommand() {
+    EncryptConfigValueCommand() {
         super("encrypt-config-value", "Encrypts a configuration value so it can be stored securely");
     }
 
     @Override
     public void configure(Subparser subparser) {
         subparser.addArgument("-k", "--keyfile")
-            .required(false)
-            .type(String.class)
-            .dest(KEYFILE)
-            .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
-            .help("The location of the (public) key file");
+                .required(false)
+                .type(String.class)
+                .dest(KEYFILE)
+                .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
+                .help("The location of the (public) key file");
 
         subparser.addArgument("-v", "--value")
-            .required(true)
-            .type(String.class)
-            .dest(VALUE)
-            .help("The value to encrypt");
+                .required(true)
+                .type(String.class)
+                .dest(VALUE)
+                .help("The value to encrypt");
     }
 
     @Override
-    public void run(Bootstrap<?> bootstrap, Namespace namespace) throws Exception {
+    @SuppressWarnings("BanSystemOut")
+    public void run(Bootstrap<?> _bootstrap, Namespace namespace) throws Exception {
         String keyfile = namespace.getString(KEYFILE);
         String value = namespace.getString(VALUE);
 
diff --git a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
index 449b40b8..c894376f 100644
--- a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
+++ b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
@@ -41,6 +41,6 @@ public void initialize(Bootstrap<?> bootstrap) {
     }
 
     @Override
-    public void run(Environment environment) {}
+    public void run(Environment _environment) {}
 
 }
diff --git a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
index c10321c4..1fae6a70 100644
--- a/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
+++ b/encrypted-config-value-bundle-dropwizard1/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
@@ -29,28 +29,29 @@ public final class GenerateKeyCommand extends Command {
     public static final String FILE = "file";
     public static final String ALGORITHM = "algorithm";
 
-    protected GenerateKeyCommand() {
+    GenerateKeyCommand() {
         super("generate-random-key", "Generates a random key for encrypting config values");
     }
 
     @Override
     public void configure(Subparser subparser) {
         subparser.addArgument("-a", "--algorithm")
-            .required(true)
-            .type(String.class)
-            .dest(ALGORITHM)
-            .help("The algorithm to use (see https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#KeyGenerator for a list of valid algorithms)");
+                .required(true)
+                .type(String.class)
+                .dest(ALGORITHM)
+                .help("The algorithm to use (see https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#KeyGenerator for a list of valid algorithms)");
 
         subparser.addArgument("-f", "--file")
-            .required(false)
-            .type(String.class)
-            .dest(FILE)
-            .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
-            .help("The location to write the key");
+                .required(false)
+                .type(String.class)
+                .dest(FILE)
+                .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
+                .help("The location to write the key");
     }
 
     @Override
-    public void run(Bootstrap<?> bootstrap, Namespace namespace) throws Exception {
+    @SuppressWarnings("BanSystemOut")
+    public void run(Bootstrap<?> _bootstrap, Namespace namespace) throws Exception {
         String algorithmType = namespace.getString(ALGORITHM);
         String file = namespace.getString(FILE);
         Path path = Paths.get(file);
diff --git a/encrypted-config-value-bundle-dropwizard1/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java b/encrypted-config-value-bundle-dropwizard1/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
index fac00f29..d7d4f630 100644
--- a/encrypted-config-value-bundle-dropwizard1/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
+++ b/encrypted-config-value-bundle-dropwizard1/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
@@ -64,7 +64,7 @@ public void initialize(Bootstrap<TestConfig> bootstrap) {
         }
 
         @Override
-        public void run(TestConfig configuration, Environment environment) throws Exception {}
+        public void run(TestConfig _configuration, Environment _environment) throws Exception {}
     }
 
 }
diff --git a/encrypted-config-value-bundle/build.gradle b/encrypted-config-value-bundle/build.gradle
deleted file mode 100644
index fa479e9c..00000000
--- a/encrypted-config-value-bundle/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-apply plugin: 'com.palantir.external-publish-jar'
-apply from: "${rootDir}/gradle/immutables-processors.gradle"
-
-dependencies {
-    compile project(':encrypted-config-value-module')
-    compile 'com.google.guava:guava'
-    compile 'com.fasterxml.jackson.core:jackson-databind'
-    compile 'io.dropwizard:dropwizard-core'
-
-    testCompile 'io.dropwizard:dropwizard-testing'
-    testCompile 'org.hamcrest:hamcrest-all'
-    testCompile 'junit:junit'
-    testCompile 'org.mockito:mockito-core'
-}
-
-tasks.check.dependsOn(javadoc)
diff --git a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/ConfigurationDecryptionException.java b/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/ConfigurationDecryptionException.java
deleted file mode 100644
index 0553be61..00000000
--- a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/ConfigurationDecryptionException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import io.dropwizard.configuration.ConfigurationException;
-import java.util.Collection;
-
-public class ConfigurationDecryptionException extends ConfigurationException {
-    private static final long serialVersionUID = 1L;
-
-    public ConfigurationDecryptionException(String path, Collection<String> errors, Throwable cause) {
-        super(path, errors, cause);
-    }
-}
diff --git a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java b/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
deleted file mode 100644
index 6cf186b3..00000000
--- a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptConfigValueCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import com.palantir.config.crypto.algorithm.Encrypter;
-import io.dropwizard.cli.Command;
-import io.dropwizard.setup.Bootstrap;
-import java.nio.file.Paths;
-import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-
-public final class EncryptConfigValueCommand extends Command {
-
-    public static final String KEYFILE = "keyfile";
-    public static final String VALUE = "value";
-
-    protected EncryptConfigValueCommand() {
-        super("encrypt-config-value", "Encrypts a configuration value so it can be stored securely");
-    }
-
-    @Override
-    public void configure(Subparser subparser) {
-        subparser.addArgument("-k", "--keyfile")
-            .required(false)
-            .type(String.class)
-            .dest(KEYFILE)
-            .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
-            .help("The location of the (public) key file");
-
-        subparser.addArgument("-v", "--value")
-            .required(true)
-            .type(String.class)
-            .dest(VALUE)
-            .help("The value to encrypt");
-    }
-
-    @Override
-    public void run(Bootstrap<?> bootstrap, Namespace namespace) throws Exception {
-        String keyfile = namespace.getString(KEYFILE);
-        String value = namespace.getString(VALUE);
-
-        KeyWithType keyWithType = KeyFileUtils.keyWithTypeFromPath(Paths.get(keyfile));
-        Encrypter encrypter = keyWithType.getType().getAlgorithm().newEncrypter();
-
-        EncryptedValue encryptedValue = encrypter.encrypt(keyWithType, value);
-
-        // print the resulting encrypted value to the console
-        System.out.println(encryptedValue);
-    }
-}
diff --git a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java b/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
deleted file mode 100644
index 449b40b8..00000000
--- a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/EncryptedConfigValueBundle.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.palantir.config.crypto.jackson.JsonNodeStringReplacer;
-import com.palantir.config.crypto.jackson.JsonNodeVisitor;
-import io.dropwizard.Bundle;
-import io.dropwizard.Configuration;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-
-public final class EncryptedConfigValueBundle implements Bundle {
-
-    // Generically capture configuration type T from Bootstrap<T>, though we don't actually care about it
-    private static <T extends Configuration> void setConfigurationFactoryFactory(
-            Bootstrap<T> bootstrap,
-            final JsonNodeVisitor<JsonNode> replacer) {
-        bootstrap.setConfigurationFactoryFactory(new SubstitutingConfigurationFactory.Factory<T>(replacer));
-    }
-
-    @Override
-    public void initialize(Bootstrap<?> bootstrap) {
-        bootstrap.addCommand(new GenerateKeyCommand());
-        bootstrap.addCommand(new EncryptConfigValueCommand());
-        setConfigurationFactoryFactory(bootstrap, new JsonNodeStringReplacer(new DecryptingVariableSubstitutor()));
-    }
-
-    @Override
-    public void run(Environment environment) {}
-
-}
diff --git a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java b/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
deleted file mode 100644
index e4ce7988..00000000
--- a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/GenerateKeyCommand.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import com.palantir.config.crypto.algorithm.Algorithm;
-import io.dropwizard.cli.Command;
-import io.dropwizard.setup.Bootstrap;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import net.sourceforge.argparse4j.inf.Namespace;
-import net.sourceforge.argparse4j.inf.Subparser;
-
-public final class GenerateKeyCommand extends Command {
-
-    public static final String FILE = "file";
-    public static final String ALGORITHM = "algorithm";
-
-    protected GenerateKeyCommand() {
-        super("generate-random-key", "Generates a random key for encrypting config values");
-    }
-
-    @Override
-    public void configure(Subparser subparser) {
-        subparser.addArgument("-a", "--algorithm")
-            .required(true)
-            .type(String.class)
-            .dest(ALGORITHM)
-            .help("The algorithm to use. Supported values: " + Arrays.toString(Algorithm.values()));
-
-        subparser.addArgument("-f", "--file")
-            .required(false)
-            .type(String.class)
-            .dest(FILE)
-            .setDefault(KeyFileUtils.DEFAULT_PUBLIC_KEY_PATH)
-            .help("The location to write the key");
-    }
-
-    @Override
-    public void run(Bootstrap<?> bootstrap, Namespace namespace) throws Exception {
-        String algorithmType = namespace.getString(ALGORITHM);
-        String file = namespace.getString(FILE);
-        Path path = Paths.get(file);
-
-        Algorithm algorithm = Algorithm.valueOf(algorithmType);
-        KeyPair keyPair = algorithm.newKeyPair();
-        KeyPairFiles keyPairFiles = KeyFileUtils.keyPairToFile(keyPair, path);
-
-        // print to console, notifying that we did something
-        System.out.println("Wrote key to " + path);
-        if (!keyPairFiles.pathsEqual()) {
-            System.out.println("Wrote private key to " + keyPairFiles.decryptionKeyFile());
-        }
-    }
-
-}
diff --git a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/SubstitutingConfigurationFactory.java b/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/SubstitutingConfigurationFactory.java
deleted file mode 100644
index 0809cf87..00000000
--- a/encrypted-config-value-bundle/src/main/java/com/palantir/config/crypto/SubstitutingConfigurationFactory.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * This file was derived from io.dropwizard.configuration.SubstitutingSourceProvider
- * https://github.com/dropwizard/dropwizard/blob/2183fd25d60f7f6da8ab3994ac27d8923098fd57/dropwizard-configuration/src/main/java/io/dropwizard/configuration/SubstitutingSourceProvider.java
- *
- * The original file is
- * Copyright 2010-2013 Coda Hale and Yammer, Inc., 2014-2015 Dropwizard Team
- * Licensed under the Apache License, Version 2.0
- *
- * The modifications to the original file are
- *  - make the class final (to pass checkstyle)
- *  - switch from Objects.requireNotNull to using Preconditions.checkNotNull
- */
-
-package com.palantir.config.crypto;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableList;
-import com.palantir.config.crypto.jackson.JsonNodeVisitor;
-import com.palantir.config.crypto.jackson.JsonNodeVisitors;
-import com.palantir.config.crypto.util.StringSubstitutionException;
-import io.dropwizard.configuration.ConfigurationException;
-import io.dropwizard.configuration.ConfigurationFactory;
-import io.dropwizard.configuration.ConfigurationFactoryFactory;
-import java.io.IOException;
-import javax.validation.Validator;
-
-/**
- * A {@link ConfigurationFactory} subclass which filters parsed JSON through a
- * {@link JsonNodeVisitor} before additional parsing.
- *
- * @param <T> the type of the configuration objects to produce
- */
-public final class SubstitutingConfigurationFactory<T> extends ConfigurationFactory<T> {
-    private final JsonNodeVisitor<JsonNode> substitutor;
-
-    /**
-     * Creates a new configuration factory for the given class.
-     *
-     * @param klass the configuration class
-     * @param validator the validator to use
-     * @param objectMapper the Jackson {@link ObjectMapper} to use
-     * @param propertyPrefix the system property name prefix used by overrides
-     * @param substitutor The custom {@link JsonNodeVisitor} implementation.
-     */
-    public SubstitutingConfigurationFactory(Class<T> klass,
-            Validator validator,
-            ObjectMapper objectMapper,
-            String propertyPrefix,
-            JsonNodeVisitor<JsonNode> substitutor) {
-        super(klass, validator, objectMapper, propertyPrefix);
-        this.substitutor = substitutor;
-    }
-
-    @Override
-    protected T build(JsonNode node, String path) throws IOException, ConfigurationException {
-        try {
-            JsonNode substitutedNode = JsonNodeVisitors.dispatch(node, substitutor);
-            return super.build(substitutedNode, path);
-        } catch (StringSubstitutionException e) {
-            String error = String.format(
-                    "The value '%s' for field '%s' could not be replaced with its unencrypted value",
-                    e.getValue(),
-                    e.getField());
-            String underlyingError = String.format("Underlying error - %s", e.getMessage());
-            throw new ConfigurationDecryptionException(path, ImmutableList.of(error, underlyingError), e);
-        }
-    }
-
-    /**
-     * A {@link ConfigurationFactoryFactory} which returns {@link SubstitutingConfigurationFactory}.
-     *
-     * @param <T> the type of the configuration objects to produce
-     */
-    public static final class Factory<T> implements ConfigurationFactoryFactory<T> {
-
-        private final JsonNodeVisitor<JsonNode> substitutor;
-
-        public Factory(JsonNodeVisitor<JsonNode> substitutor) {
-            this.substitutor = substitutor;
-        }
-
-        @Override
-        public ConfigurationFactory<T> create(Class<T> klass,
-                Validator validator,
-                ObjectMapper objectMapper,
-                String propertyPrefix) {
-            return new SubstitutingConfigurationFactory<>(klass, validator, objectMapper, propertyPrefix, substitutor);
-        }
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/EncryptConfigValueCommandTest.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/EncryptConfigValueCommandTest.java
deleted file mode 100644
index badd5094..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/EncryptConfigValueCommandTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import com.google.common.collect.ImmutableMap;
-import com.palantir.config.crypto.algorithm.Algorithm;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import net.sourceforge.argparse4j.inf.Namespace;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public final class EncryptConfigValueCommandTest {
-    private static final String CHARSET = "UTF8";
-    private static final String plaintext = "this is a secret message";
-
-    private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
-    private final EncryptConfigValueCommand command = new EncryptConfigValueCommand();
-
-    private PrintStream originalSystemOut;
-
-    @Before
-    public void setUpStreams() throws UnsupportedEncodingException {
-        originalSystemOut = System.out;
-        System.setOut(new PrintStream(outContent, false, CHARSET));
-    }
-
-    @After
-    public void cleanUpStreams() {
-        System.setOut(originalSystemOut);
-    }
-
-    private void weEncryptAndPrintAValue(Algorithm algorithm) throws Exception {
-        Path tempFilePath = Files.createTempDirectory("temp-key-directory").resolve("test.key");
-
-        KeyPair keyPair = algorithm.newKeyPair();
-        KeyFileUtils.keyPairToFile(keyPair, tempFilePath);
-
-        Namespace namespace = new Namespace(ImmutableMap.of(
-                EncryptConfigValueCommand.KEYFILE, tempFilePath.toString(),
-                EncryptConfigValueCommand.VALUE, plaintext));
-
-        command.run(null, namespace);
-
-        String output = outContent.toString(CHARSET).trim();
-
-        EncryptedValue configValue = EncryptedValue.fromString(output);
-        KeyWithType decryptionKey = keyPair.decryptionKey();
-        String decryptedValue = configValue.decrypt(decryptionKey);
-
-        assertThat(decryptedValue, is(plaintext));
-    }
-
-    @Test
-    public void weEncryptAndPrintAValueUsingAes() throws Exception {
-        weEncryptAndPrintAValue(Algorithm.AES);
-    }
-
-    @Test
-    public void weEncryptAndPrintAValueUsingRsa() throws Exception {
-        weEncryptAndPrintAValue(Algorithm.RSA);
-    }
-
-    @Test(expected = NoSuchFileException.class)
-    public void weFailIfTheKeyfileDoesNotExist() throws Exception {
-        Path tempFilePath = Files.createTempDirectory("temp-key-directory").resolve("test.key");
-
-        Namespace namespace = new Namespace(ImmutableMap.of(
-                EncryptConfigValueCommand.KEYFILE, tempFilePath.toString(),
-                EncryptConfigValueCommand.VALUE, plaintext));
-
-        command.run(null, namespace);
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/GenerateKeyCommandTest.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/GenerateKeyCommandTest.java
deleted file mode 100644
index 11553e30..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/GenerateKeyCommandTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import com.google.common.collect.ImmutableMap;
-import com.palantir.config.crypto.algorithm.Algorithm;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import net.sourceforge.argparse4j.inf.Namespace;
-import org.junit.Test;
-
-public final class GenerateKeyCommandTest {
-    private final GenerateKeyCommand command = new GenerateKeyCommand();
-
-    private void weGenerateAValidKey(Algorithm algorithm) throws Exception {
-        Path tempFilePath = Files.createTempDirectory("temp-key-directory").resolve("test.key");
-
-        Namespace namespace = new Namespace(ImmutableMap.of(
-                GenerateKeyCommand.ALGORITHM, algorithm.toString(),
-                GenerateKeyCommand.FILE, tempFilePath.toString()));
-
-        command.run(null, namespace);
-
-        KeyPair keyPair = KeyFileUtils.keyPairFromPath(tempFilePath);
-        assertThat(keyPair.encryptionKey().getType().getAlgorithm(), is(algorithm));
-    }
-
-    @Test
-    public void weGenerateAValidRsaKey() throws Exception {
-        weGenerateAValidKey(Algorithm.RSA);
-    }
-
-    @Test
-    public void weGenerateAValidAesKey() throws Exception {
-        weGenerateAValidKey(Algorithm.AES);
-    }
-
-    @Test(expected = FileAlreadyExistsException.class)
-    public void weDoNotOverwriteAnExistingKeyfile() throws Exception {
-        Path tempFilePath = Files.createTempDirectory("temp-key-directory").resolve("test.key");
-        String algorithm = "AES";
-
-        // create the file
-        Files.createFile(tempFilePath);
-
-        Namespace namespace = new Namespace(ImmutableMap.of(
-                GenerateKeyCommand.ALGORITHM, algorithm,
-                GenerateKeyCommand.FILE, tempFilePath.toString()));
-
-        command.run(null, namespace);
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/SubstitutingConfigurationFactoryTest.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/SubstitutingConfigurationFactoryTest.java
deleted file mode 100644
index b7624a98..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/SubstitutingConfigurationFactoryTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
-
-import com.palantir.config.crypto.jackson.JsonNodeStringReplacer;
-import com.palantir.config.crypto.util.Person;
-import com.palantir.config.crypto.util.TestConfig;
-import io.dropwizard.configuration.ConfigurationException;
-import io.dropwizard.jackson.Jackson;
-import io.dropwizard.jersey.validation.Validators;
-import java.io.File;
-import java.io.IOException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class SubstitutingConfigurationFactoryTest {
-    private static String previousProperty;
-    private static SubstitutingConfigurationFactory<TestConfig> factory;
-
-    @BeforeClass
-    public static void before() throws IOException {
-        previousProperty = System.getProperty(KeyFileUtils.KEY_PATH_PROPERTY);
-        System.setProperty(KeyFileUtils.KEY_PATH_PROPERTY, "src/test/resources/test.key");
-
-        factory = new SubstitutingConfigurationFactory(
-                TestConfig.class,
-                Validators.newValidator(),
-                Jackson.newObjectMapper(),
-                "",
-                new JsonNodeStringReplacer(new DecryptingVariableSubstitutor()));
-    }
-
-    @AfterClass
-    public static void after() {
-        if (previousProperty != null) {
-            System.setProperty(KeyFileUtils.KEY_PATH_PROPERTY, previousProperty);
-        }
-    }
-
-    @Test
-    public final void decryptionSucceeds() throws IOException, ConfigurationException {
-        TestConfig config = factory.build(new File("src/test/resources/testConfig.yml"));
-
-        assertThat(config.getEncrypted()).isEqualTo("value");
-        assertThat(config.getUnencrypted()).isEqualTo("value");
-        assertThat(config.getEncryptedWithSingleQuote()).isEqualTo("don't use quotes");
-        assertThat(config.getEncryptedWithDoubleQuote()).isEqualTo("double quote is \"");
-        assertThat(config.getEncryptedMalformedYaml()).isEqualTo("[oh dear");
-        assertThat(config.getArrayWithSomeEncryptedValues())
-                .containsExactly("value", "value", "other value", "[oh dear");
-        assertThat(config.getPojoWithEncryptedValues()).isEqualTo(Person.of("some-user", "value"));
-    }
-
-    @Test
-    public final void decryptionFailsWithNiceMessage() throws IOException, ConfigurationException {
-        try {
-            factory.build(new File("src/test/resources/testConfigWithError.yml"));
-            failBecauseExceptionWasNotThrown(ConfigurationDecryptionException.class);
-        } catch (ConfigurationDecryptionException e) {
-            assertThat(e.getMessage()).contains("src/test/resources/testConfigWithError.yml has the following errors");
-            assertThat(e.getMessage()).contains(
-                    "The value 'enc:ERROR' for field 'arrayWithSomeEncryptedValues[3]' could not be replaced "
-                    + "with its unencrypted value");
-            assertThat(e.getMessage()).contains(
-                    "Underlying error - ");
-        }
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
deleted file mode 100644
index fac00f29..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/VariableSubstitutionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto;
-
-import static org.hamcrest.Matchers.both;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import com.palantir.config.crypto.util.TestConfig;
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import io.dropwizard.testing.junit.DropwizardAppRule;
-import java.io.IOException;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-public final class VariableSubstitutionTest {
-
-    static {
-        System.setProperty(KeyFileUtils.KEY_PATH_PROPERTY, "src/test/resources/test.key");
-    }
-
-    @ClassRule
-    public static final DropwizardAppRule<TestConfig> RULE =
-            new DropwizardAppRule(TestApplication.class, "src/test/resources/testConfig.yml");
-
-    @Test
-    public void testCanDecryptValueInConfig() throws IOException {
-        assertEquals("value", RULE.getConfiguration().getUnencrypted());
-        assertEquals("value", RULE.getConfiguration().getEncrypted());
-        assertEquals("don't use quotes", RULE.getConfiguration().getEncryptedWithSingleQuote());
-        assertEquals("double quote is \"", RULE.getConfiguration().getEncryptedWithDoubleQuote());
-        assertEquals("[oh dear", RULE.getConfiguration().getEncryptedMalformedYaml());
-
-        assertThat(RULE.getConfiguration().getArrayWithSomeEncryptedValues(),
-                contains("value", "value", "other value", "[oh dear"));
-        assertThat(RULE.getConfiguration().getPojoWithEncryptedValues(),
-                both(hasProperty("username", equalTo("some-user")))
-                .and(hasProperty("password", equalTo("value"))));
-    }
-
-    public static final class TestApplication extends Application<TestConfig> {
-        @Override
-        public void initialize(Bootstrap<TestConfig> bootstrap) {
-            bootstrap.addBundle(new EncryptedConfigValueBundle());
-        }
-
-        @Override
-        public void run(TestConfig configuration, Environment environment) throws Exception {}
-    }
-
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/jackson/JsonNodeStringReplacerTest.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/jackson/JsonNodeStringReplacerTest.java
deleted file mode 100644
index 6982ac5e..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/jackson/JsonNodeStringReplacerTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto.jackson;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.BinaryNode;
-import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.fasterxml.jackson.databind.node.IntNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.MissingNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.NumericNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.POJONode;
-import com.fasterxml.jackson.databind.node.TextNode;
-import com.google.common.collect.ImmutableMap;
-import com.palantir.config.crypto.util.StringSubstitutionException;
-import org.apache.commons.lang3.text.StrSubstitutor;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class JsonNodeStringReplacerTest {
-    @Mock
-    private StrSubstitutor strSubstitutor;
-    @Mock
-    private Throwable cause;
-
-    private JsonNodeStringReplacer jsonNodeStringReplacer;
-
-    @Before
-    public final void before() {
-        jsonNodeStringReplacer = new JsonNodeStringReplacer(strSubstitutor);
-    }
-
-    @Test
-    public final void visitTextDelegatesToStrSubstitutor() {
-        TextNode textNode = new TextNode("abc");
-        when(strSubstitutor.replace("abc")).thenReturn("def");
-        assertThat(jsonNodeStringReplacer.visitText(textNode)).isEqualTo(new TextNode("def"));
-    }
-
-    @Test
-    public final void visitArrayDispatchesToChildren() {
-        ArrayNode arrayNode = new ArrayNode(JsonNodeFactory.instance);
-        arrayNode.add("abc");
-        arrayNode.add(1);
-
-        when(strSubstitutor.replace("abc")).thenReturn("def");
-
-        ArrayNode expected = new ArrayNode(JsonNodeFactory.instance);
-        expected.add("def");
-        expected.add(1);
-
-        assertThat(jsonNodeStringReplacer.visitArray(arrayNode)).isEqualTo(expected);
-    }
-
-    @Test
-    public final void visitArrayExtendsStringSubstitutionException() {
-        ArrayNode arrayNode = new ArrayNode(JsonNodeFactory.instance);
-        arrayNode.add(1);
-        arrayNode.add(2);
-        arrayNode.add(new ObjectNode(
-                JsonNodeFactory.instance,
-                ImmutableMap.<String, JsonNode>of("key", new TextNode("abc"))));
-        arrayNode.add(4);
-
-        doThrow(new StringSubstitutionException(cause, "abc")).when(strSubstitutor).replace("abc");
-
-        try {
-            jsonNodeStringReplacer.visitArray(arrayNode);
-            failBecauseExceptionWasNotThrown(StringSubstitutionException.class);
-        } catch (StringSubstitutionException e) {
-            assertThat(e.getValue()).isEqualTo("abc");
-            assertThat(e.getField()).isEqualTo("[2].key");
-        }
-    }
-
-    @Test
-    public final void visitObjectDispatchesToChildren() {
-        ObjectNode objectNode = new ObjectNode(
-                JsonNodeFactory.instance,
-                ImmutableMap.<String, JsonNode>of(
-                        "key1", new TextNode("abc"),
-                        "key2", new IntNode(1)));
-
-        when(strSubstitutor.replace("abc")).thenReturn("def");
-
-        ObjectNode expected = new ObjectNode(
-                JsonNodeFactory.instance,
-                ImmutableMap.<String, JsonNode>of(
-                        "key1", new TextNode("def"),
-                        "key2", new IntNode(1)));
-
-        assertThat(jsonNodeStringReplacer.visitObject(objectNode)).isEqualTo(expected);
-    }
-
-    @Test
-    public final void visitObjectExtendsStringSubstitutionException() {
-        ArrayNode arrayNode = new ArrayNode(JsonNodeFactory.instance);
-        arrayNode.add(1);
-        arrayNode.add(2);
-        arrayNode.add(new ObjectNode(
-                JsonNodeFactory.instance,
-                ImmutableMap.<String, JsonNode>of("key", new TextNode("abc"))));
-        arrayNode.add(4);
-
-        ObjectNode objectNode = new ObjectNode(
-                JsonNodeFactory.instance,
-                ImmutableMap.<String, JsonNode>of(
-                        "key1", new IntNode(1),
-                        "key2", arrayNode));
-
-        doThrow(new StringSubstitutionException(cause, "abc")).when(strSubstitutor).replace("abc");
-
-        try {
-            jsonNodeStringReplacer.visitObject(objectNode);
-            failBecauseExceptionWasNotThrown(StringSubstitutionException.class);
-        } catch (StringSubstitutionException e) {
-            assertThat(e.getValue()).isEqualTo("abc");
-            assertThat(e.getField()).isEqualTo("key2[2].key");
-        }
-    }
-
-    @Test
-    public final void visitBinaryPassesThrough() {
-        BinaryNode binaryNode = mock(BinaryNode.class);
-        assertThat(jsonNodeStringReplacer.visitBinary(binaryNode)).isEqualTo(binaryNode);
-    }
-
-    @Test
-    public final void visitBooleanPassesThrough() {
-        BooleanNode booleanNode = mock(BooleanNode.class);
-        assertThat(jsonNodeStringReplacer.visitBoolean(booleanNode)).isEqualTo(booleanNode);
-    }
-
-    @Test
-    public final void visitNumericPassesThrough() {
-        NumericNode numericNode = mock(NumericNode.class);
-        assertThat(jsonNodeStringReplacer.visitNumeric(numericNode)).isEqualTo(numericNode);
-    }
-
-    @Test
-    public final void visitPojoPassesThrough() {
-        POJONode pojoNode = mock(POJONode.class);
-        assertThat(jsonNodeStringReplacer.visitPojo(pojoNode)).isEqualTo(pojoNode);
-    }
-
-    @Test
-    public final void visitNullReturnsNullNodeInstance() {
-        assertThat(jsonNodeStringReplacer.visitNull()).isEqualTo(NullNode.getInstance());
-    }
-
-    @Test
-    public final void visitMissingReturnsMissingNodeInstance() {
-        assertThat(jsonNodeStringReplacer.visitMissing()).isEqualTo(MissingNode.getInstance());
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/Person.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/Person.java
deleted file mode 100644
index 600dafa8..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/Person.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto.util;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@JsonSerialize(as = ImmutablePerson.class)
-@JsonDeserialize(as = ImmutablePerson.class)
-public abstract class Person {
-    @Value.Parameter
-    public abstract String getUsername();
-
-    @Value.Parameter
-    public abstract String getPassword();
-
-    public static Person of(String username, String password) {
-        return ImmutablePerson.of(username, password);
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/TestConfig.java b/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/TestConfig.java
deleted file mode 100644
index 215df961..00000000
--- a/encrypted-config-value-bundle/src/test/java/com/palantir/config/crypto/util/TestConfig.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.config.crypto.util;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.dropwizard.Configuration;
-import java.util.List;
-
-public final class TestConfig extends Configuration {
-    private final String unencrypted;
-    private final String encrypted;
-    private final String encryptedWithSingleQuote;
-    private final String encryptedWithDoubleQuote;
-    private final String encryptedMalformedYaml;
-    private final List<String> arrayWithSomeEncryptedValues;
-    private final Person pojoWithEncryptedValues;
-
-    public TestConfig(
-            @JsonProperty("unencrypted") String unencrypted,
-            @JsonProperty("encrypted") String encrypted,
-            @JsonProperty("encryptedWithSingleQuote") String encryptedWithSingleQuote,
-            @JsonProperty("encryptedWithDoubleQuote") String encryptedWithDoubleQuote,
-            @JsonProperty("encryptedMalformedYaml") String encryptedMalformedYaml,
-            @JsonProperty("arrayWithSomeEncryptedValues") List<String> arrayWithSomeEncryptedValues,
-            @JsonProperty("pojoWithEncryptedValues") Person pojoWithEncryptedValues) {
-        this.unencrypted = unencrypted;
-        this.encrypted = encrypted;
-        this.encryptedWithSingleQuote = encryptedWithSingleQuote;
-        this.encryptedWithDoubleQuote = encryptedWithDoubleQuote;
-        this.encryptedMalformedYaml = encryptedMalformedYaml;
-        this.arrayWithSomeEncryptedValues = arrayWithSomeEncryptedValues;
-        this.pojoWithEncryptedValues = pojoWithEncryptedValues;
-    }
-
-    public String getUnencrypted() {
-        return unencrypted;
-    }
-
-    public String getEncrypted() {
-        return encrypted;
-    }
-
-    public String getEncryptedWithSingleQuote() {
-        return encryptedWithSingleQuote;
-    }
-
-    public String getEncryptedWithDoubleQuote() {
-        return encryptedWithDoubleQuote;
-    }
-
-    public String getEncryptedMalformedYaml() {
-        return encryptedMalformedYaml;
-    }
-
-    public List<String> getArrayWithSomeEncryptedValues() {
-        return arrayWithSomeEncryptedValues;
-    }
-
-    public Person getPojoWithEncryptedValues() {
-        return pojoWithEncryptedValues;
-    }
-}
diff --git a/encrypted-config-value-bundle/src/test/resources/test.key b/encrypted-config-value-bundle/src/test/resources/test.key
deleted file mode 100644
index 2de683b9..00000000
--- a/encrypted-config-value-bundle/src/test/resources/test.key
+++ /dev/null
@@ -1 +0,0 @@
-AES:vgwWG0UUo39Hhfru2dD7Nw==
\ No newline at end of file
diff --git a/encrypted-config-value-bundle/src/test/resources/testConfig.yml b/encrypted-config-value-bundle/src/test/resources/testConfig.yml
deleted file mode 100644
index af36e310..00000000
--- a/encrypted-config-value-bundle/src/test/resources/testConfig.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-unencrypted: value
-encrypted: ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
-encryptedWithSingleQuote: ${enc:NcsMVEFTDL7mpCDlHe3aMPriDohAnTbmy/Eh3Ix2KC1hibsuFYFuU0X7a9CqAiLZHCGfAth0i8kzBOji7yRxpQ==}
-encryptedWithDoubleQuote: ${enc:CfaCBbD7T1rcTe0LhLt34n77pHwx8R4IPx5XoPDcJirRqRMfsrc/ngd+vd5AJItNu56UQagYnVqHuRWZIhGC0s4=}
-encryptedMalformedYaml: ${enc:edhPbHr7h2sFrTiCBzOpltIKDboXHqiEhsLSeYAdmxGJdXe+safSnDmZxCLQm5tADUkYgWZqHF8=}
-arrayWithSomeEncryptedValues:
-  - ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
-  - value
-  - other value
-  - ${enc:edhPbHr7h2sFrTiCBzOpltIKDboXHqiEhsLSeYAdmxGJdXe+safSnDmZxCLQm5tADUkYgWZqHF8=}
-pojoWithEncryptedValues:
-  username: some-user
-  password: ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
diff --git a/encrypted-config-value-bundle/src/test/resources/testConfigWithError.yml b/encrypted-config-value-bundle/src/test/resources/testConfigWithError.yml
deleted file mode 100644
index 267d59c5..00000000
--- a/encrypted-config-value-bundle/src/test/resources/testConfigWithError.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-unencrypted: value
-encrypted: ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
-encryptedWithSingleQuote: ${enc:NcsMVEFTDL7mpCDlHe3aMPriDohAnTbmy/Eh3Ix2KC1hibsuFYFuU0X7a9CqAiLZHCGfAth0i8kzBOji7yRxpQ==}
-encryptedWithDoubleQuote: ${enc:CfaCBbD7T1rcTe0LhLt34n77pHwx8R4IPx5XoPDcJirRqRMfsrc/ngd+vd5AJItNu56UQagYnVqHuRWZIhGC0s4=}
-encryptedMalformedYaml: ${enc:edhPbHr7h2sFrTiCBzOpltIKDboXHqiEhsLSeYAdmxGJdXe+safSnDmZxCLQm5tADUkYgWZqHF8=}
-arrayWithSomeEncryptedValues:
-  - ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
-  - value
-  - other value
-  - ${enc:ERROR}
-pojoWithEncryptedValues:
-  username: some-user
-  password: ${enc:INNv4cGkVF45MLWZhgVZdIsgQ4zKvbMoJ978Es3MIKgrtz5eeTuOCLM1vPbQm97ejz2EK6M=}
diff --git a/encrypted-config-value/src/main/java/com/palantir/config/crypto/algorithm/rsa/RsaOaepEncrypter.java b/encrypted-config-value/src/main/java/com/palantir/config/crypto/algorithm/rsa/RsaOaepEncrypter.java
index ff9803d9..961ea151 100644
--- a/encrypted-config-value/src/main/java/com/palantir/config/crypto/algorithm/rsa/RsaOaepEncrypter.java
+++ b/encrypted-config-value/src/main/java/com/palantir/config/crypto/algorithm/rsa/RsaOaepEncrypter.java
@@ -66,7 +66,7 @@ public final EncryptedValue encrypt(KeyWithType kwt, final String plaintext) {
             OAEPParameterSpec oaepParams = new OAEPParameterSpec(OAEP_HASH_ALG.toString(), "MGF1",
                     new MGF1ParameterSpec(
                             MDF1_HASH_ALG.toString()), PSource.PSpecified.DEFAULT);
-            cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, publicKey, oaepParams);
+            cipher.init(Cipher.ENCRYPT_MODE, publicKey, oaepParams);
             byte[] encrypted = cipher.doFinal(plaintext.getBytes(StandardCharsets.UTF_8));
 
             return ImmutableRsaEncryptedValue.builder()
diff --git a/encrypted-config-value/src/test/java/com/palantir/config/crypto/AlgorithmTest.java b/encrypted-config-value/src/test/java/com/palantir/config/crypto/AlgorithmTest.java
index eec30286..af86702b 100644
--- a/encrypted-config-value/src/test/java/com/palantir/config/crypto/AlgorithmTest.java
+++ b/encrypted-config-value/src/test/java/com/palantir/config/crypto/AlgorithmTest.java
@@ -35,7 +35,7 @@ public final class AlgorithmTest {
 
     private final Algorithm algorithm;
 
-    public AlgorithmTest(String name, Algorithm algorithm) {
+    public AlgorithmTest(String _name, Algorithm algorithm) {
         this.algorithm = algorithm;
     }
 
diff --git a/gradle/immutables-processors.gradle b/gradle/immutables-processors.gradle
index f1c72f31..93389e96 100644
--- a/gradle/immutables-processors.gradle
+++ b/gradle/immutables-processors.gradle
@@ -4,6 +4,8 @@ apply plugin: 'org.inferred.processors'
 
 dependencies {
     compileOnly "org.immutables:value::annotations"
+    annotationProcessor 'org.immutables:value'
 
-    processor 'org.immutables:value'
+    testCompileOnly "org.immutables:value::annotations"
+    testAnnotationProcessor 'org.immutables:value'
 }
diff --git a/settings.gradle b/settings.gradle
index 65201e4f..05e1f00c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
+rootProject.name = 'encrypted-config-value-root'
+
 include 'encrypted-config-value'
-include 'encrypted-config-value-bundle'
 include 'encrypted-config-value-bundle-dropwizard1'
 include 'encrypted-config-value-module'
diff --git a/version.props b/version.props
deleted file mode 100644
index 6d6fc41e..00000000
--- a/version.props
+++ /dev/null
@@ -1,22 +0,0 @@
-com.fasterxml.jackson.core:* = 2.6.1
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml = 2.6.1
-com.fasterxml.jackson.datatype:jackson-datatype-guava = 2.6.1
-com.fasterxml.jackson.datatype:jackson-datatype-jdk7 = 2.6.1
-com.google.code.findbugs:jsr305 = 3.0.0
-com.google.errorprone:error_prone_annotations = 2.3.1
-com.google.guava:guava = 21.0
-com.netflix.feign:feign-jackson = 8.11.0
-com.netflix.feign:feign-jaxrs = 8.11.0
-com.netflix.feign:feign-okhttp = 8.11.0
-com.squareup.okhttp:mockwebserver = 2.5.0
-io.dropwizard:dropwizard-core = 0.9.1
-io.dropwizard:dropwizard-testing = 0.9.1
-javax.ws.rs:javax.ws.rs-api = 2.0.1
-junit:junit = 4.12
-org.apache.commons:commons-lang3 = 3.4
-org.hamcrest:hamcrest-all = 1.3
-org.hamcrest:hamcrest-core = 1.3
-org.immutables:value = 2.5.6
-org.mockito:mockito-core = 1.10.19
-org.objenesis:objenesis = 2.2
-org.slf4j:slf4j-api = 1.7.12
diff --git a/versions.lock b/versions.lock
new file mode 100644
index 00000000..36ee933f
--- /dev/null
+++ b/versions.lock
@@ -0,0 +1,98 @@
+# Run ./gradlew --write-locks to regenerate this file
+ch.qos.logback:logback-access:1.1.7 (1 constraints: b71149e2)
+ch.qos.logback:logback-classic:1.1.7 (3 constraints: 142ce717)
+ch.qos.logback:logback-core:1.1.7 (3 constraints: 2328c580)
+com.fasterxml:classmate:1.1.0 (1 constraints: a10e4858)
+com.fasterxml.jackson.core:jackson-annotations:2.7.6 (5 constraints: 6a5d75a0)
+com.fasterxml.jackson.core:jackson-core:2.7.6 (8 constraints: 74a8b533)
+com.fasterxml.jackson.core:jackson-databind:2.7.6 (7 constraints: 7c833499)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.7.6 (2 constraints: 221617e0)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.7.6 (1 constraints: 890ebe4f)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.7.6 (1 constraints: 890ebe4f)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.7.6 (1 constraints: 890ebe4f)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.7.6 (1 constraints: 890ebe4f)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.7.6 (1 constraints: 4e17fd25)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.6 (1 constraints: 320e2240)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.7.6 (1 constraints: 890ebe4f)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.7.6 (1 constraints: 4e17fd25)
+com.google.code.findbugs:jsr305:3.0.1 (2 constraints: 5712db14)
+com.google.errorprone:error_prone_annotations:2.3.1 (1 constraints: 0805ff35)
+com.google.guava:guava:21.0 (4 constraints: 722ff7c2)
+io.dropwizard:dropwizard-configuration:1.0.0 (1 constraints: 3b0d261f)
+io.dropwizard:dropwizard-core:1.0.0 (2 constraints: 92135754)
+io.dropwizard:dropwizard-jackson:1.0.0 (5 constraints: 6749af89)
+io.dropwizard:dropwizard-jersey:1.0.0 (1 constraints: 3b0d261f)
+io.dropwizard:dropwizard-jetty:1.0.0 (2 constraints: e91eac89)
+io.dropwizard:dropwizard-lifecycle:1.0.0 (2 constraints: c31b178e)
+io.dropwizard:dropwizard-logging:1.0.0 (4 constraints: cd3a618d)
+io.dropwizard:dropwizard-metrics:1.0.0 (1 constraints: 3b0d261f)
+io.dropwizard:dropwizard-request-logging:1.0.0 (1 constraints: 3b0d261f)
+io.dropwizard:dropwizard-servlets:1.0.0 (1 constraints: 3b0d261f)
+io.dropwizard:dropwizard-util:1.0.0 (5 constraints: bb494192)
+io.dropwizard:dropwizard-validation:1.0.0 (5 constraints: 6749af89)
+io.dropwizard.metrics:metrics-annotation:3.1.2 (2 constraints: 3f1fcab9)
+io.dropwizard.metrics:metrics-core:3.1.2 (9 constraints: e2896254)
+io.dropwizard.metrics:metrics-healthchecks:3.1.2 (2 constraints: 241e5146)
+io.dropwizard.metrics:metrics-jersey2:3.1.2 (1 constraints: 290e1140)
+io.dropwizard.metrics:metrics-jetty9:3.1.2 (1 constraints: c70d2f30)
+io.dropwizard.metrics:metrics-json:3.1.2 (1 constraints: e5105eb8)
+io.dropwizard.metrics:metrics-jvm:3.1.2 (2 constraints: 241e5146)
+io.dropwizard.metrics:metrics-logback:3.1.2 (1 constraints: 7e0eda4f)
+io.dropwizard.metrics:metrics-servlets:3.1.2 (1 constraints: 400d351f)
+javax.annotation:javax.annotation-api:1.2 (2 constraints: 2d21193d)
+javax.inject:javax.inject:1 (2 constraints: d614a0ab)
+javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 830dcc28)
+javax.validation:validation-api:1.1.0.Final (3 constraints: dc393f20)
+javax.ws.rs:javax.ws.rs-api:2.0.1 (8 constraints: ed9109e8)
+joda-time:joda-time:2.9.4 (1 constraints: 5e0d5320)
+net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: 410d361f)
+org.apache.commons:commons-lang3:3.4 (3 constraints: 2723e8e8)
+org.eclipse.jetty:jetty-continuation:9.3.9.v20160517 (2 constraints: 2021ca09)
+org.eclipse.jetty:jetty-http:9.3.9.v20160517 (3 constraints: 8b305dd9)
+org.eclipse.jetty:jetty-io:9.3.9.v20160517 (2 constraints: 7c2064cb)
+org.eclipse.jetty:jetty-security:9.3.9.v20160517 (1 constraints: 3c1040d2)
+org.eclipse.jetty:jetty-server:9.3.9.v20160517 (4 constraints: be42207d)
+org.eclipse.jetty:jetty-servlet:9.3.9.v20160517 (2 constraints: c51f7396)
+org.eclipse.jetty:jetty-servlets:9.3.9.v20160517 (1 constraints: 1010b4c7)
+org.eclipse.jetty:jetty-util:9.3.9.v20160517 (5 constraints: 004d4b62)
+org.eclipse.jetty:jetty-webapp:9.3.9.v20160517 (1 constraints: 72106adb)
+org.eclipse.jetty:jetty-xml:9.3.9.v20160517 (1 constraints: b60fa4bb)
+org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.3 (1 constraints: 3e0d291f)
+org.glassfish:javax.el:3.0.0 (1 constraints: bf0f5484)
+org.glassfish.hk2:hk2-api:2.4.0-b34 (5 constraints: 9d5608c7)
+org.glassfish.hk2:hk2-locator:2.4.0-b34 (4 constraints: 3d490865)
+org.glassfish.hk2:hk2-utils:2.4.0-b34 (2 constraints: 0719352b)
+org.glassfish.hk2:osgi-resource-locator:1.0.1 (2 constraints: 79234465)
+org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 (2 constraints: 0719352b)
+org.glassfish.hk2.external:javax.inject:2.4.0-b34 (7 constraints: 45863274)
+org.glassfish.jersey.bundles.repackaged:jersey-guava:2.23.1 (1 constraints: 23111ad4)
+org.glassfish.jersey.containers:jersey-container-servlet:2.23.1 (1 constraints: 5b0e704e)
+org.glassfish.jersey.containers:jersey-container-servlet-core:2.23.1 (2 constraints: 58327226)
+org.glassfish.jersey.core:jersey-client:2.23.1 (2 constraints: d8342f38)
+org.glassfish.jersey.core:jersey-common:2.23.1 (7 constraints: fc8f4e32)
+org.glassfish.jersey.core:jersey-server:2.23.1 (6 constraints: 799278b2)
+org.glassfish.jersey.ext:jersey-bean-validation:2.23.1 (1 constraints: 5b0e704e)
+org.glassfish.jersey.ext:jersey-metainf-services:2.23.1 (1 constraints: 5b0e704e)
+org.glassfish.jersey.media:jersey-media-jaxb:2.23.1 (1 constraints: 3111f3d4)
+org.hibernate:hibernate-validator:5.2.4.Final (1 constraints: df11a0e9)
+org.immutables:value:2.8.8 (1 constraints: 14051536)
+org.javassist:javassist:3.18.1-GA (1 constraints: 570d4740)
+org.jboss.logging:jboss-logging:3.2.1.Final (1 constraints: bd10c2b6)
+org.slf4j:jcl-over-slf4j:1.7.21 (1 constraints: b30e955e)
+org.slf4j:jul-to-slf4j:1.7.21 (1 constraints: b30e955e)
+org.slf4j:log4j-over-slf4j:1.7.21 (1 constraints: b30e955e)
+org.slf4j:slf4j-api:1.7.21 (9 constraints: 3c7c6aa9)
+org.yaml:snakeyaml:1.15 (1 constraints: 6f17f627)
+
+[Test dependencies]
+io.dropwizard:dropwizard-testing:1.0.0 (1 constraints: 0305f035)
+junit:junit:4.12 (4 constraints: 6750de63)
+net.bytebuddy:byte-buddy:1.3.16 (1 constraints: 450b40de)
+org.assertj:assertj-core:3.4.1 (1 constraints: 970e1d51)
+org.glassfish.jersey.test-framework:jersey-test-framework-core:2.23.1 (1 constraints: a8230302)
+org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory:2.23.1 (1 constraints: c70ee05f)
+org.hamcrest:hamcrest-all:1.3 (1 constraints: a8041d2c)
+org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
+org.mockito:mockito-core:2.0.54-beta (2 constraints: 001657ee)
+org.objenesis:objenesis:2.3 (3 constraints: 8b1d9b1b)
+org.ow2.asm:asm-debug-all:5.0.4 (2 constraints: 863d2154)
diff --git a/versions.props b/versions.props
new file mode 100644
index 00000000..150abe9a
--- /dev/null
+++ b/versions.props
@@ -0,0 +1,13 @@
+com.fasterxml.jackson.*:* = 2.6.1
+com.google.code.findbugs:jsr305 = 3.0.0
+com.google.errorprone:error_prone_annotations = 2.3.1
+com.google.guava:guava = 21.0
+io.dropwizard:* = 1.0.0
+javax.ws.rs:javax.ws.rs-api = 2.0.1
+junit:junit = 4.12
+org.apache.commons:commons-lang3 = 3.4
+org.hamcrest:* = 1.3
+org.immutables:* = 2.8.8
+org.mockito:* = 1.10.19
+org.objenesis:objenesis = 2.2
+org.slf4j:* = 1.7.12