275 lines
7.4 KiB
XML
Raw Normal View History

2018-04-30 15:04:35 -04:00
<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>
Introduce hibernate envers, use it only for MdmLink, disable it for now, add to MdmLink Dao and unit test revisions. (#4615) * First commit with new maven deps for envers and stubbed changelist. * Add repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class to BaseAppCtxPersistence. Comment it out in JpaConfig. Add constant for hibernate.integration.envers.enabled. Hard-code envers to false. App starts without error. Basic smoke testing for MpmLink update works. * Add mdmLink code to retrieve envers history and unit test it. * Initial code to handle envers from HapiFhirEnversRevision along with a custom extension of the revision/REVINFO entity. * Add changelist and tweak table/sequence/field names and clean up the HapiFhirJpaMigrationTasks method. * Fix some unit test failures and address TODOs. * Ensure hard-coded deactivation of envers is overridden by unit tests. * Remove commented-out code. * Address code review comments. * Remove sysout traces. * Tweaks to poms with comments explaining why I left the versions in the plugin dependencies. Get rid of a duplicate envers dependency. * Bump hapi-fhir version to 6.5.5-SNAPSHOT. * Disable intermittently failing test: PartitionedSubscriptionTriggeringR4Test.testCreateSubscriptionInPartitionAndResourceInDifferentPartition * Try disabling Batch2CoordinatorIT failing test and see if branch pipeline passes. * Add back hapi-fhir-validation-resources-r4b to hapi-fhir-jpaserver-base pom.xml. * Bump hapi-fhir to 6.5.6-SNAPSHOT. * Bump rest of hapi-fhir to 6.5.6-SNAPSHOT. * Fix compile error on Batch2CoordinatorIT. * Change revision ID column from integer to long in both the revision entity and the migration tasks. Fix a bug with the migration tasks having the wrong name for the timestamp column. * Fix interface in MongoDB to return Long for the revision ID instead of Int. Implement TINYINT for all supported database products. Keep TARGET_TYPE column at 40 instead of 100 for now since otherwise the schema migration test will fail. Also, don't try to rename the foreign key or the schema migration test will fail.
2023-03-14 15:32:00 -04:00
<version>6.5.6-SNAPSHOT</version>
2018-04-30 15:04:35 -04:00
<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
</parent>
<artifactId>hapi-fhir-cli-api</artifactId>
<packaging>jar</packaging>
<name>HAPI FHIR - Command Line Client - API</name>
<dependencies>
<!-- This dependency includes the core HAPI-FHIR classes -->
<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>hapi-fhir-jpaserver-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-cli-jpaserver</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
Squashed commit of the following: commit 2be11651c212ede9d50956ba9d4a802885e9dbed Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 11:50:53 2018 -0400 Update changelog commit b3bb5f9052ecebce87588e2d5f5be983fbd0fd2e Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 11:19:28 2018 -0400 Parameter updates commit f6b1082ba46f4d0d47d3e0094e904d527b0ebf75 Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 07:24:30 2018 -0400 More test fixes commit 81a69c265f7347f6a23c73b827c79a8a4051b21b Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 06:26:48 2018 -0400 Fix compile error commit 935938e92c697be1940b788a46c38ffd5ce84b84 Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 06:25:18 2018 -0400 Another test fix commit 43568a1f8dd6325bebba2cd47ffb42bee7f12aa6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 06:18:06 2018 -0400 Fix compile error commit e95894e643dda0a70ab5ab7be4363cae4ce5c4e6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 06:13:50 2018 -0400 More work on tests commit 9393fb8f4f93e69f80293c0488cc16f74613f25c Author: James Agnew <jamesagnew@gmail.com> Date: Thu May 10 05:36:27 2018 -0400 One more fix commit 437f5051e4742eb500ec1eb1852e4c6105927c51 Author: James Agnew <jamesagnew@gmail.com> Date: Wed May 9 21:32:10 2018 -0400 Work on validator commit 20c51add4fbb5c33d7b5f8517fe9bf9a4f314292 Author: James Agnew <jamesagnew@gmail.com> Date: Wed May 9 19:34:10 2018 -0400 Validator fix commit 7bf2b0a0e93b71f6fbc46ab3b1dbd0fba6367959 Author: James Agnew <jamesagnew@gmail.com> Date: Wed May 9 18:44:04 2018 -0400 Fix test commit adc73e75c9b392ed964588f03970ab1afdb4cdef Author: James Agnew <jamesagnew@gmail.com> Date: Wed May 9 17:22:34 2018 -0400 Merge validator
2018-05-10 11:53:32 -04:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-sql-migrate</artifactId>
2018-09-08 03:30:35 +08:00
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-test-utilities</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-caching-testing</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
2018-04-30 15:04:35 -04:00
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</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-hl7org-dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
2018-09-08 07:14:43 +08:00
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
2018-09-08 07:14:43 +08:00
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
2018-09-08 07:14:43 +08:00
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
2018-04-30 15:04:35 -04:00
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</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-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-core-client</artifactId>
2018-04-30 15:04:35 -04:00
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-client</artifactId>
2018-04-30 15:04:35 -04:00
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
2018-11-15 11:35:50 +01:00
<artifactId>thymeleaf-spring5</artifactId>
2018-04-30 15:04:35 -04:00
</dependency>
2018-05-30 08:54:16 -04:00
<!-- Dependencies for Schematron -->
2018-04-30 15:04:35 -04:00
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-schematron</artifactId>
2018-04-30 15:04:35 -04:00
<exclusions>
<exclusion>
2018-05-30 08:54:16 -04:00
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
2018-04-30 15:04:35 -04:00
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-commons</artifactId>
2018-04-30 15:04:35 -04:00
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
2018-12-22 20:13:03 -05:00
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
2018-04-30 15:04:35 -04:00
</dependency>
2018-04-30 15:04:35 -04:00
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<!-- Test Deps -->
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</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
<dependency>
<groupId>org.rauschig</groupId>
<artifactId>jarchivelib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
2018-04-30 15:04:35 -04:00
<build>
<plugins>
</plugins>
</build>
</project>