This commit is contained in:
Grahame Grieve 2019-01-18 04:55:00 +11:00
commit ebd07775a7
21 changed files with 337 additions and 120 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,29 +21,29 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>
<!-- FHIR Versions -->
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2016may</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r4</artifactId>
<version>${project.version}</version>
</dependency>

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* org.hl7.fhir.convertors
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,7 +21,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,7 +21,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,7 +21,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.dstu3.conformance;
/*-
* #%L
* org.hl7.fhir.dstu3
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.dstu3.model;
/*-
* #%L
* org.hl7.fhir.dstu3
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import org.hl7.fhir.exceptions.FHIRException;
public class Enumerations {

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,7 +21,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.context;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.elementmodel;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.elementmodel;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.model;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import org.hl7.fhir.exceptions.FHIRException;
public class Enumerations {

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.model;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.Map;
import org.hl7.fhir.r4.utils.FHIRPathEngine;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.terminologies;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.context.IWorkerContext;
import org.hl7.fhir.r4.model.CanonicalType;

View File

@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
package org.hl7.fhir.r4.test.misc;
package org.hl7.fhir.r4.test.utils;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.utils;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import org.hl7.fhir.r4.model.Coding;
public class CodingUtilities {

View File

@ -1,5 +1,25 @@
package org.hl7.fhir.r4.utils;
/*-
* #%L
* org.hl7.fhir.r4
* %%
* Copyright (C) 2014 - 2019 Health Level 7
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.util.List;
import org.hl7.fhir.r4.model.Bundle;

View File

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

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -21,35 +21,35 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.convertors</artifactId>
<version>${project.version}</version>
</dependency>
<!-- FHIR Versions -->
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2016may</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hl7.fhir</groupId>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r4</artifactId>
<version>${project.version}</version>
</dependency>

191
pom.xml
View File

@ -2,16 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<!--<parent>-->
<!--<groupId>ca.uhn.hapi.fhir</groupId>-->
<!--<artifactId>hapi-deployable-pom</artifactId>-->
<!--<version>3.7.0-SNAPSHOT</version>-->
<!--</parent>-->
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>3.7.0-SNAPSHOT</version>
</parent>
<groupId>org.hl7.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.0</version>
<packaging>pom</packaging>
<name>HL7 Core Artifacts</name>
@ -114,95 +111,95 @@
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
<!--<plugin>-->
<!--<groupId>org.basepom.maven</groupId>-->
<!--<artifactId>duplicate-finder-maven-plugin</artifactId>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>default</id>-->
<!--<phase>verify</phase>-->
<!--<goals>-->
<!--<goal>check</goal>-->
<!--</goals>-->
<!--<inherited>true</inherited>-->
<!--</execution>-->
<!--</executions>-->
<!--<configuration>-->
<!--<printEqualFiles>false</printEqualFiles>-->
<!--<failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>-->
<!--<failBuildInCaseOfEqualContentConflict>true</failBuildInCaseOfEqualContentConflict>-->
<!--<failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>-->
<!--<checkCompileClasspath>true</checkCompileClasspath>-->
<!--<checkRuntimeClasspath>false</checkRuntimeClasspath>-->
<!--<checkTestClasspath>false</checkTestClasspath>-->
<!--<skip>false</skip>-->
<!--<quiet>false</quiet>-->
<!--<preferLocal>true</preferLocal>-->
<!--<useResultFile>true</useResultFile>-->
<!--<resultFileMinClasspathCount>2</resultFileMinClasspathCount>-->
<!--<resultFile>${project.build.directory}/duplicate-finder-result.xml</resultFile>-->
<!--<ignoredDependencies>-->
<!--<dependency>-->
<!--<groupId>javax.el</groupId>-->
<!--<artifactId>javax.el-api</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>javax.mail</groupId>-->
<!--<artifactId>javax.mail-api</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>javax.activation</groupId>-->
<!--<artifactId>javax.activation-api</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.helger</groupId>-->
<!--<artifactId>ph-schematron</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>commons-logging</groupId>-->
<!--<artifactId>commons-logging</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.jscience</groupId>-->
<!--<artifactId>jscience</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-jcl</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-jcl</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.google.code.findbugs</groupId>-->
<!--<artifactId>annotations</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.derby</groupId>-->
<!--<artifactId>derbyclient</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.derby</groupId>-->
<!--<artifactId>derbynet</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.derby</groupId>-->
<!--<artifactId>derbyclient</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.poi</groupId>-->
<!--<artifactId>ooxml-schemas</artifactId>-->
<!--</dependency>-->
<!--</ignoredDependencies>-->
<!--<ignoredResourcePatterns>-->
<!--<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>-->
<!--<ignoredResource>javac.bat</ignoredResource>-->
<!--<ignoredResource>about.html</ignoredResource>-->
<!--<ignoredResource>changelog.xml</ignoredResource>-->
<!--</ignoredResourcePatterns>-->
<!--</configuration>-->
<!--</plugin>-->
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>default</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<inherited>true</inherited>
</execution>
</executions>
<configuration>
<printEqualFiles>false</printEqualFiles>
<failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
<failBuildInCaseOfEqualContentConflict>true</failBuildInCaseOfEqualContentConflict>
<failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
<checkCompileClasspath>true</checkCompileClasspath>
<checkRuntimeClasspath>false</checkRuntimeClasspath>
<checkTestClasspath>false</checkTestClasspath>
<skip>false</skip>
<quiet>false</quiet>
<preferLocal>true</preferLocal>
<useResultFile>true</useResultFile>
<resultFileMinClasspathCount>2</resultFileMinClasspathCount>
<resultFile>${project.build.directory}/duplicate-finder-result.xml</resultFile>
<ignoredDependencies>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-schematron</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jscience</groupId>
<artifactId>jscience</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId>
</dependency>
</ignoredDependencies>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
<ignoredResource>javac.bat</ignoredResource>
<ignoredResource>about.html</ignoredResource>
<ignoredResource>changelog.xml</ignoredResource>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>