Merge pull request #235 from botunge/master

Change android build to work without having to "hack" the jar

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>

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>

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>