From 442a1dfef3cf103fb0ecf1c50d34493bd2d99d5a Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:36:33 -0700
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version (#224)

---
 .baseline/checkstyle/checkstyle.xml           | 47 +++++++------------
 .../dotfile.settings/org.eclipse.jdt.ui.prefs |  4 +-
 .../idea/intellij-java-palantir-style.xml     | 21 +++++++--
 build.gradle                                  | 34 +++-----------
 .../HumanReadableByteCount.java               |  4 +-
 .../HumanReadableDuration.java                | 16 +++++--
 .../HumanReadableByteCountTests.java          | 32 ++++++++-----
 .../HumanReadableDurationTests.java           | 38 +++++++++------
 settings.gradle                               |  2 +-
 versions.lock                                 | 19 ++++++++
 10 files changed, 121 insertions(+), 96 deletions(-)
 create mode 100644 versions.lock

diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 5d8bc6ef..af0eb264 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -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."/>
@@ -56,6 +47,10 @@
     <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">
@@ -86,14 +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="
-                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.*"/>
+            <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]$)"/>
@@ -143,12 +131,12 @@
         <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" />
+            <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" />
+            <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">
@@ -201,12 +189,12 @@
             <property name="separated" value="true"/>
             <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>
+        <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
+            <property name="arrayInitIndent" value="8"/>
+            <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 -->
-        <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="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}''."/>
@@ -363,7 +351,7 @@
         </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\("/>
@@ -372,6 +360,7 @@
         <module name="RegexpSinglelineJava">
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
             <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\(\))"/>
@@ -379,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"/>
@@ -401,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>
@@ -437,11 +425,8 @@
         <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 -->
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 9aa48633..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" />
@@ -55,7 +68,7 @@
         <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>
diff --git a/build.gradle b/build.gradle
index 4c234f23..110041c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,16 +27,17 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:0.4.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.2'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.68.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.28.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:1.1.0'
     }
 }
 
-apply plugin: 'com.palantir.baseline-config'
-apply plugin: 'com.palantir.baseline-idea'
-apply plugin: 'com.palantir.git-version'
 apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.external-publish'
+apply plugin: 'com.palantir.consistent-versions'
+apply plugin: 'com.palantir.git-version'
 
 allprojects {
     group 'com.palantir.human-readable-types'
@@ -48,33 +49,12 @@ allprojects {
             url 'https://dl.bintray.com/palantir/releases/'
         }
     }
