Commit Graph

85 Commits

Author SHA1 Message Date
Stig Rohde Døssing b56f59542a Move JettyUtil to new module 2019-06-14 18:34:45 -04:00
Stig Rohde Døssing aab7bb6b64 Issue-1325: Let OS assign random ports to servers during testing, and let tests get the port of the running server once the OS has assigned a port. Delete PortUtil and similar utilities. 2019-06-14 18:34:45 -04:00
James Agnew 50a8c66bf5 Version bump to 4.0.0-SNAPSHOT 2019-05-30 17:13:03 -04:00
jamesagnew 73aa53be8f Release 3.8.0 2019-05-30 16:50:04 -04:00
Graham, Gary a0f9f82eb7 Modify DiagnosticReport converter to handle request <-> basedOn difference between 1.0.2 and 3.0.0 2019-05-29 21:20:06 -04:00
Matti Uusitalo 225916a4b6 Changes requested in Pull Request review 2019-05-23 16:48:49 +03:00
Matti Uusitalo 9549a1615c Merge with origin/master 2019-03-05 11:44:30 +02:00
James Agnew c2de9c5434
Merge pull request #1179 from tadgh/allow-3-to-2-specimen
Allow specimen to be converted from STU3 -> STU2
2019-02-11 10:49:17 -05:00
James Agnew 0f8c8d18e2 Bump version to 3.8.0-SNAPSHOT 2019-02-06 20:02:28 -05:00
jamesagnew 207015c3af Version bump to 3.7.0 2019-02-05 21:36:38 -05:00
James Agnew 9a8e3245b8 Build fixes 2019-02-05 15:00:36 -05:00
James Agnew 47123196a0 Merge branch 'master' of https://github.com/eevaturkka/hapi-fhir into eevaturkka-master 2019-02-05 14:26:41 -05:00
Graham, Gary f2fa65c5ed Remove erroneous test 2019-01-24 17:20:29 -08:00
Graham, Gary 237a508d83 Allow specimen to be converted from STU3 -> STU2 2019-01-24 16:06:08 -08:00
jamesagnew 98d93df12a License header updates 2019-01-04 16:22:15 -05:00
James Agnew 14a132a937 Squashed commit of the following:
commit 9659655830
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Dec 27 17:54:25 2018 -0500

    Finish sync

commit 70da25b76f
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Dec 27 10:32:51 2018 -0500

    Work on RI4 sync
2018-12-27 17:58:47 -05:00
Matti Uusitalo a3e7f5b18f Corrected group ids back to ca.uhn.hapi.fhir 2018-12-18 11:21:29 +02:00
Matti Uusitalo 8183c18406 Corrected project dependency version numberts 2018-12-17 13:54:43 +02:00
Matti Uusitalo 755eaa5f25 bumped version n. for release 2018-12-17 13:31:07 +02:00
Eeva Turkka 076d18977d Added support for Quantity in the default enable when evaluator 2018-12-17 13:30:36 +02:00
Matti Uusitalo 385df65509 Copying modifierExtensions from QuestionnaireItems added 2018-12-17 13:27:27 +02:00
Matti Uusitalo 10fe878540 Changed versions to use fi.kela.kanta.phr parent 2018-12-17 13:27:27 +02:00
Matti Uusitalo 63d2af04da Added default operator type EQUALS 2018-12-17 13:27:27 +02:00
Eeva Turkka 69d9e5d2b2 Unit tests up to date and maybe we need to use r4 path 2018-12-17 13:15:43 +02:00
Eeva Turkka 84c02d2e79 Cherry picked changes from master to 3.5.0 branch 2018-12-17 13:13:38 +02:00
Matti Uusitalo 4956c9c7e0 bumped version n. for release 2018-12-17 12:48:53 +02:00
Eeva Turkka 074e812162 Added support for Quantity in the default enable when evaluator 2018-12-17 12:45:51 +02:00
Matti Uusitalo 0392b6093e Copying modifierExtensions from QuestionnaireItems added 2018-12-17 12:43:43 +02:00
Matti Uusitalo b7843498dc Changed versions to use fi.kela.kanta.phr parent 2018-12-17 12:43:43 +02:00
Matti Uusitalo 58afc3444b Added default operator type EQUALS 2018-12-17 12:43:43 +02:00
Matti Uusitalo e7e039a851 Added default enablewhen behaviour to STU3 resources converted to R4 2018-12-17 12:43:43 +02:00
Eeva Turkka ad11409705 Unit tests up to date and maybe we need to use r4 path 2018-12-17 12:42:29 +02:00
Eeva Turkka 7097526f81 Cherry picked changes from master to 3.5.0 branch 2018-12-17 12:41:05 +02:00
James Agnew 46f5c18adc Prepare for 3.6.0 release 2018-12-17 12:32:33 +02:00
Matti Uusitalo b76fe1e6be Sync our fork with Hapi master. Merge remote-tracking branch 'upstream/master' 2018-12-10 13:20:27 +02:00
jamesagnew cc57bacab8 Version bump to 3.7.0-SNAPSHOT 2018-11-12 10:07:28 -05:00
James Agnew 63af04a7b4 Prepare for 3.6.0 release 2018-11-12 05:40:55 -05:00
Matti Uusitalo b140351650 Added default enablewhen behaviour to STU3 resources converted to R4 2018-11-06 13:11:12 +02:00
James Agnew 12b23fbf23 Make JPA searches more efficient by prefetching a much smaller number of
resources
2018-10-01 21:36:10 -04:00
James Agnew 3e445faf47 Squashed commit of the following:
commit df641506885e09e63f80efc6c658d01a1a3a8142
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sat Sep 29 13:47:22 2018 -0400

    Shrink validation resources

