hapi-fhir/hapi-fhir-storage/pom.xml

190 lines
5.4 KiB
XML
Raw Normal View History

2020-04-02 20:30:19 -04:00
<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>7.7.0-SNAPSHOT</version>
2020-04-02 20:30:19 -04:00
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
<artifactId>hapi-fhir-storage</artifactId>
2020-04-02 20:30:19 -04:00
<packaging>jar</packaging>
<name>HAPI FHIR Storage api</name>
<description>This project provides services useful for fhir repository storage. Actual repository storage services
are not in this project, just the api and helper libraries.
</description>
2020-04-02 20:30:19 -04:00
<dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r5</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-caching-api</artifactId>
<version>${project.version}</version>
</dependency>
<!-- TODO KHS remove jpa stuff from here -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-searchparam</artifactId>
<version>${project.version}</version>
2020-04-02 20:30:19 -04:00
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-test-utilities</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
2020-04-02 20:30:19 -04:00
<dependency>
Replacing Hibernate Search 5 with Hibernate Search 6 (#2190) * Beginning work on converting to hibernate search 6 * replace all out of date properties * replace all POM references to old versions * remove the shaded ES jars as HS6 supports 7.9 * Convert "Bridges" to RoutingBinder and RoutingBridge * Modernize all indexing annotations * Begin refactoring of search queries (wip) * Fix spatial API changes, work on BaseTermReadSvcImpl * Most of the way through the various filter property conversions * Finished i think with BaseTermReadSvcImpl * Compiling, but definitely broken * Start test compilation failures * All tests compiling (i think) * remove suggest keywords operation * Fix bootstrap errors, still have to deal with transient fields * Rollback CR * More refactoring, got IDs baked back into docs * Fix coord util, fix a few more fields which require projection * merge fixes * begin refactor of valuesetexpansion tests * fix another test * Update tests * remove todos, add TestContainers * Fix descendant in * Add testcontainers, fix another test * fix more tests, replace embedded es * Rip out embedded elastic, replace with TestContainer * merge conflicts for new analyzers * Bump to CR2 for hibernate search 6. Add forgotten CLI dep. Add backwards compatible codecs * Remove dead deps, update testcontainer * Remove java-hamcrest * Pull asserts up, refactor tests to pass in RP tests * Update V2 check * Remove suggest keyword tests * Split line for testing * Fix perhaps one of the dumbest programming mistakes in my career so far * Refactor tests which no longer rely on a strict known order * Fix up test config, disable log test temporarily * Remove log4j from being transitively pulled in. re-enable test * Update log4j exclusions with new bridge. Update test to check for core class * Move dependency to root pom in dep management section * Update changelog, add changelog for HS6 with ES requirements. Remove dead comment * update testst, remove todos * Add hibernate props provider method, add elastic regexp query * Add todo for high level client builder * Modify ElasticsearchRestClientFactory to support HTTPS hosts * Remove protocol extraction from rest url * do we even need to index this...? * remove purge of non-indexed resources * Add longer timeout to testcontainers * Add task to add docker CLI to azure pipeline via task, for testcontainers * WIP remove this * Dont update version * Add test for duplicate termconcepts * Use real hibernate ORM methods * merge issues * Add partitionsettigns bean to match master * Trying to debug testcontainers on azure... * Trying to debug testcontainers on azure... * Run even on previous failure * Fix testcontainer port binds * Add full text logs attaching, and test reporting * I love yaml * Remove comment * Refactor delta remove to not do a once-over traversal and flatten all children pre-delete. Resolves transaction commit boundary issue * Modify TX beheaviour * wip * Rework to use config and mocked beans for partition-aware lastN * rework to not use beans and just inject vars i need for test, keps test envs cleaner * update azure pipeline to only copy test results * Remove erroneous publish * Always get test logs * Make it so indexing works, * Add todos * revert deleteByPid * Work on test fixes * Test fixes * Test fixes * Another test fix * Test fix * Work on tests * Test fixes * All tests passing locally * Fix test failure * FIx build error * Rename usages of HibernateDialectProvider -> HibernatePropertiesProvider * Update ngram of token filters * Tidying * subvert the purpose of hibernate elastic props builder to inject template * dead space * Rename changed class Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-05 17:56:59 -05:00
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm</artifactId>
Replacing Hibernate Search 5 with Hibernate Search 6 (#2190) * Beginning work on converting to hibernate search 6 * replace all out of date properties * replace all POM references to old versions * remove the shaded ES jars as HS6 supports 7.9 * Convert "Bridges" to RoutingBinder and RoutingBridge * Modernize all indexing annotations * Begin refactoring of search queries (wip) * Fix spatial API changes, work on BaseTermReadSvcImpl * Most of the way through the various filter property conversions * Finished i think with BaseTermReadSvcImpl * Compiling, but definitely broken * Start test compilation failures * All tests compiling (i think) * remove suggest keywords operation * Fix bootstrap errors, still have to deal with transient fields * Rollback CR * More refactoring, got IDs baked back into docs * Fix coord util, fix a few more fields which require projection * merge fixes * begin refactor of valuesetexpansion tests * fix another test * Update tests * remove todos, add TestContainers * Fix descendant in * Add testcontainers, fix another test * fix more tests, replace embedded es * Rip out embedded elastic, replace with TestContainer * merge conflicts for new analyzers * Bump to CR2 for hibernate search 6. Add forgotten CLI dep. Add backwards compatible codecs * Remove dead deps, update testcontainer * Remove java-hamcrest * Pull asserts up, refactor tests to pass in RP tests * Update V2 check * Remove suggest keyword tests * Split line for testing * Fix perhaps one of the dumbest programming mistakes in my career so far * Refactor tests which no longer rely on a strict known order * Fix up test config, disable log test temporarily * Remove log4j from being transitively pulled in. re-enable test * Update log4j exclusions with new bridge. Update test to check for core class * Move dependency to root pom in dep management section * Update changelog, add changelog for HS6 with ES requirements. Remove dead comment * update testst, remove todos * Add hibernate props provider method, add elastic regexp query * Add todo for high level client builder * Modify ElasticsearchRestClientFactory to support HTTPS hosts * Remove protocol extraction from rest url * do we even need to index this...? * remove purge of non-indexed resources * Add longer timeout to testcontainers * Add task to add docker CLI to azure pipeline via task, for testcontainers * WIP remove this * Dont update version * Add test for duplicate termconcepts * Use real hibernate ORM methods * merge issues * Add partitionsettigns bean to match master * Trying to debug testcontainers on azure... * Trying to debug testcontainers on azure... * Run even on previous failure * Fix testcontainer port binds * Add full text logs attaching, and test reporting * I love yaml * Remove comment * Refactor delta remove to not do a once-over traversal and flatten all children pre-delete. Resolves transaction commit boundary issue * Modify TX beheaviour * wip * Rework to use config and mocked beans for partition-aware lastN * rework to not use beans and just inject vars i need for test, keps test envs cleaner * update azure pipeline to only copy test results * Remove erroneous publish * Always get test logs * Make it so indexing works, * Add todos * revert deleteByPid * Work on test fixes * Test fixes * Test fixes * Another test fix * Test fix * Work on tests * Test fixes * All tests passing locally * Fix test failure * FIx build error * Rename usages of HibernateDialectProvider -> HibernatePropertiesProvider * Update ngram of token filters * Tidying * subvert the purpose of hibernate elastic props builder to inject template * dead space * Rename changed class Co-authored-by: jamesagnew <jamesagnew@gmail.com>
2021-01-05 17:56:59 -05:00
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
2020-04-02 20:30:19 -04:00
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
2020-04-02 20:30:19 -04:00
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jscience</groupId>
<artifactId>jscience</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
2020-04-02 20:30:19 -04:00
</dependency>
<dependency>
Jakarta/Javax Servlet Migration (#5429) * Servlet migrsation changes * Apply spotless * Work on migration * Start working on JPA migration * Test fixes * Test fixes * Test fixes * Work * Work on servlet migration * Work on migration * Work on fixes * Imports fix * Work on tests * Test fix * All tests passing * Work on migration * Schema generator * Refactor ID strategy * Some test fixes * Test fixes * API additions * Work on websockets * Test fixe * Version bump * Work on migration * All tests have passed! * Work on test fixes * Fixes * Work on fixes * CDR fix * Work on migration * Fixes * Spotless * Disable onetoone ban * Adjust migratyions * Transaction service fix * Add tinyint to migrator * Work * Migration * Compile fix * Add license * Test fix * Test fix * Cleanup * Cleanup attempt * Test fix * Reslve fixmes * Remove legacy lastn implementation * Test cleanup * Cleanup * Remove dead import * Bad import setups * Review comments * Review fixes * Build fix * Test fix * Spotless * Account for CR changes * Compile fixes * Rollback one change * Test tweak * License header * Test fix * Test fix part 2: * Clean up tx isolation * Spotless * Spotless apply * Drop min SQL Server level * Attempted test fix * Test fix * Test fix * Test fix * Bump hibernate * Test fix * Test fixes * Test fixes * Test fixes * Test cleanup * One more test fix * Test fix * Try to fix test * Clean up expunge * Test fix * Remove unneeded task * Spotless * Bump compiler plugin * Spotless * Compile fix * Add license headers * License header * Test fixes * Bump animal sniffer * Spotless * Bump Jetty version * Test fix and version bump * Cleanup --------- Co-authored-by: Tadgh <garygrantgraham@gmail.com>
2023-12-03 11:15:37 -05:00
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
2020-04-02 20:30:19 -04:00
<!-- test dependencies -->
2020-04-02 20:30:19 -04:00
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.dnault</groupId>
<artifactId>xml-patch</artifactId>
</dependency>
<dependency>
<groupId>io.dogote</groupId>
<artifactId>json-patch</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-caching-caffeine</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Core library bump 6.3.11 (#5772) * Bump to core 6.2.6 + fix compilation errors * Fix signature error * Error ordering * WIP 1 Fixing failing tests * Fix FhirInstanceValidatorR4Test * Fix FhirInstanceValidatorR5Test * Fix FhirInstanceValidatorR4BTest * Fix FhirInstanceValidatorDstu3Test.testValidateBuiltInProfiles() * WIP Fix FhirInstanceValidatorDstu3Test * Fix isPrimitiveType * Add placeholder narratives to ServerCapabilityStatement * Fix QuestionnaireResponseValidatorR4Test * Newline cleanup * Fix QuestionnaireResponseValidatorDstu3Test * Fix QuestionnaireResponseValidatorR5Test * Increase expected error messages by two because VALIDATION_HL7_WG_NEEDED New validation requirement as of 2023-09-16 * Add placeholder fix for Balp narrative * Fix expected validation messages * Fix more expected validation messages * Don't generate a master IPS narrative * Fix IPS generation tests expecting old composition narrative * Update fhir core and clinical-reasoning * Remove commented code * Bump to core 6.2.16-SNAPSHOT * Add missing methods * Add missing methods 2 * Fix error codes * Fix error code * Fix failing tests for Unsupported method 2488 * Fix error text * Fix another expected error message * Apply spotless * Fix error strings * Add minimal implementation to fix failing test * Fix error message * Fix some validation tests (r4) * Fix more R5 tests * Update for changing API * Fix some R4B test failures * Fix android incompatibility * Fix more tests * Switch back to LF * Fix more tests 2 * Fix R4 IPS generation use of relative references, switch to random UUID * Fix missing codes and patient ID in IPS test * Fix missing codes in IPS R4 Test 2 * Fix display value * Fix display value * Reorg wrapper issue collection; fixes errors with Balp and others * Update for API changes * Fix code set typo causing test failure * Fix DiffProviderR4Test * Fix RepositoryValidatingInterceptorHttpR4Test fails due to stricter code validation * More code fixes * Don't expect an extra error. * Use more specific logic for details tx code * Catch expected error * Clean up * Account for HAPI isEnabledValidationForCodingsLogicalAnd cases * Apply spotless * Change outputs for en_US single code test * Add missing system from code to pass validation * Account for DSTU3 and R4 including different code systems for race * Add expected loinc codes to test dao * Add some codesystem support for test * Bump core version * WIP pass on a list of CodeValidationIssue from CodeValidationResults * Re-use v2 and v3 data from r4 in r4b * CodeSystems can be supported, but not have a resource * Remove hack around unitsofmeasure + return false LookupCodeResult * Clean up chatter. * Update test cases, remove FIXME * Stop returning before adding all issues to ValidationResults * Update for changes in core API * Add severity to code issues + return to unknown system support * Use new CollectionUtils * Fix more issue messages and orders + null in TermReadSvcImpl * After checking valueSet, also check codeSystem * On second thought, always check the codesystem * Improve validation message * Refactor * Add error consistent with core validator results * Decrement query counts for validation * Improve code validation messages + don't miss invalid display on cs * Fix expected messages (added code details) * More expected message fixes * Remove redundant text from diagnostics + match core exception handling * Explicitly send tx passthrough messages no longer managed in core * Apply spotless * Add issue to code validation in TermReadSvcImpl * Adjust indexes of expected errors now that TermReadSvc is reporting * Bump to released core version * Code cleanup: commented code * More commented code cleanup * Fix parameter names * Use Set.of and List.of + fix duplicate values in set * Revert animal sniffed breakage, make field private * Add comments to describe disabled test * Remove System.out chatter * Fix javadoc generation for r5 structures module * More comments and move disabled annotation It was working when it left the shop. * Move older changelog into 7.4.0 and create core update changelog * Switch changelog type to change * Bump HAPI version * Add validation utils for FATAL issue severity * Handle FATAL codeValidationIssue severity * Fix test (validation throws more warnings) * Bump to version 7.3.4-SNAPSHOT * Bump to SNAPSHOT version of core + add necessary method implementations * Add comments to explain R4 terminology resources in R4B * Add test for Observation vital signs profile validation * Try using default validatorPolicyAdvisor * Return an empty set for fetchCanonicalResourceVersions * Profile now gives more explicit error instead of valueSet * Revert commit * Add CodeValidationIssues and additional error info * Do not return first successful match from codings. Check all. + adjust for extra errors. * apply spotless * Fix failing test, add comments re: invocations * Fix test to expect more informative error * Fix stray compilation errors from merge. * Fix merge overwrite of validation messages and indices * Fix merge overwrite of new validation results * Use core release 6.3.11 * Update HAPI version to 7.3.5-SNAPSHOT * Fix changelog * Remove commented code --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: volodymyr <volodymyr.korzh@smilecdr.com>
2024-06-12 13:24:26 -04:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r5</artifactId>
<version>${fhir_core_version}</version>
</dependency>
2020-04-02 20:30:19 -04:00
Core library bump 6.3.11 (#5772) * Bump to core 6.2.6 + fix compilation errors * Fix signature error * Error ordering * WIP 1 Fixing failing tests * Fix FhirInstanceValidatorR4Test * Fix FhirInstanceValidatorR5Test * Fix FhirInstanceValidatorR4BTest * Fix FhirInstanceValidatorDstu3Test.testValidateBuiltInProfiles() * WIP Fix FhirInstanceValidatorDstu3Test * Fix isPrimitiveType * Add placeholder narratives to ServerCapabilityStatement * Fix QuestionnaireResponseValidatorR4Test * Newline cleanup * Fix QuestionnaireResponseValidatorDstu3Test * Fix QuestionnaireResponseValidatorR5Test * Increase expected error messages by two because VALIDATION_HL7_WG_NEEDED New validation requirement as of 2023-09-16 * Add placeholder fix for Balp narrative * Fix expected validation messages * Fix more expected validation messages * Don't generate a master IPS narrative * Fix IPS generation tests expecting old composition narrative * Update fhir core and clinical-reasoning * Remove commented code * Bump to core 6.2.16-SNAPSHOT * Add missing methods * Add missing methods 2 * Fix error codes * Fix error code * Fix failing tests for Unsupported method 2488 * Fix error text * Fix another expected error message * Apply spotless * Fix error strings * Add minimal implementation to fix failing test * Fix error message * Fix some validation tests (r4) * Fix more R5 tests * Update for changing API * Fix some R4B test failures * Fix android incompatibility * Fix more tests * Switch back to LF * Fix more tests 2 * Fix R4 IPS generation use of relative references, switch to random UUID * Fix missing codes and patient ID in IPS test * Fix missing codes in IPS R4 Test 2 * Fix display value * Fix display value * Reorg wrapper issue collection; fixes errors with Balp and others * Update for API changes * Fix code set typo causing test failure * Fix DiffProviderR4Test * Fix RepositoryValidatingInterceptorHttpR4Test fails due to stricter code validation * More code fixes * Don't expect an extra error. * Use more specific logic for details tx code * Catch expected error * Clean up * Account for HAPI isEnabledValidationForCodingsLogicalAnd cases * Apply spotless * Change outputs for en_US single code test * Add missing system from code to pass validation * Account for DSTU3 and R4 including different code systems for race * Add expected loinc codes to test dao * Add some codesystem support for test * Bump core version * WIP pass on a list of CodeValidationIssue from CodeValidationResults * Re-use v2 and v3 data from r4 in r4b * CodeSystems can be supported, but not have a resource * Remove hack around unitsofmeasure + return false LookupCodeResult * Clean up chatter. * Update test cases, remove FIXME * Stop returning before adding all issues to ValidationResults * Update for changes in core API * Add severity to code issues + return to unknown system support * Use new CollectionUtils * Fix more issue messages and orders + null in TermReadSvcImpl * After checking valueSet, also check codeSystem * On second thought, always check the codesystem * Improve validation message * Refactor * Add error consistent with core validator results * Decrement query counts for validation * Improve code validation messages + don't miss invalid display on cs * Fix expected messages (added code details) * More expected message fixes * Remove redundant text from diagnostics + match core exception handling * Explicitly send tx passthrough messages no longer managed in core * Apply spotless * Add issue to code validation in TermReadSvcImpl * Adjust indexes of expected errors now that TermReadSvc is reporting * Bump to released core version * Code cleanup: commented code * More commented code cleanup * Fix parameter names * Use Set.of and List.of + fix duplicate values in set * Revert animal sniffed breakage, make field private * Add comments to describe disabled test * Remove System.out chatter * Fix javadoc generation for r5 structures module * More comments and move disabled annotation It was working when it left the shop. * Move older changelog into 7.4.0 and create core update changelog * Switch changelog type to change * Bump HAPI version * Add validation utils for FATAL issue severity * Handle FATAL codeValidationIssue severity * Fix test (validation throws more warnings) * Bump to version 7.3.4-SNAPSHOT * Bump to SNAPSHOT version of core + add necessary method implementations * Add comments to explain R4 terminology resources in R4B * Add test for Observation vital signs profile validation * Try using default validatorPolicyAdvisor * Return an empty set for fetchCanonicalResourceVersions * Profile now gives more explicit error instead of valueSet * Revert commit * Add CodeValidationIssues and additional error info * Do not return first successful match from codings. Check all. + adjust for extra errors. * apply spotless * Fix failing test, add comments re: invocations * Fix test to expect more informative error * Fix stray compilation errors from merge. * Fix merge overwrite of validation messages and indices * Fix merge overwrite of new validation results * Use core release 6.3.11 * Update HAPI version to 7.3.5-SNAPSHOT * Fix changelog * Remove commented code --------- Co-authored-by: James Agnew <jamesagnew@gmail.com> Co-authored-by: volodymyr <volodymyr.korzh@smilecdr.com>
2024-06-12 13:24:26 -04:00
</dependencies>
2020-04-02 20:30:19 -04:00
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>