mirror of
https://github.com/hapifhir/hapi-fhir.git
synced 2025-03-01 17:49:21 +00:00
9753b66610
* First cut at multithreading bundle validation * javadoc * change test to a red-green test * add daoconfig * move bundle concurrency config from validationsupport to request validator * Moved concurrent details from ValidationOptions to FhirValidator * Remove bundleValidationThreadCount (it's set by creating an appropriate executor) * validate threadpool prefixes * FIXME cleanup * reassign FIXMEs to JB * only create the threadpool if it will be used * Add the MdcTaskDectorator to all threadpools * Add bundle path to concurrently validated bundle resource validation messages. * Add test to check bundle entry path being added to validation messages * Threaded validation of contained resources initial checkin * FHIR validator refactored to maintain correct bundle path and async validation task * Refactored to use validation complete invoke callback to support raw string resource or resource object * switch from XML to JSON * # Conflicts: # hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java # hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java * Updated to use new HAPI-FHIR version * merge 'validate_contains_change' into issue-3144-multi-threaded-bundle-validation * Updated to use new HAPI-FHIR version * Revert "Updated to use new HAPI-FHIR version" This reverts commit 910b7f676bd3b0bac6603abf758b09f6af819a55. * Revert "merge 'validate_contains_change' into issue-3144-multi-threaded-bundle-validation" This reverts commit c7d60fc3e6a560d6263a39ca13469e51a8f5d155. * Revert "Updated to use new HAPI-FHIR version" This reverts commit aa8a7af45553f0b3f9ef0a697c0c88b8a8249f5a. # Conflicts: # hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java * Fix Test dependencies after reverting changes. * merge 'validate_contains_change' to 2564-contained-resource-validation-flag * Disable threadpool prefix name validate check. * merge master * fix thread regexp * pre-review cleanup * change log * fix test * revert to XML as default validation serialization * fix test * fix test Co-authored-by: Jaison B <jaisonb@gmail.com>
342 lines
9.5 KiB
XML
342 lines
9.5 KiB
XML
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
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>5.7.0-PRE5-SNAPSHOT</version>
|
|
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<artifactId>hapi-fhir-structures-dstu3</artifactId>
|
|
<packaging>bundle</packaging>
|
|
|
|
<name>HAPI FHIR Structures - DSTU3</name>
|
|
|
|
<reporting>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<configuration>
|
|
<show>public</show>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</reporting>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.felix</groupId>
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
<extensions>true</extensions>
|
|
<configuration>
|
|
<instructions>
|
|
<_nouses>true</_nouses>
|
|
<_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
|
|
<!-- No need to disable normal OSGi class loading
|
|
<Fragment-Host>
|
|
ca.uhn.hapi.fhir.hapi-fhir-base
|
|
</Fragment-Host>
|
|
-->
|
|
</instructions>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.jacoco</groupId>
|
|
<artifactId>jacoco-maven-plugin</artifactId>
|
|
<configuration>
|
|
<classFolders>
|
|
<classFolder>${basedir}/target/classes</classFolder>
|
|
<classFolder>${basedir}/../hapi-fhir-base/target/classes</classFolder>
|
|
<classFolder>${basedir}/../hapi-fhir-client/target/classes</classFolder>
|
|
<classFolder>${basedir}/../hapi-fhir-server/target/classes</classFolder>
|
|
</classFolders>
|
|
<sourceFolders>
|
|
<sourceFolder>${basedir}/src/main/java</sourceFolder>
|
|
<sourceFolder>${basedir}/../hapi-fhir-base/src/main/java</sourceFolder>
|
|
<sourceFolder>${basedir}/../hapi-fhir-client/src/main/java</sourceFolder>
|
|
<sourceFolder>${basedir}/../hapi-fhir-server/src/main/java</sourceFolder>
|
|
</sourceFolders>
|
|
<dumpOnExit>true</dumpOnExit>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<id>default-prepare-agent</id>
|
|
<goals>
|
|
<goal>prepare-agent</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<configuration>
|
|
<argLine>@{argLine} ${surefire_jvm_args}</argLine>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>license-maven-plugin</artifactId>
|
|
<configuration>
|
|
<!-- Don't add UHN licenses to RI structures -->
|
|
<skipUpdateLicense>true</skipUpdateLicense>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<configuration>
|
|
<includeDependencySources>true</includeDependencySources>
|
|
<dependencySourceIncludes>
|
|
<include>ca.uhn.hapi.fhir:org.hl7.fhir.dstu3</include>
|
|
</dependencySourceIncludes>
|
|
<additionalDependencies>
|
|
<dependency>
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
<artifactId>okhttp</artifactId>
|
|
<version>${okhttp_version}</version>
|
|
</dependency>
|
|
</additionalDependencies>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
<artifactId>okhttp</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-base</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>org.hl7.fhir.utilities</artifactId>
|
|
<version>${fhir_core_version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>org.hl7.fhir.dstu3</artifactId>
|
|
<version>${fhir_core_version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.fhir</groupId>
|
|
<artifactId>ucum</artifactId>
|
|
<optional>true</optional>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>junit</groupId>
|
|
<artifactId>junit</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<!--
|
|
Test dependencies on other optional parts of HAPI
|
|
-->
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.woodstox</groupId>
|
|
<artifactId>woodstox-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-client</artifactId>
|
|
<version>${project.version}</version>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-server</artifactId>
|
|
<version>${project.version}</version>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!--
|
|
The JPA project uses a newer API but we'll try to hold to this version
|
|
as much as possible. See #283.
|
|
-->
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<version>3.1.0</version>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!--
|
|
Android includes an old version of commons-codec, so
|
|
we compile against the old version to make sure we can compile
|
|
against it
|
|
-->
|
|
<dependency>
|
|
<groupId>commons-codec</groupId>
|
|
<artifactId>commons-codec</artifactId>
|
|
<version>1.1</version>
|
|
</dependency>
|
|
|
|
<!--
|
|
Gson is needed for some utility classes in org.hl7.fhir.dstu3, so
|
|
this is necessary for the JavaDocs to build
|
|
-->
|
|
<dependency>
|
|
<groupId>com.google.code.gson</groupId>
|
|
<artifactId>gson</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>xpp3</groupId>
|
|
<artifactId>xpp3</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.antlr</groupId>
|
|
<artifactId>ST4</artifactId>
|
|
<version>4.1</version>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!-- Used by the validator -->
|
|
<dependency>
|
|
<groupId>com.github.ben-manes.caffeine</groupId>
|
|
<artifactId>caffeine</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
|
|
<!-- Testing -->
|
|
<dependency>
|
|
<groupId>org.xmlunit</groupId>
|
|
<artifactId>xmlunit-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-servlets</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-servlet</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-server</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-util</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-webapp</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-http</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ch.qos.logback</groupId>
|
|
<artifactId>logback-classic</artifactId>
|
|
<optional>true</optional>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.thymeleaf</groupId>
|
|
<artifactId>thymeleaf</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-test-utilities</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- Dependencies for Schematron -->
|
|
<dependency>
|
|
<groupId>com.helger</groupId>
|
|
<artifactId>ph-schematron</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.helger</groupId>
|
|
<artifactId>ph-commons</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.activation</groupId>
|
|
<artifactId>javax.activation-api</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- UNIT TEST DEPENDENCIES -->
|
|
<dependency>
|
|
<groupId>net.sf.json-lib</groupId>
|
|
<artifactId>json-lib</artifactId>
|
|
<classifier>jdk15</classifier>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<exclusion>
|
|
<artifactId>commons-logging</artifactId>
|
|
<groupId>commons-logging</groupId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<artifactId>commons-lang</artifactId>
|
|
<groupId>commons-lang</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>net.sf.json-lib</groupId>
|
|
<artifactId>json-lib</artifactId>
|
|
<classifier>jdk15-sources</classifier>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<exclusion>
|
|
<artifactId>commons-logging</artifactId>
|
|
<groupId>commons-logging</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>directory-naming</groupId>
|
|
<artifactId>naming-java</artifactId>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<exclusion>
|
|
<artifactId>commons-logging</artifactId>
|
|
<groupId>commons-logging</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-web</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
</project>
|