mirror of
https://github.com/hapifhir/hapi-fhir.git
synced 2025-03-01 01:29:16 +00:00
* One more fix for #4467 * Enabling massIngestionMode causes incomplete resource deletion (#4476) * Adding initial test. * Adding fix and subsequent test. * Adding changelog. --------- Co-authored-by: peartree <etienne.poirier@smilecdr.com> * Provide the capability to request that the name of the subscription matching channel be unqualified (#4464) * Adding initial test. * Adding initial solution implementation. * Adding change log and code clean up. * addressing comments from 1st code review. --------- Co-authored-by: peartree <etienne.poirier@smilecdr.com> * Change visibility of migration method (#4471) * change migration visibility * add empty migration method for 640 --------- Co-authored-by: nathaniel.doef <nathaniel.doef@smilecdr.com> * Fix subscription validation not to validate partition ID when invoked from an update pointcut (#4484) * First commit: Make SubscriptionValidatingInterceptor aware of which Pointcut is being called. In validatePermissions(), skip determinePartition() if the Pointcut is STORAGE_PRESTORAGE_RESOURCE_UPDATED. Fix resulting compile errors in various unit tests. * Fix/enhance unit tests. Mark methods as deprecated instead of deleting them. Add proper error code. Complete changelog. * Remove erroneous TODOs and tweak the validation logic. * Enhance unit tests and fix changelog. * Reindex batch job fails when processing deleted resources. (#4482) * adding changelog. * Providing solution and adding changelog. * Adding new test. --------- Co-authored-by: peartree <etienne.poirier@smilecdr.com> * cleaning up checkstyle files (#4470) * cleaning up checkstyle files * One more fix for #4467 (#4469) * added exlusions for files at base project level so checkstyle doesn't error out * duplicate error code from merge * changing lifecycle goal for all module checkstyle check * moving checkstyle to base pom file, changing exectution phase on base check, cleaning dependency, resolving duplicate error code * wip * trying to figure out why pipeline cannot copy files * removing modules that don't actually need to be built. * I messed up the version --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> * Bump core to 5.6.881 (#4496) * Bump core to 5.6.881-SNAPSHOT * Work on fixing tests * Work on fixing tests 2 * Bump to core release --------- Co-authored-by: dotasek <david.otasek@smilecdr.com> * Issue 4486 mdm inconsistent possible match score values (#4487) * Extract method for readability * Save always normalized score values in POSSIBLE_MATCH links. * Avoid setting properties to null values. Adjust test. * Simplify fix * Fix test. Add RangeTestHelper. --------- Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> * Revert "cleaning up checkstyle files (#4470)" This reverts commit efae3b5d5f397ab8fd92d7aaa82b484cfdfb3c33. * core version fix * Loosen rules for id helper * initial test implementation/changes and solution wiring. * adding support for jpa/mongo abstraction. * refact completed. need to start implementing scheduling of subscription re-submission with the scheduler service. * post release, merging in master. * wip: commit before merging in branch master. * wip: resuming work on the issue. * wip: before merging in master. * wip: partial implementation of mongo support. * wip: more work to support partial implementation on mongo. * Test implementation * providing method getMessageKeyOrDefault(); * providing changelog * preping codereview. * wip: passing tests * wip: finally solving the Meta issue. * wip: adjusting interfaces * Adding IT and * IT test; fixing rollback issue. * removing non required logging * fixing merge conflict * Preparing for code review. * Preparing for code review. * Compiling code after merging in master. * Fixing checkstyle failure. * Modifications towards getting all tests to pass. * addressing comments from code review. * compiling code after switching target merge branch to rel_pub_2023_05 * compiling code after switching target merge branch to rel_6_6 * Addressing comments made in design meeting. wip. * Addressing comments made in design meeting. finally completed. and last 2 comments addressed. * removing non required override * reverting changes as they are not required. * Modified test and implementation. * implementation of a SynchronousSubscriptionMatcherInterceptor to submit modifiedResources to the subscription pipeline for testing only. * fix tests by modifying the matchingInterceptor to call pointcut when processing * fixing more tests. * WIP to pass all tests in jpaserer-4504-a-resource-submitted-to-the-subscription-pipeline-is-lost-when-the-pipeline-encounters-an-issue * fixing circular dependency * Adding import dependency to class TestSubscriptionSubmitterConfig to allow submission of messages with the SynchronousSubscriptionMatcherInterceptor. * bumping version 6.7.7-SNAPSHOT * bumping HAPI version to 6.7.7-SNAPSHOT * fixing tests failure caused by asynch deliver of resourceModifiedMsg to the processing pipeline. * passing all tests. * unbumping to 6.7.7 * compiling after merging in master. * creating a custom hapi version * providing an synchronous subscription matcher interceptor for testing. * updating pom version to generate artifacts. * fixing tests, WIP/0 * fixing tests, WIP/1 * fixing tests, WIP/2 * Matching entity annotation with migration task declarations. * Moving AsynchResourceModified Scheduler and Submitter to hapi-fhir-storage. * Moving AsynchResourceModified Scheduler and Submitter to hapi-fhir-storage. * Reverting move of AsyncResourceModified[ProcessingSchedulerSvc|SubmitterSvc]. * Reverting move of AsyncResourceModified[ProcessingSchedulerSvc|SubmitterSvc] again. * Removing creation of new transaction to inflate PersistedRresourceModifiedMessages since it is already executing in a transaction. * bumping to version 6.7.14-ASYNC-SNAPSHOT for pipeline. * bumping hapi version to 6.7.14-ASYNC-SNAPSHOT for pipeline. * Formatter changes. * add generic * add generic * Addressing code review comments. * Adding file asynch_subscription_610.md to docs/upgrades * changing poms to 6.9.2-SNAPSHOT before merging in master. * compiling after merging in master. * Lowering logging level to debug. * Bumping to 6.9.3-SNAPSHOT * Bumping hapi version to 6.9.4-SNAPSHOT * Adding update documentation. * Modifying update file following review. --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: peartree <etienne.poirier@smilecdr.com> Co-authored-by: Nathan Doef <n.doef@protonmail.com> Co-authored-by: nathaniel.doef <nathaniel.doef@smilecdr.com> Co-authored-by: Luke deGruchy <luke.degruchy@smilecdr.com> Co-authored-by: Mark Iantorno <markiantorno@gmail.com> Co-authored-by: dotasek <dotasek.dev@gmail.com> Co-authored-by: dotasek <david.otasek@smilecdr.com> Co-authored-by: jmarchionatto <60409882+jmarchionatto@users.noreply.github.com> Co-authored-by: juan.marchionatto <juan.marchionatto@smilecdr.com> Co-authored-by: Tadgh <garygrantgraham@gmail.com> Co-authored-by: Ken Stevens <ken@smilecdr.com>
293 lines
8.3 KiB
XML
293 lines
8.3 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>6.9.4-SNAPSHOT</version>
|
|
|
|
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<artifactId>hapi-fhir-base</artifactId>
|
|
<packaging>bundle</packaging>
|
|
|
|
<url>http://jamesagnew.github.io/hapi-fhir/</url>
|
|
|
|
<name>HAPI FHIR - Core Library</name>
|
|
|
|
<dependencies>
|
|
|
|
<!-- IMPORTANT NOTE: This pom is used by multiple platforms (including Android) so please avoid adding any new
|
|
dependencies here. -->
|
|
|
|
<!-- JSON -->
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
</dependency>
|
|
<!-- XML -->
|
|
<dependency>
|
|
<groupId>com.fasterxml.woodstox</groupId>
|
|
<artifactId>woodstox-core</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!-- Only required for narrative generator support -->
|
|
<dependency>
|
|
<groupId>org.thymeleaf</groupId>
|
|
<artifactId>thymeleaf</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.javassist</groupId>
|
|
<artifactId>javassist</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!-- Only required for Schematron Validator Support -->
|
|
<dependency>
|
|
<groupId>com.helger</groupId>
|
|
<artifactId>ph-schematron</artifactId>
|
|
<optional>true</optional>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>org.glassfish.jaxb</groupId>
|
|
<artifactId>jaxb-core</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.helger</groupId>
|
|
<artifactId>ph-commons</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId>
|
|
<version>2.11.0</version> <optional>true</optional> </dependency> -->
|
|
|
|
<!-- General -->
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
</dependency>
|
|
|
|
<!-- JENA Dependencies - Used for Turtle encoding -->
|
|
<dependency>
|
|
<groupId>org.apache.jena</groupId>
|
|
<artifactId>jena-core</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.jena</groupId>
|
|
<artifactId>jena-arq</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-text</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>commons-codec</groupId>
|
|
<artifactId>commons-codec</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>commons-io</groupId>
|
|
<artifactId>commons-io</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
</dependency>
|
|
|
|
<!-- Logging -->
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>jcl-over-slf4j</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ch.qos.logback</groupId>
|
|
<artifactId>logback-classic</artifactId>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
|
|
<!-- @Nonnull annotation -->
|
|
<dependency>
|
|
<groupId>com.google.code.findbugs</groupId>
|
|
<artifactId>jsr305</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.awaitility</groupId>
|
|
<artifactId>awaitility</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>uk.org.webcompere</groupId>
|
|
<artifactId>system-stubs-jupiter</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<configuration>
|
|
<argLine>@{argLine} ${surefire_jvm_args}</argLine>
|
|
</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>
|
|
<DynamicImport-Package>*</DynamicImport-Package>
|
|
<Import-Package>
|
|
<!--required when using servers-->
|
|
ca.uhn.fhir.rest.api.server;resolution:=optional,
|
|
ca.uhn.fhir.model.api;resolution:=optional,
|
|
*
|
|
</Import-Package>
|
|
</instructions>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>buildnumber-maven-plugin</artifactId>
|
|
<inherited>true</inherited>
|
|
<executions>
|
|
<execution>
|
|
<id>standard</id>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>create</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>downstream</id>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>create-metadata</goal>
|
|
</goals>
|
|
<configuration>
|
|
<outputDirectory>${project.build.directory}/generated-sources/properties</outputDirectory>
|
|
<outputName>ca/uhn/fhir/hapi-fhir-base-build.properties</outputName>
|
|
<revisionPropertyName>hapifhir.buildnumber</revisionPropertyName>
|
|
<timestampPropertyName>hapifhir.timestamp</timestampPropertyName>
|
|
<timestampFormat>yyyy-MM-dd'T'HH:mm:ss.SXXX</timestampFormat>
|
|
<versionPropertyName>hapifhir.version</versionPropertyName>
|
|
<revisionOnScmFailure>UNKNOWN</revisionOnScmFailure>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-antrun-plugin</artifactId>
|
|
<version>1.8</version>
|
|
<configuration>
|
|
<target>
|
|
<!--suppress UnresolvedMavenProperty -->
|
|
<delete dir="${pom.basedir}/target/" includes="checkstyle*"/>
|
|
</target>
|
|
</configuration>
|
|
<inherited>true</inherited>
|
|
<executions>
|
|
<execution>
|
|
<id>delete-module-cache-file</id>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>run</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
<version>${maven_checkstyle_version}</version>
|
|
<configuration>
|
|
<!--suppress UnresolvedMavenProperty -->
|
|
<configLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml</configLocation>
|
|
<!--suppress UnresolvedMavenProperty -->
|
|
<suppressionsLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle-suppression.xml</suppressionsLocation>
|
|
<inputEncoding>UTF-8</inputEncoding>
|
|
<consoleOutput>true</consoleOutput>
|
|
</configuration>
|
|
<inherited>true</inherited>
|
|
<executions>
|
|
<execution>
|
|
<id>hapi-single-module-checkstyle</id>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>check</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
<artifactId>hapi-fhir-checkstyle</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.puppycrawl.tools</groupId>
|
|
<artifactId>checkstyle</artifactId>
|
|
<version>${checkstyle_version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</plugin>
|
|
</plugins>
|
|
<resources>
|
|
<resource>
|
|
<directory>src/main/resources</directory>
|
|
<filtering>true</filtering>
|
|
</resource>
|
|
<resource>
|
|
<directory>${project.build.directory}/generated-sources/properties</directory>
|
|
<filtering>false</filtering>
|
|
</resource>
|
|
</resources>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>CI</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
<dependencies>
|
|
<!-- dependencies required for Android -->
|
|
<dependency>
|
|
<groupId>xerces</groupId>
|
|
<artifactId>xercesImpl</artifactId>
|
|
<scope>provided</scope>
|
|
<optional>true</optional>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
</profiles>
|
|
|
|
</project>
|