Excavator: Upgrades Baseline to the latest version (#525)

palantir · Jan 19, 2022 · 8b81ba6 · 8b81ba6
1 parent 508cb87
commit 8b81ba6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -63,7 +63,9 @@
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
-        <module name="AnnotationUseStyle"/> <!-- Java Style Guide: Annotations -->
+        <module name="AnnotationUseStyle"> <!-- Java Style Guide: Annotations -->
+            <property name="trailingArrayComma" value="ignore"/>
+        </module>
         <module name="ArrayTypeStyle"/> <!-- Java Style Guide: No C-style array declarations -->
         <module name="AvoidEscapedUnicodeCharacters"> <!-- Java Style Guide: Non-ASCII characters -->
             <property name="allowEscapesForControlCharacters" value="true"/>

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'com.gradle.plugin-publish' version '0.19.0'
     id 'com.palantir.git-version' version '0.12.3'
     id 'com.palantir.idea-test-fix' version '0.1.0'
-    id 'com.palantir.baseline' version '4.20.0'
+    id 'com.palantir.baseline' version '4.60.0'
     id 'com.palantir.consistent-versions' version '2.5.0'
     id 'java-gradle-plugin'
     id 'groovy'

diff --git a/src/main/java/com/palantir/gradle/gitversion/JGitDescribe.java b/src/main/java/com/palantir/gradle/gitversion/JGitDescribe.java
@@ -69,7 +69,7 @@ public String describe(String prefix) {
             // No tags found, so return commit hash of HEAD
             return GitUtils.abbrevHash(headObjectId.getName());
         } catch (IOException | RuntimeException e) {
-            log.debug("JGit describe failed with {}", e);
+            log.debug("JGit describe failed", e);
             return null;
         }
     }

diff --git a/src/main/java/com/palantir/gradle/gitversion/NativeGitDescribe.java b/src/main/java/com/palantir/gradle/gitversion/NativeGitDescribe.java
@@ -105,7 +105,7 @@ public String describe(String prefix) {
             // No tags found, so return commit hash of HEAD
             return GitUtils.abbrevHash(runGitCmd("rev-parse", "HEAD"));
         } catch (IOException | InterruptedException | RuntimeException e) {
-            log.debug("Native git describe failed: {}", e);
+            log.debug("Native git describe failed", e);
             return null;
         }
     }
@@ -119,7 +119,7 @@ private boolean gitCommandExists() {
             }
             return true;
         } catch (IOException | InterruptedException | RuntimeException e) {
-            log.debug("Native git command not found: {}", e);
+            log.debug("Native git command not found", e);
             return false;
         }
     }