From 9823ac1eaf98ba9e9e1af9897ae39976b04ae0a9 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Sun, 15 Jan 2017 12:05:40 -0600
Subject: [PATCH] Add sources and javadocs to the distribution JARs

---
 hapi-fhir-dist/pom.xml                        | 102 ++++++++++++++++++
 .../hapi-fhir-standard-distribution.xml       |  19 +++-
 src/changes/changes.xml                       |   5 +
 3 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index acf19c47d41..4a793b05942 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -20,36 +20,138 @@
 			<artifactId>hapi-fhir-base</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-base</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-base</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu2</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu2</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu3</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu3</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>sources</classifier>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-dstu3</artifactId>
+			<version>2.3-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
 			<version>2.3-SNAPSHOT</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-standard-distribution.xml b/hapi-fhir-dist/src/assembly/hapi-fhir-standard-distribution.xml
index 65b4836e7b5..0c6cf856fb8 100644
--- a/hapi-fhir-dist/src/assembly/hapi-fhir-standard-distribution.xml
+++ b/hapi-fhir-dist/src/assembly/hapi-fhir-standard-distribution.xml
@@ -29,7 +29,24 @@
 			<unpack>false</unpack>
 			<scope>runtime</scope>
 		</dependencySet>
+		<dependencySet>
+			<outputDirectory>/src</outputDirectory>
+			<useProjectArtifact>true</useProjectArtifact>
+			<unpack>false</unpack>
+			<includes>
+				<include>*:hapi*:jar:sources:*</include>
+			</includes>
+			<scope>provided</scope>
+		</dependencySet>
+		<dependencySet>
+			<outputDirectory>/javadoc</outputDirectory>
+			<useProjectArtifact>true</useProjectArtifact>
+			<unpack>false</unpack>
+			<includes>
+				<include>*:hapi*:jar:javadoc:*</include>
+			</includes>
+			<scope>provided</scope>
+		</dependencySet>
 	</dependencySets>
-	
 
 </assembly>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ed5f8380f53..576267e8928 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -204,6 +204,11 @@
 				FHIR (and HAPI would just ignore them anyhow). Thanks 
 				to Thomas S Berg for reporting!
 			</action>
+			<action type="add">
+				Standard HAPI zip/tar distributions did not include the project
+				sources and JavaDoc JARs. Thanks to Keith Boone for pointing
+				this out!
+			</action>
 		</release>
 		<release version="2.1" date="2016-11-11">
 			<action type="add">