From 7e8f81293e1870a73eb1a4fc723b3c6dc8c3f367 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Wed, 17 Dec 2014 14:22:10 -0500 Subject: [PATCH] Tagging and deploying 0.8 --- examples/pom.xml | 6 +- hapi-deployable-pom/pom.xml | 2 +- hapi-deployable-pom/pom.xml.versionsBackup | 117 ++++++++++++++++++ hapi-fhir-base/pom.xml | 30 +---- hapi-fhir-base/testmindeps/pom.xml | 6 +- hapi-fhir-dist/pom.xml | 100 +++++++++++++++ .../src/assembly/hapi-fhir-all.xml | 9 +- hapi-fhir-jpaserver-base/pom.xml | 6 +- hapi-fhir-jpaserver-test/pom.xml | 8 +- hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 14 +-- hapi-fhir-structures-dev/pom.xml | 8 +- hapi-fhir-structures-dstu/pom.xml | 6 +- hapi-fhir-testpage-overlay/pom.xml | 8 +- hapi-tinder-plugin/pom.xml | 4 +- hapi-tinder-test/pom.xml | 10 +- pom.xml | 3 +- restful-server-example-test/pom.xml | 6 +- restful-server-example/pom.xml | 6 +- src/changes/changes.xml | 2 +- src/site/xdoc/doc_upgrading.xml | 18 +-- src/site/xdoc/index.xml | 47 ++++++- 21 files changed, 318 insertions(+), 98 deletions(-) create mode 100644 hapi-deployable-pom/pom.xml.versionsBackup create mode 100644 hapi-fhir-dist/pom.xml rename {hapi-fhir-base => hapi-fhir-dist}/src/assembly/hapi-fhir-all.xml (80%) diff --git a/examples/pom.xml b/examples/pom.xml index 6f01017290a..c43a8bf80c4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 javax.servlet diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index c54c52212b4..a939fe3fd45 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml diff --git a/hapi-deployable-pom/pom.xml.versionsBackup b/hapi-deployable-pom/pom.xml.versionsBackup new file mode 100644 index 00000000000..c54c52212b4 --- /dev/null +++ b/hapi-deployable-pom/pom.xml.versionsBackup @@ -0,0 +1,117 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-fhir + 0.8-SNAPSHOT + ../pom.xml + + + hapi-deployable-pom + pom + + HAPI FHIR - Deployable Artifact Parent POM + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + scm + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven_javadoc_plugin_version} + + + default + + javadoc + + + + http://jamesagnew.github.io/hapi-fhir/apidocs/ + https://docs.oracle.com/javaee/7/api/ + + + + + + + + + + + DIST + + + + org.apache.maven.plugins + maven-javadoc-plugin + true + + 128m + 1g + true + false + false + + + + package + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven_source_plugin_version} + + + package + + jar-no-fork + + + + + + org.codehaus.mojo + license-maven-plugin + ${maven_license_plugin_version} + + + first + + update-file-header + + process-sources + + apache_v2 + true + true + + src/main/java + + + + + + + + + + + diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index ebef43721bc..df3204c4507 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8-SNAPSHOT + 0.8 ../hapi-deployable-pom/pom.xml @@ -195,39 +195,13 @@ - - DIST - - - - maven-assembly-plugin - ${maven_assembly_plugin_version} - - - package - - single - - - false - - ${project.basedir}/src/assembly/hapi-fhir-all.xml - - - - - - - - - ANDROID ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-base/testmindeps/pom.xml b/hapi-fhir-base/testmindeps/pom.xml index 114863ed25f..abf236e0aff 100644 --- a/hapi-fhir-base/testmindeps/pom.xml +++ b/hapi-fhir-base/testmindeps/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../../pom.xml @@ -40,12 +40,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml new file mode 100644 index 00000000000..d67816e0dd6 --- /dev/null +++ b/hapi-fhir-dist/pom.xml @@ -0,0 +1,100 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-deployable-pom + 0.8 + ../pom.xml + + + hapi-fhir-structures-dstu + pom + + HAPI FHIR Structures - DSTU (FHIR 0.80) + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 0.8 + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + 0.8 + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dev + 0.8 + + + ch.qos.logback + logback-classic + ${logback_version} + + + org.ebaysf.web + cors-filter + ${ebay_cors_filter_version} + + + org.thymeleaf + thymeleaf + ${thymeleaf-version} + + + com.phloc + phloc-schematron + ${phloc_schematron_version} + + + com.phloc + phloc-commons + ${phloc_commons_version} + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + DIST + + + + maven-assembly-plugin + ${maven_assembly_plugin_version} + + + package + + single + + + false + + ${project.basedir}/src/assembly/hapi-fhir-all.xml + + + + + + + + + + + diff --git a/hapi-fhir-base/src/assembly/hapi-fhir-all.xml b/hapi-fhir-dist/src/assembly/hapi-fhir-all.xml similarity index 80% rename from hapi-fhir-base/src/assembly/hapi-fhir-all.xml rename to hapi-fhir-dist/src/assembly/hapi-fhir-all.xml index f47dfeb810e..671f6d703b3 100644 --- a/hapi-fhir-base/src/assembly/hapi-fhir-all.xml +++ b/hapi-fhir-dist/src/assembly/hapi-fhir-all.xml @@ -20,18 +20,11 @@ NOTICE* - - ${project.build.directory} - /lib - - *.jar - - - /lib/dependency + /lib true false runtime diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 36702050c3b..b8cebb3b1a9 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -35,7 +35,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 commons-logging @@ -46,7 +46,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-jpaserver-test/pom.xml b/hapi-fhir-jpaserver-test/pom.xml index b030f9f9c57..f9545a2c634 100644 --- a/hapi-fhir-jpaserver-test/pom.xml +++ b/hapi-fhir-jpaserver-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.8-SNAPSHOT + 0.8 org.thymeleaf @@ -127,7 +127,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8-SNAPSHOT + 0.8 buildclient @@ -160,7 +160,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index ea4f87258d9..a50ded1314b 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -16,17 +16,17 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.8-SNAPSHOT + 0.8 war provided @@ -34,7 +34,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.8-SNAPSHOT + 0.8 test @@ -190,7 +190,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8-SNAPSHOT + 0.8 buildclient @@ -274,7 +274,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-structures-dev/pom.xml b/hapi-fhir-structures-dev/pom.xml index bbcf2fa83eb..0731b3af6a5 100644 --- a/hapi-fhir-structures-dev/pom.xml +++ b/hapi-fhir-structures-dev/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8-SNAPSHOT + 0.8 ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 @@ -32,7 +32,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 test @@ -201,7 +201,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index 609667bb495..73349b272a9 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8-SNAPSHOT + 0.8 ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 @@ -195,7 +195,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8-SNAPSHOT + 0.8 diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 36604cc760b..cb63eb9394a 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -27,12 +27,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 org.thymeleaf @@ -55,7 +55,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.8-SNAPSHOT + 0.8 test diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index e9f510b3eb7..0d41091016f 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8-SNAPSHOT + 0.8 ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8-SNAPSHOT + 0.8 ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.8-SNAPSHOT + 0.8 war provided diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7ea132dc547..3c54cdf50db 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -6,7 +6,7 @@ HAPI FHIR Changelog - + API CHANGE:]]> The "FHIR structures" for DSTU1 (the classes which model the resources and composite datatypes) have been moved out of the core JAR into their diff --git a/src/site/xdoc/doc_upgrading.xml b/src/site/xdoc/doc_upgrading.xml index c6811c33ed6..8d68b1f5e10 100644 --- a/src/site/xdoc/doc_upgrading.xml +++ b/src/site/xdoc/doc_upgrading.xml @@ -13,20 +13,9 @@ - - -

