Fix android build hopefully

hapi-fhir-android/pom.xml

@@ -4,9 +4,9 @@
 
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
+		<artifactId>hapi-deployable-pom</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>hapi-fhir-android</artifactId>
@@ -167,32 +167,6 @@
 	</build>
 
 	<profiles>
-		<profile>
-			<id>DIST</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<version>${maven_assembly_plugin_version}</version>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<attach>true</attach>
-									<descriptors>
-										<descriptor>${project.basedir}/src/assembly/android-sources.xml</descriptor>
-										<descriptor>${project.basedir}/src/assembly/android-javadoc.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 </project>

hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.android;
 
+/*-
+ * #%L
+ * HAPI FHIR - Android
+ * %%
+ * Copyright (C) 2014 - 2017 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 ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.okhttp.client.OkHttpRestfulClientFactory;
 

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java

@@ -64,6 +64,7 @@ public abstract class BaseResourceProviderDstu3Test extends BaseJpaDstu3Test {
 	@After
 	public void after() throws Exception {
 		myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.ONCE);
+		myDaoConfig.getInterceptors().clear();
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -72,6 +73,7 @@ public abstract class BaseResourceProviderDstu3Test extends BaseJpaDstu3Test {
 		myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER);
 		myFhirCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000);
 		myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
+		myDaoConfig.getInterceptors().clear();
 
 		if (ourServer == null) {
 			ourPort = PortUtil.findFreePort();

hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptorDstu2Test.java

@@ -170,7 +170,7 @@ public class LoggingInterceptorDstu2Test {
 		verify(logger, timeout(1000).times(1)).info(captor.capture());
 		assertThat(captor.getValue(), startsWith("read - "));
 		int millis = Integer.parseInt(captor.getValue().substring("read - ".length()));
-		assertThat(millis, greaterThan(1));
+		assertThat(millis, greaterThan(0));
 	}
 
 	@Test