2020-05-22 15:03:20 -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">
|
2014-05-05 08:57:43 -04:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
|
|
|
<parent>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2015-02-03 17:53:22 -05:00
|
|
|
<artifactId>hapi-deployable-pom</artifactId>
|
2022-07-05 12:37:25 -04:00
|
|
|
<version>6.1.0-PRE9-SNAPSHOT</version>
|
2015-02-03 17:53:22 -05:00
|
|
|
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
2014-05-05 08:57:43 -04:00
|
|
|
</parent>
|
2014-10-30 13:57:29 -04:00
|
|
|
|
2014-05-05 08:57:43 -04:00
|
|
|
<artifactId>hapi-fhir-jpaserver-base</artifactId>
|
|
|
|
<packaging>jar</packaging>
|
|
|
|
|
|
|
|
<name>HAPI FHIR JPA Server</name>
|
|
|
|
|
|
|
|
<dependencies>
|
2017-10-26 06:02:12 -04:00
|
|
|
|
|
|
|
<dependency>
|
2020-11-27 19:49:06 -05:00
|
|
|
<groupId>com.fasterxml.woodstox</groupId>
|
|
|
|
<artifactId>woodstox-core</artifactId>
|
2020-05-22 15:03:20 -04:00
|
|
|
</dependency>
|
2017-10-26 06:02:12 -04:00
|
|
|
|
2016-05-17 09:05:37 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-csv</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
2014-05-05 08:57:43 -04:00
|
|
|
<dependency>
|
2020-02-28 16:09:16 -05:00
|
|
|
<groupId>co.elastic.apm</groupId>
|
|
|
|
<artifactId>apm-agent-api</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
2014-05-05 08:57:43 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-base</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-07-21 09:24:38 -04:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2014-05-05 08:57:43 -04:00
|
|
|
</dependency>
|
2014-10-16 17:19:27 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2017-08-13 14:39:47 -04:00
|
|
|
<artifactId>hapi-fhir-client</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-server</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2020-05-22 15:03:20 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2020-12-17 10:12:53 -05:00
|
|
|
<artifactId>hapi-fhir-server-mdm</artifactId>
|
2020-05-22 15:03:20 -04:00
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2018-11-30 17:19:16 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-jpaserver-subscription</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-jpaserver-searchparam</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2021-09-21 11:36:08 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-sql-migrate</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2018-11-30 17:19:16 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-jpaserver-model</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2017-08-13 14:39:47 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-10-16 17:19:27 -04:00
|
|
|
</dependency>
|
2014-12-21 18:13:37 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2015-02-06 15:50:29 -05:00
|
|
|
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-12-21 18:13:37 -05:00
|
|
|
</dependency>
|
2015-11-29 11:43:09 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2016-02-01 08:55:58 -05:00
|
|
|
<artifactId>hapi-fhir-structures-dstu3</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-11-29 11:43:09 -05:00
|
|
|
</dependency>
|
2017-08-13 14:39:47 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-r4</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2019-08-06 17:30:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-r5</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2015-07-10 16:05:40 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-08-31 08:20:24 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2015-09-03 14:36:37 -04:00
|
|
|
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-07-10 16:05:40 -04:00
|
|
|
</dependency>
|
2015-11-29 11:43:09 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2016-02-01 08:55:58 -05:00
|
|
|
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-11-29 11:43:09 -05:00
|
|
|
</dependency>
|
2017-08-13 14:39:47 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2019-08-06 17:30:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation-resources-r5</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2020-06-24 14:02:52 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2021-09-21 11:36:08 -04:00
|
|
|
<artifactId>hapi-fhir-batch</artifactId>
|
2020-06-24 14:02:52 -04:00
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2022-02-27 16:04:49 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-storage-batch2</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-storage-batch2-jobs</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2022-03-18 08:39:12 -04:00
|
|
|
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-dbcp2</artifactId>
|
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
|
|
|
|
2014-05-29 19:00:16 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ch.qos.logback</groupId>
|
|
|
|
<artifactId>logback-classic</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2019-08-20 09:14:21 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.awaitility</groupId>
|
|
|
|
<artifactId>awaitility</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2015-10-29 15:38:19 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.javassist</groupId>
|
|
|
|
<artifactId>javassist</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
2022-02-22 09:48:57 -05:00
|
|
|
<!-- GraphQL -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.graphql-java</groupId>
|
|
|
|
<artifactId>graphql-java</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
2020-10-26 05:24:26 -04:00
|
|
|
<!-- SQL Builder -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.healthmarketscience.sqlbuilder</groupId>
|
|
|
|
<artifactId>sqlbuilder</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
|
2017-09-21 08:33:20 -04:00
|
|
|
<!-- Jackson -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
|
<artifactId>jackson-annotations</artifactId>
|
|
|
|
</dependency>
|
2019-04-24 14:10:21 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
|
<artifactId>jackson-databind</artifactId>
|
|
|
|
</dependency>
|
2020-06-10 05:30:20 -04:00
|
|
|
<dependency>
|
2021-12-02 13:01:50 -05:00
|
|
|
<groupId>org.springdoc</groupId>
|
|
|
|
<artifactId>springdoc-openapi-ui</artifactId>
|
2020-06-10 05:30:20 -04:00
|
|
|
</dependency>
|
2017-09-21 08:33:20 -04:00
|
|
|
|
2017-09-16 15:03:22 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.thymeleaf</groupId>
|
|
|
|
<artifactId>thymeleaf</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.thymeleaf</groupId>
|
2018-11-15 05:35:50 -05:00
|
|
|
<artifactId>thymeleaf-spring5</artifactId>
|
2017-09-16 15:03:22 -04:00
|
|
|
</dependency>
|
|
|
|
|
2017-10-15 11:27:30 -04:00
|
|
|
<!-- For UCUM: TODO we should replace this with org.fhir UCUM -->
|
2014-07-21 09:24:38 -04:00
|
|
|
<dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
<groupId>org.jscience</groupId>
|
|
|
|
<artifactId>jscience</artifactId>
|
2019-05-09 12:51:13 -04:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>org.javolution</groupId>
|
|
|
|
<artifactId>javolution</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2014-07-21 09:24:38 -04:00
|
|
|
</dependency>
|
2016-09-17 16:55:21 -04:00
|
|
|
|
2021-03-02 13:18:43 -05:00
|
|
|
|
2016-09-17 16:55:21 -04:00
|
|
|
<!-- Patch Dependencies -->
|
|
|
|
<dependency>
|
2020-05-22 15:03:20 -04:00
|
|
|
<groupId>io.dogote</groupId>
|
|
|
|
<artifactId>json-patch</artifactId>
|
|
|
|
</dependency>
|
2016-09-17 16:55:21 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.github.dnault</groupId>
|
|
|
|
<artifactId>xml-patch</artifactId>
|
|
|
|
</dependency>
|
|
|
|
|
2015-09-24 07:01:04 -04:00
|
|
|
<!-- FHIR RI is pulled in for UCUM support, but we don't want any of its dependencies. -->
|
2014-10-30 13:57:29 -04:00
|
|
|
|
2017-04-23 19:28:45 -04:00
|
|
|
<!--
|
|
|
|
For some reason JavaDoc crashed during site generation unless we have this dependency
|
|
|
|
-->
|
|
|
|
<dependency>
|
2020-05-22 15:03:20 -04:00
|
|
|
<groupId>javax.interceptor</groupId>
|
|
|
|
<artifactId>javax.interceptor-api</artifactId>
|
|
|
|
<scope>provided</scope>
|
2017-04-23 19:28:45 -04:00
|
|
|
</dependency>
|
|
|
|
|
2018-05-03 18:34:29 -04:00
|
|
|
<!--
|
|
|
|
Dependencies that need to be added since JDK9
|
|
|
|
-->
|
|
|
|
<dependency>
|
|
|
|
<groupId>javax.annotation</groupId>
|
|
|
|
<artifactId>javax.annotation-api</artifactId>
|
|
|
|
</dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
|
2014-07-10 08:50:51 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
|
2014-05-05 08:57:43 -04:00
|
|
|
<!-- Spring -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-core</artifactId>
|
2014-07-21 09:24:38 -04:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2014-05-05 08:57:43 -04:00
|
|
|
</dependency>
|
2015-09-24 07:01:04 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.data</groupId>
|
|
|
|
<artifactId>spring-data-jpa</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<artifactId>spring-aop</artifactId>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2015-09-24 07:01:04 -04:00
|
|
|
</dependency>
|
2021-05-02 12:14:32 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.data</groupId>
|
|
|
|
<artifactId>spring-data-commons</artifactId>
|
|
|
|
</dependency>
|
2015-09-26 08:49:06 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-messaging</artifactId>
|
|
|
|
</dependency>
|
2014-05-05 08:57:43 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-tx</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-context-support</artifactId>
|
|
|
|
</dependency>
|
2015-09-26 08:49:06 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-webmvc</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-websocket</artifactId>
|
|
|
|
</dependency>
|
2014-08-05 10:46:46 -04:00
|
|
|
<dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
<groupId>javax.el</groupId>
|
|
|
|
<artifactId>javax.el-api</artifactId>
|
2015-09-25 16:53:22 -04:00
|
|
|
<scope>provided</scope>
|
2014-08-05 10:46:46 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
<groupId>org.glassfish</groupId>
|
|
|
|
<artifactId>javax.el</artifactId>
|
2014-08-05 10:46:46 -04:00
|
|
|
</dependency>
|
2019-09-30 09:30:39 -04:00
|
|
|
|
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
|
|
|
<!-- Note that we need this dependency to send log4j logging requests to slf4j -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
|
|
<artifactId>log4j-to-slf4j</artifactId>
|
|
|
|
</dependency>
|
2019-09-30 09:30:39 -04:00
|
|
|
<!-- Hibernate Search -->
|
2015-11-02 08:12:36 -05: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.elasticsearch.client</groupId>
|
|
|
|
<artifactId>elasticsearch-rest-high-level-client</artifactId>
|
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
|
|
<artifactId>log4j-api</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.hibernate.search</groupId>
|
|
|
|
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.hibernate.search</groupId>
|
|
|
|
<artifactId>hibernate-search-backend-lucene</artifactId>
|
2015-11-02 08:12:36 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.lucene</groupId>
|
|
|
|
<artifactId>lucene-analyzers-phonetic</artifactId>
|
|
|
|
</dependency>
|
2019-09-30 09:30:39 -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.apache.lucene</groupId>
|
|
|
|
<artifactId>lucene-backward-codecs</artifactId>
|
2019-09-30 09:30:39 -04:00
|
|
|
</dependency>
|
2014-05-29 09:17:12 -04:00
|
|
|
<!-- Misc -->
|
|
|
|
<dependency>
|
2014-10-30 13:57:29 -04:00
|
|
|
<groupId>com.google.guava</groupId>
|
|
|
|
<artifactId>guava</artifactId>
|
2014-05-29 09:17:12 -04:00
|
|
|
</dependency>
|
2015-09-24 07:01:04 -04:00
|
|
|
|
2021-04-28 10:29:09 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-server-openapi</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2021-04-25 15:40:50 -04:00
|
|
|
|
2021-04-28 10:29:09 -04:00
|
|
|
<dependency>
|
2018-05-10 10:52:56 -04:00
|
|
|
<groupId>com.github.ben-manes.caffeine</groupId>
|
|
|
|
<artifactId>caffeine</artifactId>
|
|
|
|
</dependency>
|
2018-06-24 20:02:27 -04:00
|
|
|
|
2019-04-26 11:21:42 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.jetbrains</groupId>
|
|
|
|
<artifactId>annotations</artifactId>
|
|
|
|
</dependency>
|
2021-04-28 10:29:09 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.jena</groupId>
|
|
|
|
<artifactId>jena-arq</artifactId>
|
2021-10-28 14:42:06 -04:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.jena</groupId>
|
|
|
|
<artifactId>jena-core</artifactId>
|
2021-04-28 10:29:09 -04:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
2022-02-02 16:03:53 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.jayway.jsonpath</groupId>
|
|
|
|
<artifactId>json-path-assert</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.jayway.jsonpath</groupId>
|
|
|
|
<artifactId>json-path</artifactId>
|
|
|
|
</dependency>
|
2021-04-28 10:29:09 -04:00
|
|
|
</dependencies>
|
2014-05-05 08:57:43 -04:00
|
|
|
|
2014-05-29 09:17:12 -04:00
|
|
|
|
2014-05-05 08:57:43 -04:00
|
|
|
<properties>
|
2017-05-09 18:08:59 -04:00
|
|
|
<jackson.version>2.7.1</jackson.version>
|
2014-05-05 08:57:43 -04:00
|
|
|
</properties>
|
|
|
|
|
|
|
|
<build>
|
|
|
|
<plugins>
|
2016-12-08 07:07:29 -05:00
|
|
|
<plugin>
|
2018-11-30 17:19:16 -05:00
|
|
|
<groupId>de.jpdigital</groupId>
|
2019-07-14 10:16:40 -04:00
|
|
|
<artifactId>hibernate54-ddl-maven-plugin</artifactId>
|
2018-11-30 17:19:16 -05:00
|
|
|
<configuration>
|
|
|
|
<dialects>
|
2019-07-14 10:16:40 -04:00
|
|
|
<param>h2</param>
|
2018-11-30 17:19:16 -05:00
|
|
|
<param>derby_10_7</param>
|
|
|
|
<param>mysql57</param>
|
|
|
|
<param>mariadb</param>
|
|
|
|
<param>oracle12c</param>
|
|
|
|
<param>sqlserver2012</param>
|
|
|
|
</dialects>
|
2021-10-11 16:47:37 -04:00
|
|
|
<customDialects>
|
|
|
|
<customDialect>ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect</customDialect>
|
2022-05-18 10:02:11 -04:00
|
|
|
<customDialect>org.hibernate.dialect.CockroachDB201Dialect</customDialect>
|
2021-10-11 16:47:37 -04:00
|
|
|
</customDialects>
|
2018-11-30 17:19:16 -05:00
|
|
|
<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database</outputDirectory>
|
|
|
|
<packages>
|
|
|
|
<param>ca.uhn.fhir.jpa.entity</param>
|
|
|
|
<param>ca.uhn.fhir.jpa.model.entity</param>
|
|
|
|
</packages>
|
|
|
|
</configuration>
|
2016-12-08 07:07:29 -05:00
|
|
|
<executions>
|
2018-01-23 10:30:43 -05:00
|
|
|
<execution>
|
2016-12-08 07:07:29 -05:00
|
|
|
<phase>process-classes</phase>
|
|
|
|
<goals>
|
2018-11-30 17:19:16 -05:00
|
|
|
<goal>gen-ddl</goal>
|
2016-12-08 07:07:29 -05:00
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
2018-01-31 07:41:24 -05:00
|
|
|
<dependencies>
|
|
|
|
<!--
|
|
|
|
These have been added as explicit dependencies
|
|
|
|
as JDK9 no longer includes them by default
|
|
|
|
-->
|
2018-05-30 05:45:08 -04:00
|
|
|
<dependency>
|
2018-12-22 20:13:03 -05:00
|
|
|
<groupId>org.glassfish.jaxb</groupId>
|
|
|
|
<artifactId>jaxb-runtime</artifactId>
|
|
|
|
<version>${jaxb_runtime_version}</version>
|
2018-05-30 05:45:08 -04:00
|
|
|
</dependency>
|
2021-10-11 16:47:37 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-jpaserver-model</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2018-01-31 07:41:24 -05:00
|
|
|
</dependencies>
|
2016-12-08 07:07:29 -05:00
|
|
|
</plugin>
|
2016-06-15 17:34:50 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.jacoco</groupId>
|
|
|
|
<artifactId>jacoco-maven-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<dumpOnExit>true</dumpOnExit>
|
|
|
|
</configuration>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>default-prepare-agent</id>
|
|
|
|
<goals>
|
|
|
|
<goal>prepare-agent</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
2014-12-21 18:13:37 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-tinder-plugin</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-12-21 18:13:37 -05:00
|
|
|
<executions>
|
|
|
|
<execution>
|
2015-02-06 15:50:29 -05:00
|
|
|
<id>build_dstu2</id>
|
2014-12-21 18:13:37 -05:00
|
|
|
<goals>
|
|
|
|
<goal>generate-jparest-server</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
2015-02-06 15:50:29 -05:00
|
|
|
<version>dstu2</version>
|
2015-10-16 08:57:07 -04:00
|
|
|
<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
|
2015-02-06 15:50:29 -05:00
|
|
|
<packageBase>ca.uhn.fhir.jpa.rp.dstu2</packageBase>
|
2020-07-13 08:51:13 -04:00
|
|
|
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu2.xml
|
|
|
|
</targetResourceSpringBeansFile>
|
2019-09-17 16:01:35 -04:00
|
|
|
<baseResourceNames/>
|
2015-07-18 18:44:46 -04:00
|
|
|
<excludeResourceNames>
|
2015-10-29 15:38:19 -04:00
|
|
|
<!-- <excludeResourceName>OperationDefinition</excludeResourceName> <excludeResourceName>OperationOutcome</excludeResourceName> -->
|
2015-07-18 18:44:46 -04:00
|
|
|
</excludeResourceNames>
|
2014-12-21 18:13:37 -05:00
|
|
|
</configuration>
|
|
|
|
</execution>
|
2015-11-29 11:43:09 -05:00
|
|
|
<execution>
|
2016-02-01 08:55:58 -05:00
|
|
|
<id>build_dstu3</id>
|
2015-11-29 11:43:09 -05:00
|
|
|
<goals>
|
|
|
|
<goal>generate-jparest-server</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
2016-02-01 08:55:58 -05:00
|
|
|
<version>dstu3</version>
|
2015-11-29 11:43:09 -05:00
|
|
|
<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
|
2016-02-01 08:55:58 -05:00
|
|
|
<packageBase>ca.uhn.fhir.jpa.rp.dstu3</packageBase>
|
2020-07-13 08:51:13 -04:00
|
|
|
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu3.xml
|
|
|
|
</targetResourceSpringBeansFile>
|
2015-11-29 11:43:09 -05:00
|
|
|
<baseResourceNames></baseResourceNames>
|
|
|
|
<excludeResourceNames>
|
2017-08-13 14:39:47 -04:00
|
|
|
</excludeResourceNames>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
<execution>
|
|
|
|
<id>build_r4</id>
|
|
|
|
<goals>
|
|
|
|
<goal>generate-jparest-server</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<version>r4</version>
|
|
|
|
<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
|
|
|
|
<packageBase>ca.uhn.fhir.jpa.rp.r4</packageBase>
|
2020-07-13 08:51:13 -04:00
|
|
|
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4.xml
|
|
|
|
</targetResourceSpringBeansFile>
|
2017-08-13 14:39:47 -04:00
|
|
|
<baseResourceNames></baseResourceNames>
|
|
|
|
<excludeResourceNames>
|
2015-11-29 11:43:09 -05:00
|
|
|
</excludeResourceNames>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
2019-08-06 17:30:31 -04:00
|
|
|
<execution>
|
|
|
|
<id>build_r5</id>
|
|
|
|
<goals>
|
|
|
|
<goal>generate-jparest-server</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<version>r5</version>
|
|
|
|
<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
|
|
|
|
<packageBase>ca.uhn.fhir.jpa.rp.r5</packageBase>
|
2020-07-13 08:51:13 -04:00
|
|
|
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r5.xml
|
|
|
|
</targetResourceSpringBeansFile>
|
2019-08-06 17:30:31 -04:00
|
|
|
<baseResourceNames></baseResourceNames>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
2014-12-21 18:13:37 -05:00
|
|
|
</executions>
|
2017-08-13 14:39:47 -04:00
|
|
|
|
2014-12-21 18:13:37 -05:00
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2017-08-13 14:39:47 -04:00
|
|
|
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-12-21 18:13:37 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2017-08-13 14:39:47 -04:00
|
|
|
<artifactId>hapi-fhir-structures-dstu3</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2014-12-21 18:13:37 -05:00
|
|
|
</dependency>
|
2015-11-29 11:43:09 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2017-08-13 14:39:47 -04:00
|
|
|
<artifactId>hapi-fhir-structures-r4</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-11-29 11:43:09 -05:00
|
|
|
</dependency>
|
2017-08-13 14:39:47 -04:00
|
|
|
|
2015-12-20 09:29:52 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2016-02-01 08:55:58 -05:00
|
|
|
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
|
2017-01-29 13:22:28 -05:00
|
|
|
<version>${project.version}</version>
|
2015-12-20 09:29:52 -05:00
|
|
|
</dependency>
|
2014-12-21 18:13:37 -05:00
|
|
|
</dependencies>
|
|
|
|
</plugin>
|
2017-02-04 16:31:18 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>build-helper-maven-plugin</artifactId>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>add-source</id>
|
|
|
|
<phase>generate-sources</phase>
|
|
|
|
<goals>
|
|
|
|
<goal>add-source</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<sources>
|
|
|
|
<source>target/generated-sources/tinder</source>
|
|
|
|
</sources>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
2022-02-16 20:44:03 -05:00
|
|
|
</plugins>
|
2014-12-21 18:13:37 -05:00
|
|
|
<resources>
|
|
|
|
<resource>
|
2018-04-21 14:32:17 -04:00
|
|
|
<directory>${project.basedir}/src/main/resources</directory>
|
2014-12-21 18:13:37 -05:00
|
|
|
</resource>
|
|
|
|
<resource>
|
2018-04-21 14:32:17 -04:00
|
|
|
<directory>${project.basedir}/target/generated-resources/tinder</directory>
|
2014-12-21 18:13:37 -05:00
|
|
|
</resource>
|
|
|
|
</resources>
|
2014-05-05 08:57:43 -04:00
|
|
|
</build>
|
|
|
|
|
|
|
|
</project>
|