hapi-fhir/hapi-fhir-jpaserver-base/pom.xml

924 lines
25 KiB
XML
Raw Normal View History

<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>
2015-02-03 17:53:22 -05:00
<artifactId>hapi-deployable-pom</artifactId>
<version>5.4.0-PRE9-SNAPSHOT</version>
2015-02-03 17:53:22 -05:00
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
<artifactId>hapi-fhir-jpaserver-base</artifactId>
<packaging>jar</packaging>
<name>HAPI FHIR JPA Server</name>
<dependencies>
<!--
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate4</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
-->
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>
</dependency>
2017-10-26 06:02:12 -04:00
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
</dependency>
2016-05-17 09:05:37 -04:00
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
<dependency>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-api</artifactId>
</dependency>
<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>
2014-10-16 17:19:27 -04:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
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>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-server-mdm</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-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>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-model</artifactId>
<version>${project.version}</version>
</dependency>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation</artifactId>
<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>
<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>
<artifactId>hapi-fhir-structures-dstu3</artifactId>
<version>${project.version}</version>
2015-11-29 11:43:09 -05:00
</dependency>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
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>
<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>
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>
<version>${project.version}</version>
</dependency>
2015-11-29 11:43:09 -05:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
<version>${project.version}</version>
2015-11-29 11:43:09 -05:00
</dependency>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
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>
<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>
<artifactId>hapi-fhir-jpaserver-batch</artifactId>
<version>${project.version}</version>
</dependency>
2020-05-25 18:25:25 -04:00
2014-07-21 10:17:07 -04:00
<dependency>
<groupId>net.ttddyy</groupId>
<artifactId>datasource-proxy</artifactId>
2014-07-21 10:17:07 -04:00
</dependency>
2014-05-29 19:00:16 -04:00
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- 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>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
2017-09-21 08:33:20 -04:00
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-schematron</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>Saxon-HE</artifactId>
<groupId>net.sf.saxon</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-commons</artifactId>
<scope>test</scope>
</dependency>
<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>
</dependency>
<!-- For UCUM: TODO we should replace this with org.fhir UCUM -->
<dependency>
<groupId>org.jscience</groupId>
<artifactId>jscience</artifactId>
<exclusions>
<exclusion>
<groupId>org.javolution</groupId>
<artifactId>javolution</artifactId>
</exclusion>
</exclusions>
</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>
<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. -->
<!--
For some reason JavaDoc crashed during site generation unless we have this dependency
-->
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<scope>provided</scope>
</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>
2021-03-02 13:18:43 -05:00
<!-- Test Database -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
2014-07-02 08:57:07 -04:00
<scope>test</scope>
</dependency>
2019-06-07 11:11:25 -04:00
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
2014-07-02 15:24:29 -04:00
<dependency>
2015-08-16 22:09:01 -04:00
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
2015-08-16 22:09:01 -04:00
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-test-utilities</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
2018-08-27 08:21:20 -04:00
<!--
2016-11-17 11:10:52 -05:00
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<!-- Spring -->
<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-orm</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>
2015-09-24 07:01:04 -04:00
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-aop</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
</exclusions>
2015-09-24 07:01:04 -04:00
</dependency>
2015-09-26 08:49:06 -04:00
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
</dependency>
<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>
<!-- Hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
2020-02-07 15:18:06 -05:00
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-java8</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<exclusions>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
2020-04-13 11:50:49 -04:00
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
2018-05-30 08:27:09 -04:00
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
2015-09-25 16:53:22 -04:00
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</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
<!-- 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>
<!-- Hibernate Search -->
<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>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
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>
<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>
</dependency>
2014-05-29 09:17:12 -04:00
<!-- Misc -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
2014-05-29 09:17:12 -04:00
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
2015-09-24 07:01:04 -04:00
2015-02-06 15:50:29 -05:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
2015-09-26 08:49:06 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<scope>test</scope>
</dependency>
2015-08-31 08:20:24 -04:00
<dependency>
DeleteConflict hook, SearchableHashMapResourceProvider, and in-memory searching (#1341) * Make IBundle list interface more flexible * Make matchResourceLinks visible * Make matchResourceLinks visible * Pull in-memory matching functionality out of subscription module into dedicated classes in searchparam module * Added more accessors to version independent resource classes * improved forcedid matching (needs to be verified by James) filter out nulls from HashMapProvider.searchAll() (hopefully no tests depend on this) * add AnyComposition * cleanup of Any classes * create searchparam config so people can use that module without using subscriptions * create searchparam config so people can use that module without using subscriptions * fix broken test * added derivedFrom * renamed daoRegistry.getResourceDaoIfExists to getResourceDaoOrNull also added method to add a new dao to the registry and retrieve registered types * TokenParam.equals * add error check to searchable hashmap resource provider * added support for R4 * add successor to measure * delete conflict hook start with failing test * test passes. hook is called. * added delete conflict hook all delete conflict tests pass * added javadoc * Performance test * test bad interceptor case * typo * rename criteria matcher * added support for multiple topics * fix method name * add effective period * Temporarily excluding StressTest from build to try to get Travis under time limit * change log * review feedback * review feedback * review feedback
2019-06-13 13:59:51 -04:00
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
2015-08-31 08:20:24 -04:00
<scope>test</scope>
</dependency>
2015-09-24 07:01:04 -04:00
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail-spring</artifactId>
<scope>test</scope>
</dependency>
<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.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hl7.fhir.testcases</groupId>
<artifactId>fhir-test-cases</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-server-openapi</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
2018-06-24 20:02:27 -04:00
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5-20081211</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>3.17.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
2014-05-29 09:17:12 -04:00
<properties>
<jackson.version>2.7.1</jackson.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
2020-04-24 16:23:59 -04:00
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<runOrder>alphabetical</runOrder>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
2016-12-08 07:07:29 -05:00
<plugin>
2018-11-30 17:19:16 -05:00
<groupId>de.jpdigital</groupId>
<artifactId>hibernate54-ddl-maven-plugin</artifactId>
2018-11-30 17:19:16 -05:00
<configuration>
<dialects>
<param>h2</param>
2018-11-30 17:19:16 -05:00
<param>derby_10_7</param>
<param>postgresql92</param>
<param>mysql57</param>
<param>mariadb</param>
<param>oracle12c</param>
<param>sqlserver2012</param>
</dialects>
<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>
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>
2015-05-12 18:08:10 -04:00
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<runOrder>alphabetical</runOrder>
<argLine>@{argLine} ${surefire_jvm_args}</argLine>
<forkCount>0.6C</forkCount>
2019-06-13 15:21:03 -04:00
<excludes>*StressTest*</excludes>
2015-05-12 18:08:10 -04:00
</configuration>
</plugin>
2014-12-21 18:13:37 -05:00
<plugin>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId>
<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>
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu2.xml
</targetResourceSpringBeansFile>
<baseResourceNames/>
<excludeResourceNames>
<!-- <excludeResourceName>OperationDefinition</excludeResourceName> <excludeResourceName>OperationOutcome</excludeResourceName> -->
</excludeResourceNames>
2014-12-21 18:13:37 -05:00
</configuration>
</execution>
2015-11-29 11:43:09 -05:00
<execution>
<id>build_dstu3</id>
2015-11-29 11:43:09 -05:00
<goals>
<goal>generate-jparest-server</goal>
</goals>
<configuration>
<version>dstu3</version>
2015-11-29 11:43:09 -05:00
<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
<packageBase>ca.uhn.fhir.jpa.rp.dstu3</packageBase>
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu3.xml
</targetResourceSpringBeansFile>
2015-11-29 11:43:09 -05:00
<baseResourceNames></baseResourceNames>
<excludeResourceNames>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
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>
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4.xml
</targetResourceSpringBeansFile>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
<baseResourceNames></baseResourceNames>
<excludeResourceNames>
2015-11-29 11:43:09 -05:00
</excludeResourceNames>
</configuration>
</execution>
<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>
<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r5.xml
</targetResourceSpringBeansFile>
<baseResourceNames></baseResourceNames>
</configuration>
</execution>
2014-12-21 18:13:37 -05:00
</executions>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2014-12-21 18:13:37 -05:00
<dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
<artifactId>hapi-fhir-structures-dstu2</artifactId>
<version>${project.version}</version>
2014-12-21 18:13:37 -05:00
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
<artifactId>hapi-fhir-structures-dstu3</artifactId>
<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>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${project.version}</version>
2015-11-29 11:43:09 -05:00
</dependency>
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2015-12-20 09:29:52 -05:00
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
<version>${project.version}</version>
2015-12-20 09:29:52 -05:00
</dependency>
2014-12-21 18:13:37 -05:00
</dependencies>
</plugin>
<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>
</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>
</build>
2015-02-03 17:53:22 -05:00
<reporting>
2015-09-24 07:01:04 -04:00
<plugins>
2015-02-03 17:53:22 -05:00
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<profiles>
2017-01-30 08:06:31 -05:00
<profile>
<id>NOPARALLEL</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
2017-07-05 09:44:03 -04:00
<excludes>
<exclude>**/stresstest/*</exclude>
</excludes>
2017-01-30 08:06:31 -05:00
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>CI</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<runOrder>alphabetical</runOrder>
</configuration>
</plugin>
</plugins>
</build>
2017-01-30 08:06:31 -05:00
</profile>
Fix #674 - Avoid duplicates in $everything query Squashed commit of the following: commit f3097f423f5f1e1d27f4084aa4ab0daa01618149 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 13:24:29 2017 -0400 more travis fun commit a4b8161597057562d03c2abb3eed3c56dae874ba Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:43:33 2017 -0400 More fighting with travis commit fe47d1e8643ae0b7860567ad02db50aac42c509b Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:10:55 2017 -0400 More travis attempts commit 4fdfe7a4e81ff28407209f7b03a37cfddf946586 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 09:25:04 2017 -0400 Try and run unit tests in 2 threads to cut time.. Will travis like this? commit 571045b63da04149397acfad6798193b384e541f Author: James <jamesagnew@gmail.com> Date: Mon Jun 19 07:35:46 2017 -0400 Paging now working commit 526a1fa7d03f9ca0d1c4a3921fb7ea0faa783c4c Merge: cebe881a15 55a67ae055 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:37 2017 -0400 Merge branch '674_everything_improvements' of github.com:jamesagnew/hapi-fhir into 674_everything_improvements commit cebe881a158cfbbf0adb42607029862a39e1e169 Merge: b3b9273ca7 5789cd2a46 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:12 2017 -0400 Merge branch 'master' into 674_everything_improvements for #674 commit b3b9273ca74a7993bfef362710727c6aa2c05756 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes for #674 commit 55a67ae05509b197bff4f4d0c331da334a58b85d Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes
2017-06-19 13:56:38 -04:00
<profile>
2017-12-18 06:03:09 -05:00
<!--
This profile is used on the Travis CI server because the full test suite
runs for over 45 minutes on Travis, and Travis kills it.. So we don't execute
all of the tests there.
This seems like it must be an issue with Travis's environment, since AppVeyor
can run the full build in much less time, but I don't know how to fix it
yet..
-->
2017-12-15 16:38:32 -05:00
<id>REDUCED_JPA_TESTS</id>
Fix #674 - Avoid duplicates in $everything query Squashed commit of the following: commit f3097f423f5f1e1d27f4084aa4ab0daa01618149 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 13:24:29 2017 -0400 more travis fun commit a4b8161597057562d03c2abb3eed3c56dae874ba Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:43:33 2017 -0400 More fighting with travis commit fe47d1e8643ae0b7860567ad02db50aac42c509b Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:10:55 2017 -0400 More travis attempts commit 4fdfe7a4e81ff28407209f7b03a37cfddf946586 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 09:25:04 2017 -0400 Try and run unit tests in 2 threads to cut time.. Will travis like this? commit 571045b63da04149397acfad6798193b384e541f Author: James <jamesagnew@gmail.com> Date: Mon Jun 19 07:35:46 2017 -0400 Paging now working commit 526a1fa7d03f9ca0d1c4a3921fb7ea0faa783c4c Merge: cebe881a15 55a67ae055 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:37 2017 -0400 Merge branch '674_everything_improvements' of github.com:jamesagnew/hapi-fhir into 674_everything_improvements commit cebe881a158cfbbf0adb42607029862a39e1e169 Merge: b3b9273ca7 5789cd2a46 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:12 2017 -0400 Merge branch 'master' into 674_everything_improvements for #674 commit b3b9273ca74a7993bfef362710727c6aa2c05756 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes for #674 commit 55a67ae05509b197bff4f4d0c331da334a58b85d Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes
2017-06-19 13:56:38 -04:00
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
2019-07-13 18:24:31 -04:00
<forkCount>2</forkCount>
2017-12-22 16:20:21 -05:00
<reuseForks>true</reuseForks>
2017-12-22 15:10:08 -05:00
<runOrder>alphabetical</runOrder>
2017-12-22 16:52:22 -05:00
<redirectTestOutputToFile>true</redirectTestOutputToFile>
2017-07-05 09:44:03 -04:00
<excludes>
2017-12-15 16:38:32 -05:00
<exclude>**/*Dstu2*</exclude>
2017-12-22 13:47:40 -05:00
<exclude>**/*Dstu3*</exclude>
2017-07-05 09:44:03 -04:00
<exclude>**/stresstest/*</exclude>
</excludes>
Fix #674 - Avoid duplicates in $everything query Squashed commit of the following: commit f3097f423f5f1e1d27f4084aa4ab0daa01618149 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 13:24:29 2017 -0400 more travis fun commit a4b8161597057562d03c2abb3eed3c56dae874ba Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:43:33 2017 -0400 More fighting with travis commit fe47d1e8643ae0b7860567ad02db50aac42c509b Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 10:10:55 2017 -0400 More travis attempts commit 4fdfe7a4e81ff28407209f7b03a37cfddf946586 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 09:25:04 2017 -0400 Try and run unit tests in 2 threads to cut time.. Will travis like this? commit 571045b63da04149397acfad6798193b384e541f Author: James <jamesagnew@gmail.com> Date: Mon Jun 19 07:35:46 2017 -0400 Paging now working commit 526a1fa7d03f9ca0d1c4a3921fb7ea0faa783c4c Merge: cebe881a15 55a67ae055 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:37 2017 -0400 Merge branch '674_everything_improvements' of github.com:jamesagnew/hapi-fhir into 674_everything_improvements commit cebe881a158cfbbf0adb42607029862a39e1e169 Merge: b3b9273ca7 5789cd2a46 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:19:12 2017 -0400 Merge branch 'master' into 674_everything_improvements for #674 commit b3b9273ca74a7993bfef362710727c6aa2c05756 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes for #674 commit 55a67ae05509b197bff4f4d0c331da334a58b85d Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jun 19 06:16:27 2017 -0400 Work on everything fixes
2017-06-19 13:56:38 -04:00
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>