From 74557d6e85bf477f004c4895010859b31ffc03bf Mon Sep 17 00:00:00 2001
From: Thomas Andersen <botunge@botunge.dk>
Date: Wed, 30 Sep 2015 23:10:38 +0200
Subject: [PATCH] Android missing required files and releases artifacts

Make android build include missing required class files and make android
distribution contain actual jars with code and not just a useless
android loader
---
 hapi-fhir-android/.classpath                                   | 1 -
 hapi-fhir-android/pom.xml                                      | 1 -
 hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hapi-fhir-android/.classpath b/hapi-fhir-android/.classpath
index a77c91734cc..0a155ef50de 100644
--- a/hapi-fhir-android/.classpath
+++ b/hapi-fhir-android/.classpath
@@ -23,6 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="target/hapi-fhir-android-1.2-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
index 29fbcbcfc3a..2dcd3a1932b 100644
--- a/hapi-fhir-android/pom.xml
+++ b/hapi-fhir-android/pom.xml
@@ -207,7 +207,6 @@
 								<filter>
 									<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>
 									<excludes>
-										<exclude>ca/uhn/fhir/model/dstu/valueset/**</exclude>
 										<exclude>**/*.java</exclude>
 									</excludes>
 								</filter>
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 fb45ba4e4a7..e98c367655a 100644
--- a/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
+++ b/hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
@@ -15,7 +15,7 @@
 			<directory>${project.basedir}/../hapi-fhir-android/target/</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
-				<include>hapi-fhir-android-${project.version}.jar</include>
+				<include>hapi-fhir-android-${project.version}*.jar</include>
 			</includes>
 		</fileSet>
 	</fileSets>