commit 4c1550eafa26f4235b4b8804741aecc03276b5c6
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 22:45:28 2018 -0400

    Updates to get R4 working

commit 8332f15291006691ed9b07ead3e3524b0fc85510
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 09:02:13 2018 -0400

    Ongoing work on gettign R4 working

commit f7146cab7aed937bb625a8aec95744d76db00041
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 28 05:21:01 2018 -0400

    More work on sync

commit f48de4a10b1bab2584fee813017d9b27b237bfa9
Merge: 9e4f3cc722 aacb78b779
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:11:29 2018 -0400

    Merge branch 'sync_r4' of github.com:jamesagnew/hapi-fhir into sync_r4

commit 9e4f3cc722668aae31a77b19bf9b032af3ae01b0
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:11:19 2018 -0400

    Fix compile error

commit 7ec29e0ceda8f9013cbabb95767cbe15b4b81303
Merge: 23f7517325 002c4b3ff7
Author: James Agnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:04:23 2018 -0400

    Merge branch 'master' into sync_r4

commit aacb78b7793ab2c71e0a2a774240ee2b5d3f9e7f
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 27 20:01:42 2018 -0400

    Keep working on getting R4 building

commit 4950de46d99897e74d41dfdb10d3d8a3435cb0c9
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Tue Sep 25 13:11:27 2018 -0400

    Ongoing work to get R4 working

commit 819d69c20e112dd3c72569ec50114ddb8263c300
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 20 08:15:36 2018 -0400

    Work on getting build working

commit 2c61b6cd1205ced5d7b822cf10942c69272ea078
Merge: 16b5bb06c8 dfb4de86f1
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Thu Sep 20 05:16:53 2018 -0400

    Merge branch 'master' into sync_r4

commit 16b5bb06c8cdaf8d67c3b80f5aa9be9fccd99aef
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Mon Sep 17 05:30:39 2018 -0400

    Work on R4 sync

commit 23f7517325a14dd2ca1eb5641296ead2776634ae
Author: James Agnew <jamesagnew@gmail.com>
Date:   Sun Sep 16 10:19:00 2018 -0400

    Work on sync

commit 6cc413c1f1dea538295aa4c16c21a5677494ac4c
Author: James Agnew <jamesagnew@gmail.com>
Date:   Fri Sep 14 17:28:28 2018 -0400

    Work on R$ sync

commit df6f6ad2ce783b07ccc383134705d874bc5d2cf1
Author: jamesagnew <jamesagnew@gmail.com>
Date:   Fri Sep 14 08:33:07 2018 -0400

    Work on R4
2018-09-29 13:48:35 -04:00
James Agnew 706e004b9d Bump to 3.6.0-SNAPSHOT 2018-09-19 10:24:48 -04:00
James Agnew daef975734 Version bump to 3.5.0 2018-09-08 07:22:21 +08:00
Diederik Muylwyk 0e2c57fa60 Bumping version. 2018-05-28 17:44:38 -04:00
Diederik Muylwyk 2871920734 Preparing release. 2018-05-28 10:45:47 -04:00
jamesagnew ccb859fdbe FIxes to get the synced build working 2018-05-13 08:08:34 -04:00
jamesagnew 3d762b984b Sync to R4 definitions 2018-05-12 19:35:42 -04:00
jamesagnew 180336e076 Sync to master 2018-03-29 06:54:24 -04:00
jamesagnew 418e82032f Prep for 3.3.0 2018-03-29 05:48:13 -04:00
James Agnew b56d65ef5b
Merge pull request #871 from johnpoth/hapi-fhir-osgi
Implement #826 - add OSGI support and Apache Karaf features with inte…
2018-03-27 06:06:34 -04:00
jamesagnew e201091e3a Update licenses for changed files 2018-03-04 13:53:04 -05:00