Skip to content

Commit

Permalink
Excavator: Upgrades Baseline to the latest version (#314)
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-excavator-bot authored and bulldozer-bot[bot] committed Oct 16, 2019
1 parent f55626f commit a67ae69
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.0.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.19.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.21.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
Expand Down
4 changes: 2 additions & 2 deletions tracing/src/test/java/com/palantir/tracing/TracersTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ private static Callable<Void> traceExpectingCallableWithSingleSpan(String operat
String traceId = Tracer.getTraceId();
List<OpenSpan> trace = getCurrentTrace();
OpenSpan span = trace.remove(trace.size() - 1);
assertThat(trace).hasSize(0);
assertThat(trace).isEmpty();

assertThat(traceId).isEqualTo(outsideTraceId);
assertThat(span.getOperation()).isEqualTo(operation);
Expand All @@ -673,7 +673,7 @@ private static Runnable traceExpectingRunnableWithSingleSpan(String operation) {
String traceId = Tracer.getTraceId();
List<OpenSpan> trace = getCurrentTrace();
OpenSpan span = trace.remove(trace.size() - 1);
assertThat(trace).hasSize(0);
assertThat(trace).isEmpty();

assertThat(traceId).isEqualTo(outsideTraceId);
assertThat(span.getOperation()).isEqualTo(operation);
Expand Down

0 comments on commit a67ae69

Please sign in to comment.