From e1f2d044eda8f3a5e4ae035ea71e19e080b1d913 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Sun, 15 Dec 2019 09:42:51 -0500
Subject: [PATCH] Add errorprone back into build

---
 azure-pipelines.yml                                           | 2 +-
 .../main/java/ca/uhn/fhir/validation/ValidationResult.java    | 2 +-
 .../resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md | 2 +-
 pom.xml                                                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2de8adae5c0..6f9ad3f95d1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,7 @@ jobs:
         inputs:
           goals: 'clean install'
           # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-          options: '-P ALLMODULES,JACOCO,CI -nsu'
+          options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -nsu'
           # These are JVM options (and don't show up in the build logs)
           mavenOptions: '-Xmx2048m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
           jdkVersionOption: 1.11
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
index 02716b0312c..ae8feaa6f36 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
@@ -130,7 +130,7 @@ public class ValidationResult {
 					line = next.getLocationLine().toString();
 				}
 				String col = unknown;
-				if (next.getLocationCol() != null && next.getLocationCol() != null) {
+				if (next.getLocationCol() != null && next.getLocationCol() != -1) {
 					col = next.getLocationCol().toString();
 				}
 				if (!unknown.equals(line) || !unknown.equals(col)) {
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md
index e8172bc7d18..e9a92179905 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md
@@ -2,7 +2,7 @@
 
 <th:block th:each="version : ${changelog.versions}">
 
-# Smile CDR <th:block th:text="${version}"/> <th:block th:if="${changelog.changes.get(version).codename} != null" th:text="' (' + ${changelog.changes.get(version).codename} + ')'"/> <th:block th:if="${changelog.releaseDate} == null">(Prerelease)</th:block>
+# Smile CDR <th:block th:text="${version}"/> <th:block th:if="${changelog.changes.get(version).codename} != null" th:text="' (' + ${changelog.changes.get(version).codename} + ')'"/> <th:block th:if="${changelog.changes.get(version).releaseDate} == null">(Prerelease)</th:block>
 
 ## Release Information
 
diff --git a/pom.xml b/pom.xml
index 6e6100c2698..6cfc677e339 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,7 +623,7 @@
 		<commons_lang3_version>3.9</commons_lang3_version>
 		<derby_version>10.14.2.0</derby_version>
 		<!--<derby_version>10.15.1.3</derby_version>-->
-		<error_prone_annotations_version>2.3.3</error_prone_annotations_version>
+		<error_prone_annotations_version>2.3.4</error_prone_annotations_version>
 		<error_prone_core_version>2.3.3</error_prone_core_version>
 		<guava_version>28.0-jre</guava_version>
 		<gson_version>2.8.5</gson_version>
@@ -1308,7 +1308,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.postgresql</groupId>