Fix unit tests

hapi-fhir-base/pom.xml

@@ -78,10 +78,15 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j_version}</version>
 		</dependency>
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>jcl-over-slf4j</artifactId>
+		    <version>${slf4j_version}</version>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.1.1</version>
+			<version>${logback_version}</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -90,6 +95,12 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>4.3.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -169,6 +180,12 @@
 			<version>2.4</version>
 			<classifier>jdk15</classifier>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.json-lib</groupId>
@@ -178,7 +195,7 @@
 			<scope>test</scope>
 		</dependency>
 
-
+		<!-- TODO: why is this here? -->
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>

hapi-fhir-jpaserver-base/pom.xml

@@ -30,7 +30,7 @@
 		<repository>
             <id>maven-geotoolkit.org</id>
             <name>GeoToolkit Repository for Maven</name>
-            <url>http://maven.geotoolkit.org/</url>
+            <url>http://maven.geotoolkit.org/</url> 
         </repository>
          -->
 	</repositories>
@@ -46,10 +46,6 @@
 			<artifactId>hapi-fhir-base</artifactId>
 			<version>0.5-SNAPSHOT</version>
 			<exclusions>
-				<exclusion>
-					<artifactId>commons-codec</artifactId>
-					<groupId>commons-codec</groupId>
-				</exclusion>
 				<exclusion>
 					<artifactId>commons-logging</artifactId>
 					<groupId>commons-logging</groupId>
@@ -57,10 +53,16 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>jcl-over-slf4j</artifactId>
+		    <version>${slf4j_version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>${logback-version}</version>
+			<version>${logback_version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -81,12 +83,12 @@
 		FHIR RI is pulled in for UCUM support, but we don't want any
 		of its dependencies.
 		-->
+		    	<!-- 
 		<dependency>
 		    <groupId>me.fhir</groupId>
 		    <artifactId>fhir-dstu1</artifactId>
 		    <version>0.0.81.2489</version>
 		    <exclusions>
-		    	<!-- 
 		    	<exclusion>
 		    		<artifactId>Saxon-HE</artifactId>
 		    		<groupId>net.sf.saxon</groupId>
@@ -119,9 +121,9 @@
 		    		<artifactId>gson</artifactId>
 		    		<groupId>com.google.code.gson</groupId>
 		    	</exclusion>
-		    	 -->
 		    </exclusions>
 		</dependency>
+		    	 -->
 
 				
 		<!-- Test Database -->

hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component

@@ -12,7 +12,7 @@
         <dependent-module archiveName="hapi-fhir-base-0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-tester-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
+        <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
             <dependency-type>consumes</dependency-type>
         </dependent-module>
         <dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">

hapi-fhir-jpaserver-uhnfhirtest/pom.xml

@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>${logback-version}</version>
+			<version>${logback_version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.slf4j</groupId>

hapi-fhir-testpage-overlay/pom.xml

@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>${logback-version}</version>
+			<version>${logback_version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

pom.xml

@@ -76,7 +76,7 @@
 		<jetty_version>9.1.1.v20140108</jetty_version>
 		<jetty_version>9.1.1.v20140108</jetty_version>
 		<junit_version>4.11</junit_version>
-		<logback-version>1.1.1</logback-version>
+		<logback_version>1.1.1</logback_version>
 		<maven_javadoc_plugin_version>2.9.1</maven_javadoc_plugin_version>
 		<maven_site_plugin_version>3.3</maven_site_plugin_version>
 		<mockito_version>1.9.5</mockito_version>