60 Commits

Author SHA1 Message Date
James
be5c5ebecd 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
James
14edc79ac1 Version bump to 2.6-SNAPSHOT 2017-06-09 07:28:29 -04:00
James
8b5209ff67 Version bump to 2.5 2017-06-08 06:34:44 -04:00
James
cbc652d226 Version bump to 2.5-SNAPSHOT 2017-04-20 16:13:15 -04:00
James
9d3d15ce6f Version bump to 2.4 2017-04-19 21:38:36 -04:00
James
40848b1beb Version bump to 2.4-SNAPSHOT 2017-03-18 12:24:39 -04:00
James
e18ab206d7 Version bump to 2.3 2017-03-17 21:21:59 -04:00
sekaijin
a150a96089 dependencies convergence
correct dependencies convergence
correct version use ${project.version}
2017-01-29 19:22:28 +01:00
sekaijin
23784c1619 remove .settings .project .classpath file of eclipse 2017-01-28 17:13:47 +01:00
James
b448e13edd Version bump to 2.3 2016-12-20 19:01:31 -05:00
James
0ec61533a8 Publish 2.2 2016-12-20 19:00:37 -05:00
James
2d7592f7a8 Version bump to 2.2-SNAPSHOT 2016-11-11 22:39:45 -05:00
James
2dd26b6367 Version bump to 2.1 2016-11-11 15:16:53 -05:00
James Agnew
906bcfb803 Version bump to 2.1 2016-08-30 10:55:55 -04:00
James Agnew
d27aad487e Bump to 2.0 release 2016-08-30 10:50:04 -04:00
James Agnew
c3e9f618eb Version bump to 2.0-SNAPSHOT 2016-07-12 11:12:07 -04:00
jamesagnew
acaf2135c5 Finalize 1.6 release 2016-07-06 07:29:20 -04:00
jamesagnew
38e80531bb Bump version to 1.6-SNAPSHOT 2016-04-22 07:05:05 -04:00
jamesagnew
1da5855c9c Add Eclipse files to git 2016-02-28 14:02:29 -05:00
James Agnew
f21851099c Version bump 2016-02-08 13:59:09 -05:00
James Agnew
e0e52f96c6 Version bump to 1.4 (finally!) 2016-02-03 15:25:32 -05:00
jamesagnew
ccc71c3bd3 Tests should be passing now 2016-01-03 00:19:16 -05:00
James Agnew
2f12c9ed01 Bump version to 1.4-SNAPSHOT 2015-11-15 20:11:05 -05:00
James Agnew
f9f33f059b Version bump to 1.3 2015-11-15 12:53:02 -05:00
jamesagnew
70e942e9f8 Version bump to 1.3-SNAPSHOT 2015-09-19 11:00:57 -04:00
jamesagnew
31934ff582 Version bump to 1.2 2015-09-16 07:09:03 -04:00
jamesagnew
a9f978a8a2 Udate to latest DSTU2 definitions 2015-08-31 08:20:24 -04:00
James Agnew
11f5aeebd9 Clean up the build and hopefully close #206 2015-08-19 11:49:00 -04:00
James Agnew
c859c9da91 Add withId(long) to fluent client read() method 2015-08-14 15:43:35 -04:00
James Agnew
901c5c29cf Version bunp for 1.2 2015-07-14 18:08:06 -04:00
James Agnew
3fa7c54526 Tag 1.1 release 2015-07-13 10:31:02 -04:00
jamesagnew
71fbfe5214 Add consolidated test package and clean up tests for cobertura 2015-06-20 14:23:34 -04:00
jamesagnew
4ab8871a41 POM cleanup 2015-06-09 08:22:46 -04:00
jamesagnew
0f2976358f Version bump to 1.1-SNAPSHOT with more loggging 2015-05-08 08:54:40 -04:00
jamesagnew
dfbe2415d1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:24:34 -04:00
jamesagnew
924ebf062e Preparing for 1.0 release 2015-05-07 20:51:37 -04:00
jamesagnew
b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
2015-04-21 13:30:58 -04:00
James Agnew
c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew
986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
jamesagnew
43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
jamesagnew
3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
jamesagnew
1f3991caf9 Bump version to 0.9-SNAPSHOT 2014-12-17 17:04:10 -05:00
jamesagnew
3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-17 16:08:59 -05:00
jamesagnew
7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
jamesagnew
ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -05:00
James Agnew
3ca9fbbebb Encoding a Binary resource without a content type set should not result
in a NullPointerException.
2014-12-03 13:46:46 -05:00
James Agnew
3d320a8fe3 Fix test yet again! 2014-10-31 15:05:21 -04:00
James Agnew
ae56cf665e Skup failing test on windows 2014-10-31 15:00:26 -04:00
James Agnew
094a617644 Merge branch 'versions'
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
2014-10-29 15:34:59 -04:00
James Agnew
8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00