mirror of
https://github.com/hapifhir/hapi-fhir.git
synced 2025-03-09 14:33:32 +00:00
ae67e7b55e
* step 1 * updated batch 2 framework with READY state * spotless * remove entity manager * spotless * fixing up more tests for batch2 * updating documentation * cleanup * removing checkstyle violation * code review points * review points continued * review poitns finished * updating tests * updates * spotless * updated * step 1 * updated * sketch out test cases * basic state transition shell work * typos * spotless * adding spy override * fixing tests * spotless * changing comment to complete build * fixing some tests and adding a view * adding different paging mechanism * spotless * waiting step 1 * commit changes * remove text * review fixes * spotless * some tweaks * updating documentation and adding change log * spotless * added documentation * review comments 1 * more review fixes * spotless * fixing bug * fixing path * spotless * update state diagram * review points round 1 * revert * updating diag * review fixes round 2 * spotless * - Implemented GATE_WAITING state for the batch2 state machine. - This will be the initial status for all workchunks of a gated job. - made compatible with the equivalent "fake QUEUED" state in the Old batch2 implementation. - Updated corresponding docs. - added corresponding tests and changelog * Revert "- Implemented GATE_WAITING state for the batch2 state machine." This reverts commit 32a00f4b8169a11849611798adfd48138908e49c. * - Implemented GATE_WAITING state for the batch2 state machine. - This will be the initial status for all workchunks of a gated job. - made compatible with the equivalent "fake QUEUED" state in the Old batch2 implementation. - Updated corresponding docs. - added corresponding tests and changelog * fixing a bug * spotless * fixing * - fix merges conflicts - set first chunk to be always created in READY * - have only one path through the equeueReady method - fixed tests * - hid the over-powered transition function behind a proper state action * spotless * resolved review comments * fixing tests * resolved review comments * resolved review comments * resolved review comments * resolved review comments * resolved review comments * updating migration script number * fixed bugs * spotless * fix test high concurrency * fixing a test * code fix * fixing tests in bulkexportit * fixing tests * fixing tests * cleanup * completed instance will not be sent to the reduction step service * Revert "completed instance will not be sent to the reduction step service" This reverts commit aa149b669181f25f9262cb871627d7ec59369e5f. * Revert "Revert "completed instance will not be sent to the reduction step service"" This reverts commit e18f5796a165029d693bc5b6e0d882e429072d4e. * removing dead code * changed db query for step advance to take statuses as parameter instead * test fixes * spotless * test fix * spotless * fixing tests * migration fix * fixing test * testing pipeline with `testGroupBulkExportNotInGroup_DoesNotShowUp` disabled * fixing some tests * Add new race test for simultaneous queue/dequeue * re-enabling `testGroupBulkExportNotInGroup_DoesNotShowUp` * cascade tag deletes * test fixes * some logging * a test case * adding job id * more test code * marking purge checks * test fix * testing * pausing schedulers on cleanup * adding a wait * max thread count guarantee * fixing the tests again * removing dead code * spotless * checking * msg codes: * Fixing a test * review points * spotless * required pom values * step 1 of reduction ready * update * reductoin ready * annother test * spotless * cleanup * cleanup * simplifying check in reduction step * review fixes * updating version * using 7.3.1 * adding check * test finessing --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-mbp.home> Co-authored-by: Michael Buckley <michaelabuckley@gmail.com> Co-authored-by: tyner <tyner.guo@smilecdr.com>
370 lines
9.7 KiB
XML
370 lines
9.7 KiB
XML
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
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>7.3.1-SNAPSHOT</version>
|
|
|
|
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<artifactId>hapi-fhir-structures-r4</artifactId>
|
|
<packaging>bundle</packaging>
|
|
|
|
<properties>
|
|
<shexjava_version>1.3beta</shexjava_version>
|
|
</properties>
|
|
|
|
<name>HAPI FHIR Structures - FHIR R4</name>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
<artifactId>okhttp</artifactId>
|
|
<optional>true</optional>
|
|
</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.r4</artifactId>
|
|
<version>${fhir_core_version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-caching-api</artifactId>
|
|
<version>${project.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>
|
|
|
|
<!--
|
|
Optional dependencies from RI codebase
|
|
-->
|
|
<dependency>
|
|
<groupId>com.fasterxml.woodstox</groupId>
|
|
<artifactId>woodstox-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>es.nitaur.markdown</groupId>
|
|
<artifactId>txtmark</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.antlr</groupId>
|
|
<artifactId>ST4</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.ogce</groupId>
|
|
<artifactId>xpp3</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
|
|
<!--
|
|
Test dependencies on other optional parts of HAPI
|
|
-->
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
|
|
<version>${project.version}</version>
|
|
<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>
|
|
<dependency>
|
|
<groupId>jakarta.servlet</groupId>
|
|
<artifactId>jakarta.servlet-api</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.jena</groupId>
|
|
<artifactId>apache-jena-libs</artifactId>
|
|
<optional>true</optional>
|
|
<type>pom</type>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>com.github.jsonld-java</groupId>
|
|
<artifactId>jsonld-java</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>fr.inria.lille.shexjava</groupId>
|
|
<artifactId>shexjava-core</artifactId>
|
|
<version>${shexjava_version}</version>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<!-- If this is included it confused the RDFParser -->
|
|
<exclusion>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-rdf-jena</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<artifactId>xml-apis</artifactId>
|
|
<groupId>xml-apis</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.helger.commons</groupId>
|
|
<artifactId>ph-collection</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!--
|
|
Optional dependencies used by org.hl7.fhir.r4
|
|
We include these here to get the aggregate JavaDoc to work
|
|
-->
|
|
<dependency>
|
|
<groupId>org.apache.poi</groupId>
|
|
<artifactId>ooxml-schemas</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.poi</groupId>
|
|
<artifactId>poi</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.poi</groupId>
|
|
<artifactId>poi-ooxml</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.poi</groupId>
|
|
<artifactId>poi-ooxml-schemas</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
<groupId>com.google.code.gson</groupId>
|
|
<artifactId>gson</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>jakarta.annotation</groupId>
|
|
<artifactId>jakarta.annotation-api</artifactId>
|
|
</dependency>
|
|
|
|
<!-- Testing -->
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-caching-testing</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.xmlunit</groupId>
|
|
<artifactId>xmlunit-core</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>
|
|
<dependency>
|
|
<groupId>org.awaitility</groupId>
|
|
<artifactId>awaitility</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-context</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-web</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<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.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
</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.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.apache.maven.plugins</groupId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<configuration>
|
|
<includeDependencySources>true</includeDependencySources>
|
|
<dependencySourceIncludes>
|
|
<include>ca.uhn.hapi.fhir:org.hl7.fhir.r4</include>
|
|
</dependencySourceIncludes>
|
|
<additionalDependencies>
|
|
<dependency>
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
<artifactId>okhttp</artifactId>
|
|
<version>${okhttp_version}</version>
|
|
</dependency>
|
|
</additionalDependencies>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>DIST</id>
|
|
<dependencies>
|
|
<!-- When we're building a DIST, make sure that the javadocs for fhir_core are available -->
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>org.hl7.fhir.r4</artifactId>
|
|
<classifier>javadoc</classifier>
|
|
<scope>provided</scope>
|
|
<version>${fhir_core_version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
<profile>
|
|
<id>CI</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
</profiles>
|
|
|
|
</project>
|