Excavator: Upgrades Baseline to the latest version

palantir · Sep 9, 2019 · 414b7b2 · 414b7b2
1 parent 5948b94
commit 414b7b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -422,6 +422,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."/>
@@ -435,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <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"/>

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.65.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.1.1'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.2.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.7.1'
         classpath 'com.palantir.launchconfig:gradle-launch-config-plugin:1.2.0'

diff --git a/...mple-server/src/main/java/com/palantir/conjure/examples/resources/RecipeBookResource.java b/...mple-server/src/main/java/com/palantir/conjure/examples/resources/RecipeBookResource.java
@@ -16,7 +16,6 @@
 
 package com.palantir.conjure.examples.resources;
 
-import com.google.common.base.Preconditions;
 import com.palantir.conjure.examples.recipe.api.Recipe;
 import com.palantir.conjure.examples.recipe.api.RecipeBookService;
 import com.palantir.conjure.examples.recipe.api.RecipeErrors;
@@ -38,7 +37,7 @@ public RecipeBookResource(Set<Recipe> recipes) {
 
     @Override
     public Recipe getRecipe(RecipeName name) {
-        Preconditions.checkNotNull(name, "Recipe name must be provided.");
+        com.palantir.logsafe.Preconditions.checkNotNull(name, "Recipe name must be provided.");
         checkIfRecipeExists(name);
 
         return recipes.get(name);