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

Merge branch 'master' into windows-fixes-2 

# Conflicts:
#	hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java
This commit is contained in:
Ken Stevens 2019-02-02 13:16:23 -05:00
parent 6616fbc9bb 86a12bcf2a
commit 3662d080d0
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseApp.java
View File

@ -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();
public List<BaseCommand> provideCommands() {
protected List<BaseCommand> provideCommands() {
ArrayList<BaseCommand> commands = new ArrayList<>();
commands.add(new RunServerCommand());
commands.add(new ExampleDataUploader());

2
hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java
View File

@ -495,7 +495,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]));
}

5
pom.xml
View File

@ -503,6 +503,9 @@
<name>Ricardo Estevez</name>
<organization>Cambia Health Solutions</organization>
</developer>
<developer>
<id>zilin375</id>
</developer>
</developers>
<licenses>
@ -546,7 +549,7 @@
<!--<hibernate_version>5.2.10.Final</hibernate_version>-->
<hibernate_version>5.4.1.Final</hibernate_version>
<!-- Update lucene version when you update hibernate-search version -->
<hibernate_search_version>5.11.0.Final</hibernate_search_version>
<hibernate_search_version>5.11.1.Final</hibernate_search_version>
<lucene_version>5.5.5</lucene_version>
<hibernate_validator_version>5.4.1.Final</hibernate_validator_version>
<httpcore_version>4.4.6</httpcore_version>

10
src/changes/changes.xml
View File

@ -9,8 +9,8 @@
<release version="3.7.0" date="TBD" description="Gale">
<action type="add">
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.
</action>
<action type="add">
The version of a few dependencies have been bumped to the
@ -20,7 +20,7 @@
<li>Spring (JPA): 5.0.8.RELEASE -&gt; 5.1.3.RELEASE</li>
<li>Spring-Data (JPA): 2.0.7.RELEASE -&gt; 2.1.3.RELEASE</li>
<li>Hibernate-Core (JPA): 5.3.6.FINAL -&gt; 5.4.1.FINAL</li>
<li>Hibernate-Search (JPA): 5.10.3.FINAL -&gt; 5.11.0.FINAL</li>
<li>Hibernate-Search (JPA): 5.10.3.FINAL -&gt; 5.11.1.FINAL</li>
<li>Thymeleaf (JPA): 3.0.9.RELEASE -&gt; 3.0.11.RELEASE</li>
<li>thymeleaf-spring4 (Testpage Overlay) has been replaced with thymeleaf-spring5</li>
<li>Commons-Lang3: 3.8 -&gt; 3.8.1</li>
@ -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!
</action>
<action type="fix" issue="1114">
A NullPointerException during validation was fixed. Thanks to GitHub
user zilin375 for the pull request!
</action>
</release>
<release version="3.6.0" date="2018-11-12" description="Food">
<action type="add">