Merge branch 'master' into normalized-java-home-tests

This commit is contained in:
dotasek 2021-12-06 17:16:43 -05:00 committed by GitHub
commit 198d9092ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 14 additions and 14 deletions

View File

@ -1,3 +1,5 @@
Other changes:
* Fix trailing slashes for JAVA_HOME tests
* Fix trailing slashes for JAVA_HOME tests
* More import updates

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -1,7 +1,5 @@
package org.hl7.fhir.convertors.loaders.loaderR5;
import org.apache.http.auth.AuthScheme;
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -14,7 +14,7 @@
HAPI FHIR
-->
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.7-SNAPSHOT</version>
<version>5.6.7</version>
<packaging>pom</packaging>
<properties>