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

palantir · Nov 29, 2022 · 1f9261a · 1f9261a
1 parent a6023e4
commit 1f9261a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -43,7 +43,7 @@
     </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://"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
     </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.27.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.4.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.183.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'

diff --git a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjureLocalPlugin.java b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjureLocalPlugin.java
@@ -101,7 +101,7 @@ private void setupConjureJava(
                         GeneratorOptions generatorOptions = optionsSupplier.get();
                         Preconditions.checkArgument(
                                 UNSAFE_JAVA_OPTIONS.stream().noneMatch(generatorOptions::has),
-                                "Unable to generate Java bindings since unsafe options were provided",
+                                "Unable to generate Java bindings since unsafe options were provided: %s",
                                 generatorOptions.getProperties());
 
                         return generatorOptions;

diff --git a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java
@@ -158,7 +158,7 @@ private void setupConjureJavaProjects(
                 .put(JAVA_RETROFIT_SUFFIX, (Consumer<Project>) ConjurePlugin::setupRetrofitProject)
                 .put(JAVA_JERSEY_SUFFIX, (Consumer<Project>) ConjurePlugin::setupJerseyProject)
                 .put(JAVA_UNDERTOW_SUFFIX, (Consumer<Project>) ConjurePlugin::setupUndertowProject)
-                .build();
+                .buildOrThrow();
 
         // Make sure project names align
         Sets.SetView<String> difference = Sets.difference(configs.keySet(), JAVA_PROJECT_SUFFIXES);

diff --git a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java
@@ -57,7 +57,7 @@ public static List<String> toArgs(Map<String, Object> properties, Map<String, Su
             }
         });
 
-        return resolvedProperties.build().entrySet().stream()
+        return resolvedProperties.buildOrThrow().entrySet().stream()
                 .sorted(Comparator.comparing(Map.Entry::getKey))
                 .map(entry -> {
                     Object value = entry.getValue();