-
-
-    dependencyRecommendations {
-        strategy OverrideTransitives
-        propertiesFile file: project.rootProject.file('versions.props')
-    }
-
-    configurations.all {
-        resolutionStrategy {
-            failOnVersionConflict()
-        }
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'org.glassfish.hk2.external' && details.requested.name == 'javax.inject') {
-                details.useTarget group: 'javax.inject', name: 'javax.inject', version: '1'
-                details.because "The glassfish shaded copy is only necessary for OSGI environments, which we do not endorse."
-            }
-        }
-    }
 }
 
 subprojects {
-    apply plugin: 'java'
-    apply plugin: 'com.palantir.baseline-checkstyle'
-    apply plugin: 'com.palantir.baseline-eclipse'
-    apply plugin: 'com.palantir.baseline-idea'
-    apply plugin: 'com.palantir.baseline-error-prone'
+    apply plugin: 'java-library'
     apply plugin: 'com.palantir.baseline-class-uniqueness'
+    apply plugin: 'com.palantir.java-format'
 
     sourceCompatibility = 1.8
 
diff --git a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java
index 7b3c2bb1..fa98c3c2 100644
--- a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java
+++ b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java
@@ -276,8 +276,8 @@ enum ByteUnit {
         }
 
         public long toBytes(long sizeValue) {
-            Preconditions.checkArgument(sizeValue >= 0, "Negative size value. Size must be positive",
-                    SafeArg.of("size", sizeValue));
+            Preconditions.checkArgument(
+                    sizeValue >= 0, "Negative size value. Size must be positive", SafeArg.of("size", sizeValue));
             return sizeValue * multiplier;
         }
 
diff --git a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableDuration.java b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableDuration.java
index 1d8045c3..c0311154 100644
--- a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableDuration.java
+++ b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableDuration.java
@@ -1,5 +1,17 @@
 /*
  * (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.humanreadabletypes;
@@ -151,8 +163,7 @@ public static HumanReadableDuration valueOf(String duration) {
         final TimeUnit unit = SUFFIXES.get(matcher.group(2));
         if (unit == null) {
             throw new SafeIllegalArgumentException(
-                    "Invalid duration. Wrong time unit",
-                    SafeArg.of("duration", duration));
+                    "Invalid duration. Wrong time unit", SafeArg.of("duration", duration));
         }
 
         return new HumanReadableDuration(count, unit);
@@ -303,7 +314,6 @@ public boolean equals(Object otherDuration) {
             return count == duration.count;
         }
         return toJavaDuration().equals(duration.toJavaDuration());
-
     }
 
     /**
diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
index b56e5e6a..54df3f18 100644
--- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
+++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
@@ -81,18 +81,26 @@ public void testInvalidUnits() {
 
     @Test
     public void testEquals() {
-        assertThat(HumanReadableByteCount.bytes(1024).equals(HumanReadableByteCount.kibibytes(1))).isTrue();
-        assertThat(HumanReadableByteCount.bytes(1).equals(HumanReadableByteCount.valueOf("1"))).isTrue();
-        assertThat(HumanReadableByteCount.mebibytes(1024).equals(HumanReadableByteCount.gibibytes(1))).isTrue();
-        assertThat(HumanReadableByteCount.tebibytes(1024).equals(HumanReadableByteCount.pebibytes(1))).isTrue();
-        assertThat(HumanReadableByteCount.bytes(1024).equals(HumanReadableByteCount.mebibytes(1))).isFalse();
+        assertThat(HumanReadableByteCount.bytes(1024).equals(HumanReadableByteCount.kibibytes(1)))
+                .isTrue();
+        assertThat(HumanReadableByteCount.bytes(1).equals(HumanReadableByteCount.valueOf("1")))
+                .isTrue();
+        assertThat(HumanReadableByteCount.mebibytes(1024).equals(HumanReadableByteCount.gibibytes(1)))
+                .isTrue();
+        assertThat(HumanReadableByteCount.tebibytes(1024).equals(HumanReadableByteCount.pebibytes(1)))
+                .isTrue();
+        assertThat(HumanReadableByteCount.bytes(1024).equals(HumanReadableByteCount.mebibytes(1)))
+                .isFalse();
     }
 
     @Test
     public void testCompareTo() {
-        assertThat(HumanReadableByteCount.bytes(2048).compareTo(HumanReadableByteCount.kibibytes(1))).isEqualTo(1);
-        assertThat(HumanReadableByteCount.bytes(1024).compareTo(HumanReadableByteCount.kibibytes(1))).isEqualTo(0);
-        assertThat(HumanReadableByteCount.mebibytes(1).compareTo(HumanReadableByteCount.gibibytes(1))).isEqualTo(-1);
+        assertThat(HumanReadableByteCount.bytes(2048).compareTo(HumanReadableByteCount.kibibytes(1)))
+                .isEqualTo(1);
+        assertThat(HumanReadableByteCount.bytes(1024).compareTo(HumanReadableByteCount.kibibytes(1)))
+                .isEqualTo(0);
+        assertThat(HumanReadableByteCount.mebibytes(1).compareTo(HumanReadableByteCount.gibibytes(1)))
+                .isEqualTo(-1);
     }
 
     @Test
@@ -113,10 +121,10 @@ public void testToJsonString() throws Exception {
 
     private static void assertStringsEqualToBytes(long expectedBytes, String... byteCounts) {
         assertThat(Arrays.stream(byteCounts)
-                .map(HumanReadableByteCountTests::parseFromString)
-                .map(HumanReadableByteCount::toBytes)
-                .collect(Collectors.toList())
-        ).allMatch(Predicate.isEqual(expectedBytes));
+                        .map(HumanReadableByteCountTests::parseFromString)
+                        .map(HumanReadableByteCount::toBytes)
+                        .collect(Collectors.toList()))
+                .allMatch(Predicate.isEqual(expectedBytes));
     }
 
     private static HumanReadableByteCount parseFromString(String durationString) {
diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
index 883a9e46..52eb0228 100644
--- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
+++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
@@ -81,19 +81,28 @@ public void testInvalidUnits() {
 
     @Test
     public void testEquals() {
-        assertThat(HumanReadableDuration.nanoseconds(1000).equals(HumanReadableDuration.microseconds(1))).isTrue();
-        assertThat(HumanReadableDuration.microseconds(1000).equals(HumanReadableDuration.milliseconds(1))).isTrue();
-        assertThat(HumanReadableDuration.milliseconds(1000).equals(HumanReadableDuration.seconds(1))).isTrue();
-        assertThat(HumanReadableDuration.seconds(60).equals(HumanReadableDuration.minutes(1))).isTrue();
-        assertThat(HumanReadableDuration.minutes(60).equals(HumanReadableDuration.hours(1))).isTrue();
-        assertThat(HumanReadableDuration.hours(24).equals(HumanReadableDuration.days(1))).isTrue();
+        assertThat(HumanReadableDuration.nanoseconds(1000).equals(HumanReadableDuration.microseconds(1)))
+                .isTrue();
+        assertThat(HumanReadableDuration.microseconds(1000).equals(HumanReadableDuration.milliseconds(1)))
+                .isTrue();
+        assertThat(HumanReadableDuration.milliseconds(1000).equals(HumanReadableDuration.seconds(1)))
+                .isTrue();
+        assertThat(HumanReadableDuration.seconds(60).equals(HumanReadableDuration.minutes(1)))
+                .isTrue();
+        assertThat(HumanReadableDuration.minutes(60).equals(HumanReadableDuration.hours(1)))
+                .isTrue();
+        assertThat(HumanReadableDuration.hours(24).equals(HumanReadableDuration.days(1)))
+                .isTrue();
     }
 
     @Test
     public void testCompareTo() {
-        assertThat(HumanReadableDuration.seconds(70).compareTo(HumanReadableDuration.minutes(1))).isEqualTo(1);
-        assertThat(HumanReadableDuration.seconds(86400).compareTo(HumanReadableDuration.days(1))).isEqualTo(0);
-        assertThat(HumanReadableDuration.microseconds(100).compareTo(HumanReadableDuration.seconds(1))).isEqualTo(-1);
+        assertThat(HumanReadableDuration.seconds(70).compareTo(HumanReadableDuration.minutes(1)))
+                .isEqualTo(1);
+        assertThat(HumanReadableDuration.seconds(86400).compareTo(HumanReadableDuration.days(1)))
+                .isEqualTo(0);
+        assertThat(HumanReadableDuration.microseconds(100).compareTo(HumanReadableDuration.seconds(1)))
+                .isEqualTo(-1);
     }
 
     @Test
@@ -112,12 +121,13 @@ public void testToJson() throws Exception {
         assertThat(toJsonString(HumanReadableDuration.valueOf("2 seconds"))).isEqualTo("\"2 seconds\"");
     }
 
-    private static void assertStringsEqualToDuration(long expectedQuantity, TimeUnit expectedTimeUnit,
-            String... durationStrings) {
+    private static void assertStringsEqualToDuration(
+            long expectedQuantity, TimeUnit expectedTimeUnit, String... durationStrings) {
         assertThat(Arrays.stream(durationStrings)
-                .map(HumanReadableDurationTests::parseFromString)
-                .collect(Collectors.toList())
-        ).allMatch(duration -> duration.getQuantity() == expectedQuantity && duration.getUnit() == expectedTimeUnit);
+                        .map(HumanReadableDurationTests::parseFromString)
+                        .collect(Collectors.toList()))
+                .allMatch(duration ->
+                        duration.getQuantity() == expectedQuantity && duration.getUnit() == expectedTimeUnit);
     }
 
     private static HumanReadableDuration parseFromString(String durationString) {
diff --git a/settings.gradle b/settings.gradle
index f67a8304..7a16b55b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = 'human-readable-types'
+rootProject.name = 'human-readable-types-root'
 
 include 'human-readable-types'
diff --git a/versions.lock b/versions.lock
new file mode 100644
index 00000000..105f7c56
--- /dev/null
+++ b/versions.lock
@@ -0,0 +1,19 @@
+# Run ./gradlew --write-locks to regenerate this file
+com.fasterxml.jackson.core:jackson-annotations:2.11.2 (1 constraints: 86123121)
+com.fasterxml.jackson.core:jackson-core:2.11.2 (2 constraints: 242963bb)
+com.fasterxml.jackson.core:jackson-databind:2.11.2 (2 constraints: d61b078f)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.11.2 (1 constraints: 3805343b)
+com.google.code.findbugs:jsr305:3.0.2 (2 constraints: 1d0fb186)
+com.google.errorprone:error_prone_annotations:2.5.1 (2 constraints: 1d1bfb59)
+com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
+com.google.guava:guava:30.1.1-jre (2 constraints: e11c9fc6)
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
+com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
+com.palantir.safe-logging:preconditions:1.14.0 (1 constraints: 3805353b)
+com.palantir.safe-logging:safe-logging:1.14.0 (1 constraints: 321157d1)
+org.checkerframework:checker-qual:3.8.0 (2 constraints: 280f6d87)
+
+[Test dependencies]
+junit:junit:4.13.2 (1 constraints: 3c05463b)
+org.assertj:assertj-core:3.19.0 (1 constraints: 3f05503b)
+org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)