- If you are using the "Tinder" Maven plugin to generate structure code, - you will need to add a structure dependency to the plugin configuration - itself in your project pom.xml. See the - Tinder Page for an example of - how to do this. -

- - -
+

@@ -57,8 +46,9 @@ resources, or both depending on your needs. Note that using DEV resources may introduce incompatibilities with other frameworks however. If you are including this JAR, you must also include hapi-fhir-structures-dstu-[version].jar. - Hopefully by the time 0.8 is final this requirement will be relaxed, but for now it - is mandatory. + We are planning on removing the requirement to include + the DSTU structures in your application (so you can include only the + DEV ones) for HAPI-FHIR 0.9. diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 79f81336d5f..e6e4fb5b15a 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -39,6 +39,50 @@

+

+ Dec 17, 2014 - HAPI FHIR 0.8 Released - HAPI 0.8 has been released! + As always, thanks to everyone who contributed on this; this release includes + a lot of bug fixes and new features from around the world. +

+

+ See the changelog + for a complete list of what's new! +

+

+ In particular, this release marks the beginning of our push to separate the model + classes (e.g. Patient, Encounter, etc.) from the core API, so that you can use any + version of the structures you want in your application, or even combine versions if + you need to. As is the case with HAPI's HL7 v2 library, you now need to include at least + one new separate "structures" JAR with your application as of HAPI-FHIR 0.8. See the + Upgrading + and + Download + pages for more information. +

+

+ With the newly separated "structures" dependencies, we have also introduced + a separate "dev" version of the structures, which contains the current development + structure definitions, which are now close to being in their final DSTU2 state + (DSTU2 should be released in mid 2015 by HL7 although the date is not yet finalized). + DSTU2 contains a number of new and updated resource definitions, but it also makes + several infrastructure changes including a new Bundle format and a new encoding style + for extensions in JSON. These changes are not yet supported in HAPI-FHIR 0.8, but + will be included in HAPI-FHIR 0.9. We expect to deploy a working snapshot build of + HAPI-FHIR 0.9 within the next day or so, including all of these changes. +

+

+ One further note: We are currently working with Grahame Grieve on an initiative + to harmonize HAPI's model objects with the FHIR Java Reference Implementation. This + means that developers should in the future be able to use either the HAPI built-in + resource definitions or the ones shipped by HL7. The advantage to this is that + it will allow users of HAPI's API to take advantage of other tooling produced + by HL7 (such as profile validators). Please get in touch (either by email or + on the Google Group) if you would like to help test this. +

+

+ - James Agnew +

+

Oct 23, 2014 - HAPI FHIR 0.7 Released - HAPI 0.7 has been released! This release contains a number of contributions and bugfixes from all over @@ -68,6 +112,7 @@ - James Agnew

+