From 952dc7dd010514158f6b8ffbb29109b043f1bb2b Mon Sep 17 00:00:00 2001 From: axdad Date: Wed, 14 Nov 2018 09:24:27 +0100 Subject: [PATCH 1/3] Fix NPE --- .../src/main/java/org/hl7/fhir/r4/elementmodel/Element.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java index 00f6cd85be7..47e7f51da7f 100644 --- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java +++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java @@ -486,7 +486,7 @@ public class Element extends Base { setUserData("fhir.decorations", decorations); } decorations.add(new ElementDecoration(DecorationType.TYPE, profile.getUserString("path"), definition.getPath())); - if (tail(definition.getId()).contains(":")) { + if (definition.getId() != null && tail(definition.getId()).contains(":")) { String[] details = tail(definition.getId()).split("\\:"); decorations.add(new ElementDecoration(DecorationType.SLICE, null, details[1])); } From ea84f2c377a7c8f87526ee2f8b1d0d650aea8081 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Sat, 2 Feb 2019 11:26:19 -0500 Subject: [PATCH 2/3] Version bump hibernate search --- .../src/main/java/ca/uhn/fhir/cli/BaseApp.java | 3 ++- pom.xml | 2 +- src/changes/changes.xml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java index aea44721f1b..9300211a49a 100755 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java @@ -41,6 +41,7 @@ import java.util.List; import static org.fusesource.jansi.Ansi.ansi; +@SuppressWarnings("WeakerAccess") public abstract class BaseApp { private static final String STACKFILTER_PATTERN = "%xEx{full, sun.reflect, org.junit, org.eclipse, java.lang.reflect.Method, org.springframework, org.hibernate, com.sun.proxy, org.attoparser, org.thymeleaf}"; private static final String STACKFILTER_PATTERN_PROP = "log.stackfilter.pattern"; @@ -145,7 +146,7 @@ public abstract class BaseApp { protected abstract String provideCommandName(); - List provideCommands() { + protected List provideCommands() { ArrayList commands = new ArrayList<>(); commands.add(new RunServerCommand()); commands.add(new ExampleDataUploader()); diff --git a/pom.xml b/pom.xml index 384e27cf290..ac520b5bca0 100755 --- a/pom.xml +++ b/pom.xml @@ -546,7 +546,7 @@ 5.4.1.Final - 5.11.0.Final + 5.11.1.Final 5.5.5 5.4.1.Final 4.4.6 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index de5f6508cc1..d0ead7299aa 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -9,8 +9,8 @@ HAPI FHIR is now built using OpenJDK 11. Users are recommended to upgrade to this version - of Java if this is feasible. We are not yet dropping support for Java 8 (aka 1.8), although - we may do so in an upcoming release. + of Java if this is feasible. We are not yet dropping support for Java 8 (aka 1.8), but + users are recommended to upgrade if possible. The version of a few dependencies have been bumped to the @@ -20,7 +20,7 @@
  • Spring (JPA): 5.0.8.RELEASE -> 5.1.3.RELEASE
  • Spring-Data (JPA): 2.0.7.RELEASE -> 2.1.3.RELEASE
  • Hibernate-Core (JPA): 5.3.6.FINAL -> 5.4.1.FINAL
  • -
  • Hibernate-Search (JPA): 5.10.3.FINAL -> 5.11.0.FINAL
  • +
  • Hibernate-Search (JPA): 5.10.3.FINAL -> 5.11.1.FINAL
  • Thymeleaf (JPA): 3.0.9.RELEASE -> 3.0.11.RELEASE
  • thymeleaf-spring4 (Testpage Overlay) has been replaced with thymeleaf-spring5
  • Commons-Lang3: 3.8 -> 3.8.1
  • From 86a12bcf2a0ddf80c65089b4efaca131e48e6194 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Sat, 2 Feb 2019 11:33:08 -0500 Subject: [PATCH 3/3] Credit for #1114 --- pom.xml | 3 +++ src/changes/changes.xml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index ac520b5bca0..404253a1ae6 100755 --- a/pom.xml +++ b/pom.xml @@ -503,6 +503,9 @@ Ricardo Estevez Cambia Health Solutions + + zilin375 + diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d0ead7299aa..2c9c50ac07b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -352,6 +352,10 @@ The HAPI FHIR tutorial server project had outdated versions of HAPI FHIR in its pom file. Thanks to Ricardo Estevez for the pull request!
    + + A NullPointerException during validation was fixed. Thanks to GitHub + user zilin375 for the pull request! +