Excavator: Upgrades Baseline to the latest version

palantir · Sep 27, 2019 · d31611d · d31611d
1 parent c586f70
commit d31611d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -469,7 +469,7 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.4.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.4.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.13.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.9.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:2.2.0'
     }

diff --git a/sls-versions/src/test/java/com/palantir/sls/versions/NonOrderableVersionTests.java b/sls-versions/src/test/java/com/palantir/sls/versions/NonOrderableVersionTests.java
@@ -56,7 +56,7 @@ public void testCannotCreateInvalidVersions() {
     @Test
     public void testPatchVersionParsing() {
         SlsVersion version = NonOrderableSlsVersion.valueOf("1.2.3-blah");
-        assertThat(version.getMajorVersionNumber()).isEqualTo(1);
+        assertThat(version.getMajorVersionNumber()).isOne();
         assertThat(version.getMinorVersionNumber()).isEqualTo(2);
         assertThat(version.getPatchVersionNumber()).isEqualTo(3);
         assertThat(version.getType()).isEqualTo(SlsVersionType.NON_ORDERABLE);

diff --git a/sls-versions/src/test/java/com/palantir/sls/versions/OrderableSlsVersionTests.java b/sls-versions/src/test/java/com/palantir/sls/versions/OrderableSlsVersionTests.java
@@ -116,7 +116,7 @@ public void testParsesStructureCorrectly() {
     public void testVersionIsEqualToItself() {
         for (String v : ORDERABLE_VERSIONS_IN_ORDER) {
             assertThat(OrderableSlsVersion.valueOf(v)).isEqualTo(OrderableSlsVersion.valueOf(v));
-            assertThat(compare(OrderableSlsVersion.valueOf(v), OrderableSlsVersion.valueOf(v))).isEqualTo(0);
+            assertThat(compare(OrderableSlsVersion.valueOf(v), OrderableSlsVersion.valueOf(v))).isZero();
         }
     }
 
@@ -126,7 +126,7 @@ public void testVersionOrdering() {
             String left = ORDERABLE_VERSIONS_IN_ORDER[i];
             String right = ORDERABLE_VERSIONS_IN_ORDER[i + 1];
             assertThat(compare(OrderableSlsVersion.valueOf(left), OrderableSlsVersion.valueOf(right))).isEqualTo(-1);
-            assertThat(compare(OrderableSlsVersion.valueOf(right), OrderableSlsVersion.valueOf(left))).isEqualTo(1);
+            assertThat(compare(OrderableSlsVersion.valueOf(right), OrderableSlsVersion.valueOf(left))).isOne();
         }
     }
 
@@ -203,7 +203,7 @@ private void assertVersionsInOrder(String smaller, String larger) {
     }
 
     private void assertVersionsEqual(String left, String right) {
-        assertThat(compare(OrderableSlsVersion.valueOf(left), OrderableSlsVersion.valueOf(right))).isEqualTo(0);
+        assertThat(compare(OrderableSlsVersion.valueOf(left), OrderableSlsVersion.valueOf(right))).isZero();
     }
 
     private OrderableSlsVersion version(