From 68b816dce7001bdd69113ab7bddfa102fcbd9c34 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 3 Feb 2016 16:56:32 -0500
Subject: [PATCH] Prepare for 1.4 release

---
 .../fhir/rest/param/TokenParamModifier.java   | 20 +++++++++++++++++++
 hapi-fhir-dist/pom.xml                        | 10 ++++++++++
 .../hapi-fhir-android-distribution.xml        |  4 ++++
 .../JpaValidationSupportChainDstu3.java       | 20 +++++++++++++++++++
 pom.xml                                       |  6 +++---
 src/site/site.xml                             |  7 +++----
 6 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java
index f6a726274b0..290ece3681b 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParamModifier.java
@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.param;
 
+/*
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * Copyright (C) 2014 - 2016 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index 7c85bae410e..d96ff2ae4cc 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -35,11 +35,21 @@
 			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
 			<version>1.4</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu3</artifactId>
+			<version>1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
 			<version>1.4</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
+			<version>1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-cli-app</artifactId>
diff --git a/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml b/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
index 8cbd48818d4..095ee73d786 100644
--- a/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
+++ b/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
@@ -20,6 +20,8 @@
 				<include>hapi-fhir-android-${project.version}-dstu-sources.jar</include>
 				<include>hapi-fhir-android-${project.version}-dstu2.jar</include>
 				<include>hapi-fhir-android-${project.version}-dstu2-sources.jar</include>
+				<include>hapi-fhir-android-${project.version}-dstu3.jar</include>
+				<include>hapi-fhir-android-${project.version}-dstu3-sources.jar</include>
 			</includes>
 		</fileSet>
 	</fileSets>
@@ -39,8 +41,10 @@
 				<exclude>ca.uhn.hapi.fhir:hapi-fhir-base</exclude>
 				<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</exclude>
 				<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</exclude>
+				<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3</exclude>
 				<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-hl7org-dstu2</exclude>
 				<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu2</exclude>
+				<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu3</exclude>
 				<exclude>org.glassfish:javax.json</exclude>
 				<exclude>org.codehaus.woodstox:woodstox-core-asl</exclude>
 				<exclude>javax.xml.stream:stax-api</exclude>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java
index 5366a5e3d6a..1b752d3656c 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java
@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.validation;
 
+/*
+ * #%L
+ * HAPI FHIR JPA Server
+ * %%
+ * Copyright (C) 2014 - 2016 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import javax.annotation.PostConstruct;
 
 import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport;
diff --git a/pom.xml b/pom.xml
index 45997675c06..bef5d1f81e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1024,12 +1024,12 @@
 								<copy todir="target/site/apidocs-dstu">
 									<fileset dir="hapi-fhir-structures-dstu/target/site/apidocs"/>
 								</copy>
-								<copy todir="target/site/apidocs-hl7org-dstu2">
-									<fileset dir="hapi-fhir-structures-hl7org-dstu2/target/site/apidocs"/>
-								</copy>
 								<copy todir="target/site/apidocs-dstu2">
 									<fileset dir="hapi-fhir-structures-dstu2/target/site/apidocs"/>
 								</copy>
+								<copy todir="target/site/apidocs-dstu3">
+									<fileset dir="hapi-fhir-structures-dstu3/target/site/apidocs"/>
+								</copy>
 								<copy todir="target/site/apidocs-jpaserver">
 									<fileset dir="hapi-fhir-jpaserver-base/target/site/apidocs"/>
 								</copy>
diff --git a/src/site/site.xml b/src/site/site.xml
index 10c18bcd022..57f5afe35eb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -80,7 +80,7 @@
 		<menu name="Documentation" inherit="top" >
 			<item name="Documentation Index" href="./docindex.html"/>
 			<item name="Introduction" href="./doc_intro.html"/>
-			<item name="DSTU2 Support / HL7.org Structures" href="./doc_dstu2.html" />
+			<item name="DSTU3 Support / HL7.org Structures" href="./doc_dstu2.html" />
 			<item name="The Data Model" href="./doc_fhirobjects.html">
 				<item name="Working with Resources" href="./doc_fhirobjects.html" />
 				<item name="Resource References" href="./doc_resource_references.html" />
@@ -111,7 +111,7 @@
 				<item name="Core API" href="./apidocs/index.html" />
 				<item name="Model API (DSTU1)" href="./apidocs-dstu/index.html" />
 				<item name="Model API (DSTU2)" href="./apidocs-dstu2/index.html" />
-				<item name="Model API (RI DSTU2)" href="./apidocs-hl7org-dstu2/index.html" />
+				<item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" />
 				<item name="JPA Server API" href="./apidocs-jpaserver/index.html" />
 			</item>
 			<item name="Command Line Tool (hapi-fhir-cli)" href="./doc_cli.html" />
@@ -123,7 +123,7 @@
 			<item name="Core API" href="./apidocs/index.html" />
 			<item name="Model API (DSTU1)" href="./apidocs-dstu/index.html" />
 			<item name="Model API (DSTU2)" href="./apidocs-dstu2/index.html" />
-			<item name="Model API (RI DSTU2)" href="./apidocs-hl7org-dstu2/index.html" />
+			<item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" />
 			<item name="JPA Server API" href="./apidocs-jpaserver/index.html" />
 		</menu>
 		<menu name="JXR" inherit="top">
@@ -142,7 +142,6 @@
 			<item name="Vagrant Private Test Server" href="./doc_vagrant.html"/>
 		</menu>
 		
-		
 		<menu name="Reports" inherit="bottom">
 			<item name="Project Developers" href="team-list.html" />
 			<item name="Coveralls (Test Coverage)" href="https://coveralls.io/github/jamesagnew/hapi-fhir" />