diff --git a/hapi-fhir-android/dependency-reduced-pom.xml b/hapi-fhir-android/dependency-reduced-pom.xml index 2e7de678356..1e0c0d8a940 100644 --- a/hapi-fhir-android/dependency-reduced-pom.xml +++ b/hapi-fhir-android/dependency-reduced-pom.xml @@ -125,7 +125,7 @@ com.phloc phloc-commons - 4.3.5 + 4.3.6 compile diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 72b43335481..702eceac72f 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${maven_jxr_plugin_version} normal diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml index b5692641426..26d7232c7c4 100644 --- a/hapi-fhir-jpaserver-example/pom.xml +++ b/hapi-fhir-jpaserver-example/pom.xml @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.2 1.6 1.6 diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index c722ae4209a..50a08da4015 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -226,7 +226,7 @@ maven-antrun-plugin - 1.7 + ${maven_antrun_plugin_version} copyNarrativeCss diff --git a/pom.xml b/pom.xml index e07c3e5dfe0..79c880b0e32 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,13 @@ + + 0.9 + UTF-8 @@ -154,7 +161,7 @@ ${user.home}/sites/scm/hapi-fhir - 4.3.6 + 4.4 4.4 2.4 3.3.2 @@ -176,26 +183,29 @@ 4.3.1 4.12 1.1.2 - 2.4.1 + 1.8 + 2.5.3 2.18.1 + 1.6 2.10.1 2.5 - 1.7 + 1.8 + 2.8 2.18.1 3.4 - 2.3 + 2.4 1.1.8 1.10.17 2.7.1 - 4.3.5 + 4.3.6 UTF-8 3.1.0 - 1.7.9 - 4.1.3.RELEASE + 1.7.10 + 4.1.5.RELEASE 3.2.4.RELEASE 2.1.4.RELEASE 1.0.1 - 4.4.0 + 4.4.1 UTF-8 @@ -226,7 +236,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.1 + 2.8.2 org.apache.maven.plugins @@ -353,7 +363,7 @@ maven-antrun-plugin - 1.7 + ${maven_antrun_plugin_version} false @@ -658,7 +668,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${maven_project_info_plugin_version} false @@ -718,7 +728,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + ${maven_gpg_plugin_version} sign-artifacts diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 4c7a0f9c309..9a72a370243 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -4,6 +4,14 @@ James Agnew HAPI FHIR Changelog + diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index fe200b56a9a..cf54ee9ca1c 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -9,14 +9,6 @@
-

- Important note to users of HAPI 0.7 and before: The section below - references "hapi-fhir-structures-dstu-[version].jar", which was added for - HAPI 0.8 (and this version has not yet been released). If you are using HAPI - FHIR 0.7 or before, you only need to include the hapi-fhir-base - JAR, not the structures one. -

-

To use HAPI in your application, at a minimum you need to include the HAPI-FHIR core JAR hapi-fhir-base-[version].jar, as well as at least one "structures" JAR. @@ -30,12 +22,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - ${project.version} + ${hapi_stable_version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - ${project.version} + ${hapi_stable_version} ]]> @@ -50,12 +42,12 @@

- If you are using Maven, add the following dependency to include DEV resources: + If you are using Maven, add the following dependency to include DSTU2 resources:

ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - ${project.version} + ${hapi_stable_version} ]]>