honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into ks-20191214-skipversions

This commit is contained in:
Ken Stevens 2019-12-15 14:20:53 -05:00
parent e3922d5c01 e1f2d044ed
commit 571685d3ae
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure-pipelines.yml
View File

@ -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

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
View File

@ -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)) {

2
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/introduction/changelog.md
View File

@ -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

4
pom.xml
View File

@ -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>