Excavator: Upgrades Baseline to the latest version

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.2'
-        classpath 'com.palantir.baseline:gradle-baseline-java:3.43.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.61.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.27.0'
     }
 }

hadoop-crypto/baseline-class-uniqueness.lock

@@ -0,0 +1,98 @@
+# 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
+[commons-beanutils:commons-beanutils, commons-beanutils:commons-beanutils-core, commons-collections:commons-collections]
+  - org.apache.commons.collections.ArrayStack
+  - org.apache.commons.collections.Buffer
+  - org.apache.commons.collections.BufferUnderflowException
+  - org.apache.commons.collections.FastHashMap
+  - org.apache.commons.collections.FastHashMap$1
+  - org.apache.commons.collections.FastHashMap$CollectionView
+  - org.apache.commons.collections.FastHashMap$CollectionView$CollectionViewIterator
+  - org.apache.commons.collections.FastHashMap$EntrySet
+  - org.apache.commons.collections.FastHashMap$KeySet
+  - org.apache.commons.collections.FastHashMap$Values
+[commons-beanutils:commons-beanutils, commons-beanutils:commons-beanutils-core]
+  - org.apache.commons.beanutils.BasicDynaBean
+  - org.apache.commons.beanutils.BasicDynaClass
+  - org.apache.commons.beanutils.BeanAccessLanguageException
+  - org.apache.commons.beanutils.BeanUtils
+  - org.apache.commons.beanutils.BeanUtilsBean
+  - org.apache.commons.beanutils.BeanUtilsBean$1
+  - org.apache.commons.beanutils.ConstructorUtils
+  - org.apache.commons.beanutils.ContextClassLoaderLocal
+  - org.apache.commons.beanutils.ConversionException
+  - org.apache.commons.beanutils.ConvertUtils
+  - org.apache.commons.beanutils.ConvertUtilsBean
+  - org.apache.commons.beanutils.Converter
+  - org.apache.commons.beanutils.ConvertingWrapDynaBean
+  - org.apache.commons.beanutils.DynaBean
+  - org.apache.commons.beanutils.DynaClass
+  - org.apache.commons.beanutils.DynaProperty
+  - org.apache.commons.beanutils.JDBCDynaClass
+  - org.apache.commons.beanutils.LazyDynaBean
+  - org.apache.commons.beanutils.LazyDynaClass
+  - org.apache.commons.beanutils.LazyDynaMap
+  - org.apache.commons.beanutils.MappedPropertyDescriptor
+  - org.apache.commons.beanutils.MethodUtils
+  - org.apache.commons.beanutils.MethodUtils$MethodDescriptor
+  - org.apache.commons.beanutils.MutableDynaClass
+  - org.apache.commons.beanutils.NestedNullException
+  - org.apache.commons.beanutils.PropertyUtils
+  - org.apache.commons.beanutils.PropertyUtilsBean
+  - org.apache.commons.beanutils.ResultSetDynaClass
+  - org.apache.commons.beanutils.ResultSetIterator
+  - org.apache.commons.beanutils.RowSetDynaClass
+  - org.apache.commons.beanutils.WrapDynaBean
+  - org.apache.commons.beanutils.WrapDynaClass
+  - org.apache.commons.beanutils.converters.AbstractArrayConverter
+  - org.apache.commons.beanutils.converters.BigDecimalConverter
+  - org.apache.commons.beanutils.converters.BigIntegerConverter
+  - org.apache.commons.beanutils.converters.BooleanArrayConverter
+  - org.apache.commons.beanutils.converters.BooleanConverter
+  - org.apache.commons.beanutils.converters.ByteArrayConverter
+  - org.apache.commons.beanutils.converters.ByteConverter
+  - org.apache.commons.beanutils.converters.CharacterArrayConverter
+  - org.apache.commons.beanutils.converters.CharacterConverter
+  - org.apache.commons.beanutils.converters.ClassConverter
+  - org.apache.commons.beanutils.converters.DoubleArrayConverter
+  - org.apache.commons.beanutils.converters.DoubleConverter
+  - org.apache.commons.beanutils.converters.FileConverter
+  - org.apache.commons.beanutils.converters.FloatArrayConverter
+  - org.apache.commons.beanutils.converters.FloatConverter
+  - org.apache.commons.beanutils.converters.IntegerArrayConverter
+  - org.apache.commons.beanutils.converters.IntegerConverter
+  - org.apache.commons.beanutils.converters.LongArrayConverter
+  - org.apache.commons.beanutils.converters.LongConverter
+  - org.apache.commons.beanutils.converters.ShortArrayConverter
+  - org.apache.commons.beanutils.converters.ShortConverter
+  - org.apache.commons.beanutils.converters.SqlDateConverter
+  - org.apache.commons.beanutils.converters.SqlTimeConverter
+  - org.apache.commons.beanutils.converters.SqlTimestampConverter
+  - org.apache.commons.beanutils.converters.StringArrayConverter
+  - org.apache.commons.beanutils.converters.StringConverter
+  - org.apache.commons.beanutils.converters.URLConverter
+  - org.apache.commons.beanutils.locale.BaseLocaleConverter
+  - org.apache.commons.beanutils.locale.LocaleBeanUtils
+  - org.apache.commons.beanutils.locale.LocaleBeanUtils$Descriptor
+  - org.apache.commons.beanutils.locale.LocaleBeanUtilsBean
+  - org.apache.commons.beanutils.locale.LocaleBeanUtilsBean$1
+  - org.apache.commons.beanutils.locale.LocaleBeanUtilsBean$Descriptor
+  - org.apache.commons.beanutils.locale.LocaleConvertUtils
+  - org.apache.commons.beanutils.locale.LocaleConvertUtilsBean
+  - org.apache.commons.beanutils.locale.LocaleConverter
+  - org.apache.commons.beanutils.locale.converters.BigDecimalLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.BigIntegerLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.ByteLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.DateLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.DecimalLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.DoubleLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.FloatLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.IntegerLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.LongLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.ShortLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.SqlDateLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.SqlTimeLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.SqlTimestampLocaleConverter
+  - org.apache.commons.beanutils.locale.converters.StringLocaleConverter

hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/DelegatingFileSystem.java

@@ -34,7 +34,7 @@
  */
 public abstract class DelegatingFileSystem extends FilterFileSystem {
 
-    public DelegatingFileSystem(FileSystem delegate) {
+    protected DelegatingFileSystem(FileSystem delegate) {
         super(delegate);
         try {
             super.initialize(delegate.getUri(), delegate.getConf());