From ebd0f222f430587e011836b9a7618d9cff584964 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Sat, 13 Dec 2014 13:03:38 -0500
Subject: [PATCH] Remove artifacts from merge

---
 examples/pom.xml.orig                        |  52 --
 hapi-deployable-pom/pom.xml.orig             | 127 ----
 hapi-fhir-base/testmindeps/pom.xml.orig      |  68 --
 hapi-fhir-jpaserver-uhnfhirtest/pom.xml.orig | 308 ---------
 hapi-fhir-testpage-overlay/pom.xml.orig      | 245 -------
 hapi-tinder-plugin/pom.xml.orig              | 189 ------
 hapi-tinder-test/pom.xml.orig                | 153 -----
 pom.xml.orig                                 | 633 -------------------
 restful-server-example-test/pom.xml.orig     |  88 ---
 restful-server-example/pom.xml.orig          | 187 ------
 10 files changed, 2050 deletions(-)
 delete mode 100644 examples/pom.xml.orig
 delete mode 100644 hapi-deployable-pom/pom.xml.orig
 delete mode 100644 hapi-fhir-base/testmindeps/pom.xml.orig
 delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/pom.xml.orig
 delete mode 100644 hapi-fhir-testpage-overlay/pom.xml.orig
 delete mode 100644 hapi-tinder-plugin/pom.xml.orig
 delete mode 100644 hapi-tinder-test/pom.xml.orig
 delete mode 100644 pom.xml.orig
 delete mode 100644 restful-server-example-test/pom.xml.orig
 delete mode 100644 restful-server-example/pom.xml.orig

diff --git a/examples/pom.xml.orig b/examples/pom.xml.orig
deleted file mode 100644
index d20bcfb8574..00000000000
--- a/examples/pom.xml.orig
+++ /dev/null
@@ -1,52 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-fhir-base-examples</artifactId>
-	<packaging>jar</packaging>
-
-	<name>HAPI FHIR - Examples (for site)</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit_version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/hapi-deployable-pom/pom.xml.orig b/hapi-deployable-pom/pom.xml.orig
deleted file mode 100644
index e58ae1fc7d6..00000000000
--- a/hapi-deployable-pom/pom.xml.orig
+++ /dev/null
@@ -1,127 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-deployable-pom</artifactId>
-	<packaging>pom</packaging>
-	
-	<name>HAPI FHIR - Deployable Artifact Parent POM</name>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.7</version>
-<<<<<<< HEAD
-				<reportSets>
-					<reportSet>
-						<reports>
-=======
-				<inherited>false</inherited>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>scm</report>
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven_javadoc_plugin_version}</version>
-				<reportSets>
-					<reportSet>
-						<id>default</id>
-						<reports>
-							<report>javadoc</report>
-						</reports>
-						<configuration>
-							<links>
-								<link>http://docs.oracle.com/javaee/7/api</link>
-<<<<<<< HEAD
-=======
-								<link>http://jamesagnew.github.io/hapi-fhir/apidocs</link>
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-							</links>
-						</configuration>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<profiles>
-		<profile>
-			<id>DIST</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<inherited>true</inherited>
-						<configuration>
-							<minmemory>128m</minmemory>
-							<maxmemory>1g</maxmemory>
-							<linksource>true</linksource>
-							<verbose>false</verbose>
-							<debug>false</debug>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>${maven_source_plugin_version}</version>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>jar-no-fork</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>license-maven-plugin</artifactId>
-						<version>${maven_license_plugin_version}</version>
-						<executions>
-							<execution>
-								<id>first</id>
-								<goals>
-									<goal>update-file-header</goal>
-								</goals>
-								<phase>process-sources</phase>
-								<configuration>
-									<licenseName>apache_v2</licenseName>
-									<canUpdateDescription>true</canUpdateDescription>
-									<canUpdateCopyright>true</canUpdateCopyright>
-									<roots>
-										<root>src/main/java</root>
-									</roots>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
diff --git a/hapi-fhir-base/testmindeps/pom.xml.orig b/hapi-fhir-base/testmindeps/pom.xml.orig
deleted file mode 100644
index ae01d279cb5..00000000000
--- a/hapi-fhir-base/testmindeps/pom.xml.orig
+++ /dev/null
@@ -1,68 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-fhir-base-testmindeps</artifactId>
-	<packaging>jar</packaging>
-
-	<name>HAPI FHIR - Minimal Dependency Test</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>jetty</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5-6.0.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>6.1.26</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.7</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
-	</dependencies>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.orig b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.orig
deleted file mode 100644
index 0418223e7d4..00000000000
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.orig
+++ /dev/null
@@ -1,308 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-fhir-jpaserver-uhnfhirtest</artifactId>
-
-	<name>HAPI FHIR - fhirtest.uhn.ca Deployable WAR</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-testpage-overlay</artifactId>
-			<version>0.8-SNAPSHOT</version>
-			<type>war</type>
-			<scope>provided</scope>		
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test</artifactId>
-			<version>0.8-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-
-		<dependency>
-		    <groupId>org.hsqldb</groupId>
-		    <artifactId>hsqldb</artifactId>
-		    <version>2.3.2</version>
-		    <scope>provided</scope>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.apache.derby</groupId>
-		    <artifactId>derby</artifactId>
-		    <version>${derby_version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.derby</groupId>
-		    <artifactId>derbynet</artifactId>
-		    <version>${derby_version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.derby</groupId>
-		    <artifactId>derbyclient</artifactId>
-		    <version>${derby_version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf</artifactId>
-			<version>${thymeleaf-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback_version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.slf4j</groupId>
-		    <artifactId>jcl-over-slf4j</artifactId>
-		    <version>${slf4j_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j_version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>17.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- TEST DEPS -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlets</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-		</dependency>
-		
-		<!-- Only required for CORS support -->
-		<dependency>
-			<groupId>org.ebaysf.web</groupId>
-			<artifactId>cors-filter</artifactId>
-			<version>${ebay_cors_filter_version}</version>
-		</dependency>
-		
-	</dependencies>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId></groupId>
-										<artifactId></artifactId>
-										<versionRange>[0.4,)</versionRange>
-										<goals>
-											<goal></goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>ca.uhn.hapi.fhir</groupId>
-				<artifactId>hapi-tinder-plugin</artifactId>
-				<version>0.8-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<id>buildclient</id>
-						<goals>
-							<goal>generate-jparest-server</goal>
-						</goals>
-						<configuration>
-							<version>dstu</version>
-							<packageBase>ca.uhn.test.jpasrv</packageBase>
-							<baseResourceNames>
-								<baseResourceName>adversereaction</baseResourceName>
-								<baseResourceName>alert</baseResourceName>
-								<baseResourceName>allergyintolerance</baseResourceName>
-								<baseResourceName>appointmentresponse</baseResourceName>
-								<baseResourceName>appointment</baseResourceName>
-								<baseResourceName>availability</baseResourceName>
-								<baseResourceName>careplan</baseResourceName>
-								<baseResourceName>composition</baseResourceName>
-								<baseResourceName>conceptmap</baseResourceName>
-								<baseResourceName>condition</baseResourceName>
-								<baseResourceName>conformance</baseResourceName>
-								<baseResourceName>coverage</baseResourceName>
-								<baseResourceName>deviceobservationreport</baseResourceName>
-								<baseResourceName>device</baseResourceName>
-								<baseResourceName>diagnosticorder</baseResourceName>
-								<baseResourceName>diagnosticreport</baseResourceName>
-								<baseResourceName>documentmanifest</baseResourceName>
-								<baseResourceName>documentreference</baseResourceName>
-								<baseResourceName>encounter</baseResourceName>
-								<baseResourceName>familyhistory</baseResourceName>
-								<baseResourceName>geneexpression</baseResourceName>
-								<baseResourceName>geneticanalysis</baseResourceName>
-								<baseResourceName>group</baseResourceName>
-								<baseResourceName>gvfmeta</baseResourceName>
-								<baseResourceName>gvfvariant</baseResourceName>
-								<baseResourceName>imagingstudy</baseResourceName>
-								<baseResourceName>immunizationrecommendation</baseResourceName>
-								<baseResourceName>immunization</baseResourceName>
-								<baseResourceName>list</baseResourceName>
-								<baseResourceName>location</baseResourceName>
-								<baseResourceName>media</baseResourceName>
-								<baseResourceName>medicationadministration</baseResourceName>
-								<baseResourceName>medicationdispense</baseResourceName>
-								<baseResourceName>medicationprescription</baseResourceName>
-								<baseResourceName>medication</baseResourceName>
-								<baseResourceName>medicationstatement</baseResourceName>
-								<baseResourceName>messageheader</baseResourceName>
-								<baseResourceName>microarray</baseResourceName>
-								<baseResourceName>observation</baseResourceName>
-								<baseResourceName>operationoutcome</baseResourceName>
-								<baseResourceName>orderresponse</baseResourceName>
-								<baseResourceName>order</baseResourceName>
-								<baseResourceName>organization</baseResourceName>
-								<baseResourceName>other</baseResourceName>
-								<baseResourceName>patient</baseResourceName>
-								<baseResourceName>practitioner</baseResourceName>
-								<baseResourceName>procedure</baseResourceName>
-								<baseResourceName>profile</baseResourceName>
-								<baseResourceName>provenance</baseResourceName>
-								<baseResourceName>query</baseResourceName>
-								<baseResourceName>questionnaire</baseResourceName>
-								<baseResourceName>relatedperson</baseResourceName>
-								<baseResourceName>remittance</baseResourceName>
-								<baseResourceName>securityevent</baseResourceName>
-								<baseResourceName>sequencinganalysis</baseResourceName>
-								<baseResourceName>sequencinglab</baseResourceName>
-								<baseResourceName>slot</baseResourceName>
-								<baseResourceName>specimen</baseResourceName>
-								<baseResourceName>substance</baseResourceName>
-								<baseResourceName>supply</baseResourceName>
-								<baseResourceName>user</baseResourceName>
-								<baseResourceName>valueset</baseResourceName>
-							</baseResourceNames>
-							<buildDatatypes>true</buildDatatypes>
-							<targetResourceDirectory>${project.build.directory}/hapi-fhir-jpaserver/WEB-INF</targetResourceDirectory>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders.xml</targetResourceSpringBeansFile>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ca.uhn.hapi.fhir</groupId>
-						<artifactId>hapi-fhir-structures-dstu</artifactId>
-						<version>0.8-SNAPSHOT</version>
-					</dependency>
-				</dependencies>
-			</plugin>		
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<overlays>
-						<overlay>
-							<groupId>ca.uhn.hapi.fhir</groupId>
-							<artifactId>hapi-fhir-testpage-overlay</artifactId>
-						</overlay>
-					</overlays>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-		<finalName>hapi-fhir-jpaserver</finalName>
-	</build>
-
-	<packaging>war</packaging>
-</project>
diff --git a/hapi-fhir-testpage-overlay/pom.xml.orig b/hapi-fhir-testpage-overlay/pom.xml.orig
deleted file mode 100644
index 997d6f28ff5..00000000000
--- a/hapi-fhir-testpage-overlay/pom.xml.orig
+++ /dev/null
@@ -1,245 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-fhir-testpage-overlay</artifactId>
-	<packaging>war</packaging>
-
-	<name>HAPI FHIR TestPage Overlay</name>
-
-	<repositories>
-		<repository>
-			<id>oss-snapshots</id>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf</artifactId>
-			<version>${thymeleaf-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring4</artifactId>
-			<version>${thymeleaf-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test</artifactId>
-			<version>0.8-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>${hamcrest_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.htmlunit</groupId>
-			<artifactId>htmlunit</artifactId>
-			<version>2.16-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Database -->
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Test Database -->
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>${derby_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>2.3.2</version> </dependency> -->
-
-		<!-- Spring -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring_version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>xml-apis</artifactId>
-					<groupId>xml-apis</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring_version}</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlets</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>copyNarrativeCss</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<copy todir="${project.build.directory}/${project.build.finalName}/css" flatten="true" failonerror="true">
-									<resources>
-										<file file="${basedir}/../hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/hapi-narrative.css" />
-									</resources>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/hapi-tinder-plugin/pom.xml.orig b/hapi-tinder-plugin/pom.xml.orig
deleted file mode 100644
index fa1f3bf3cd2..00000000000
--- a/hapi-tinder-plugin/pom.xml.orig
+++ /dev/null
@@ -1,189 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-tinder-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<!-- <packaging>jar</packaging> -->
-
-	<name>HAPI Tinder Plugin</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<!-- 
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.7-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
- 		-->
- 		
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>1.7</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-tools</artifactId>
-			<version>2.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>17.0</version>
-		</dependency>
-
-		<!-- General -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.6</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.1</version>
-			<optional>true</optional>
-		</dependency>
-
-		<!-- Testing -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Maven -->
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
-			<version>2.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>3.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.2</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<properties>
-		<maven_version>3.1.1</maven_version>
-	</properties>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.2</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.2</version>
-				<configuration>
-					<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
-					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-				</configuration>
-
-				<executions>
-					<execution>
-						<id>mojo-descriptor</id>
-						<goals>
-							<goal>descriptor</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> 
-				<version>3.2</version> <configuration> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> 
-				</configuration> <executions> <execution> <id>mojo-descriptor</id> <goals> 
-				<goal>descriptor</goal> </goals> </execution> </executions> </plugin> -->
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-plugin-plugin
-										</artifactId>
-										<versionRange>
-											[3.2,)
-										</versionRange>
-										<goals>
-											<goal>descriptor</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-</project>
-
diff --git a/hapi-tinder-test/pom.xml.orig b/hapi-tinder-test/pom.xml.orig
deleted file mode 100644
index 3c3ca7e7e19..00000000000
--- a/hapi-tinder-test/pom.xml.orig
+++ /dev/null
@@ -1,153 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-tinder-test</artifactId>
-	<packaging>jar</packaging>
-
-	<name>HAPI Tinder Plugin - Test Project</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<!-- <plugin> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-tinder-plugin</artifactId> <version>1.0-SNAPSHOT</version> <executions> <execution> <id>structs</id> <goals> <goal>generate-structures</goal> 
-				</goals> <configuration> <package>ca.uhn.tindertest</package> <baseResourceNames> <baseResourceName>patient</baseResourceName> <baseResourceName>valueset</baseResourceName> <baseResourceName>organization</baseResourceName> 
-				<baseResourceName>device</baseResourceName> <baseResourceName>location</baseResourceName> <baseResourceName>practitioner</baseResourceName> </baseResourceNames> </configuration> </execution> 
-				<execution> <id>client</id> <goals> <goal>generate-client</goal> </goals> <configuration> <clientClassName>ca.uhn.hitest.HiTest</clientClassName> <serverBaseHref>http://fhir.healthintersections.com.au/open</serverBaseHref> 
-				<generateSearchForAllParams>true</generateSearchForAllParams> </configuration> </execution> </executions> </plugin> -->
-
-			<plugin>
-				<groupId>ca.uhn.hapi.fhir</groupId>
-				<artifactId>hapi-tinder-plugin</artifactId>
-				<version>0.8-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<id>custom-structs</id>
-						<goals>
-							<goal>generate-structures</goal>
-						</goals>
-						<configuration>
-							<package>ca.uhn.test.customstructs</package>
-							<profileHttpBase>http://foo</profileHttpBase>
-							<version>dstu</version>
-							<resourceProfileFiles>
-								<resourceProfileFile>
-									<profileFile>${project.basedir}/src/test/resources/profile/patient.xml</profileFile>
-									<profileSourceUrl>http://foo1</profileSourceUrl>
-								</resourceProfileFile>
-								<resourceProfileFile>
-									<profileFile>${project.basedir}/src/test/resources/profile/organization.xml</profileFile>
-									<profileSourceUrl>http://foo1</profileSourceUrl>
-								</resourceProfileFile>
-							</resourceProfileFiles>
-							<resourceValueSetFiles>
-								<resourceValueSetFile>
-									<valueSetFile>${project.basedir}/src/test/resources/valueset/valueset-cgta-patientidpool.xml</valueSetFile>
-								</resourceValueSetFile>
-								<resourceValueSetFile>
-									<valueSetFile>${project.basedir}/src/test/resources/valueset/valueset-cgta-provideridpool.xml</valueSetFile>
-								</resourceValueSetFile>
-							</resourceValueSetFiles>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generalstructs</id>
-						<goals>
-							<goal>generate-structures</goal>
-						</goals>
-						<configuration>
-							<package>ca.uhn.test.realstructs</package>
-							<version>dstu</version>
-							<baseResourceNames>
-								<baseResourceName>patient</baseResourceName>
-								<baseResourceName>valueset</baseResourceName>
-								<baseResourceName>organization</baseResourceName>
-								<baseResourceName>device</baseResourceName>
-								<baseResourceName>location</baseResourceName>
-								<baseResourceName>practitioner</baseResourceName>
-								<baseResourceName>list</baseResourceName>
-								<baseResourceName>securityevent</baseResourceName>
-							</baseResourceNames>
-							<buildDatatypes>true</buildDatatypes>
-						</configuration>
-					</execution>
-					<!-- <execution> <id>client</id> <goals> <goal>generate-client</goal> </goals> <configuration> <clientClassName>ca.uhn.hitest.HiTest</clientClassName> <serverBaseHref>http://fhir.healthintersections.com.au/open</serverBaseHref> 
-						<generateSearchForAllParams>true</generateSearchForAllParams> </configuration> </execution> -->
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ca.uhn.hapi.fhir</groupId>
-						<artifactId>hapi-fhir-structures-dstu</artifactId>
-						<version>0.8-SNAPSHOT</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>ca.uhn.hapi.fhir</groupId>
-										<artifactId>hapi-tinder-plugin</artifactId>
-										<versionRange>[0.4-SNAPSHOT,)</versionRange>
-										<goals>
-											<goal>generate-structures</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-</project>
diff --git a/pom.xml.orig b/pom.xml.orig
deleted file mode 100644
index e70afbe1dab..00000000000
--- a/pom.xml.orig
+++ /dev/null
@@ -1,633 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>9</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>ca.uhn.hapi.fhir</groupId>
-	<artifactId>hapi-fhir</artifactId>
-	<packaging>pom</packaging>
-	<version>0.8-SNAPSHOT</version>
-	<name>HAPI-FHIR</name>
-	<url>http://hl7api.sourceforge.net/hapi-fhir/</url>
-
-	<organization>
-		<name>University Health Network</name>
-		<url>http://www.uhn.ca</url>
-	</organization>
-
-	<inceptionYear>2014</inceptionYear>
-
-	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/jamesagnew/hapi-fhir/issues/</url>
-	</issueManagement>
-
-	<distributionManagement>
-		<site>
-			<id>git.server</id>
-			<url>scm:git:git@github.com:jamesagnew/hapi-fhir.git</url>
-		</site>
-	</distributionManagement>
-
-	<scm>
-		<connection>scm:git:git@github.com:jamesagnew/hapi-fhir.git</connection>
-		<url>scm:git:git@github.com:jamesagnew/hapi-fhir.git</url>
-		<developerConnection>scm:git:git@github.com:jamesagnew/hapi-fhir.git</developerConnection>
-	</scm>
-
-	<description>
-	</description>
-
-	<dependencies>
-	</dependencies>
-
-	<prerequisites>
-		<maven>3.0.1</maven>
-	</prerequisites>
-
-	<developers>
-		<developer>
-			<id>jamesagnew</id>
-			<name>James Agnew</name>
-			<organization>University Health Network</organization>
-		</developer>
-		<developer>
-			<name>Dmitri Sotnikov</name>
-			<organization>University Health Network</organization>
-		</developer>
-		<developer>
-			<name>Lisa Wong</name>
-			<organization>University Health Network</organization>
-		</developer>
-		<developer>
-			<name>Josh Mandel</name>
-			<organization>Boston Children's Hospital</organization>
-		</developer>
-		<developer>
-			<name>Laura MacDougall Sookraj</name>
-			<organization>University Health Network</organization>
-		</developer>
-		<developer>
-			<name>Neal Acharya</name>
-			<organization>University Health Network</organization>
-		</developer>
-		<developer>
-			<name>David Hay</name>
-			<organization>Orion Health</organization>
-		</developer>
-		<developer>
-			<id>suranga</id>
-			<name>Suranga Nath Kasthurirathne</name>
-			<organization>OpenMRS / Regenstrief Center for Biomedical Informatics</organization>
-		</developer>
-		<developer>
-			<id>dougmartin</id>
-			<name>Doug Martin</name>
-			<organization>Regenstrief Center for Biomedical Informatics</organization>
-		</developer>
-		<developer>
-			<id>akley</id>
-			<name>Alexander Kley</name>
-		</developer>
-		<developer>
-			<id>preston</id>
-			<name>Preston Lee</name>
-			<organization>Arizona State University</organization>
-		</developer>
-		<developer>
-			<id>jathman</id>
-			<name>Joe Athman</name>
-		</developer>
-		<developer>
-			<id>petromykhailysyn</id>
-			<name>Petro Mykhailyshyn</name>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>Apache Software License 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		
-		<!-- For site-deploy -->
-		<siteMainDirectory>${user.home}/sites/hapi-fhir</siteMainDirectory>
-		<scmPubCheckoutDirectory>${user.home}/sites/scm/hapi-fhir</scmPubCheckoutDirectory>
-
-		<!-- Plugin Versions -->
-		<commons_lang_version>3.3.2</commons_lang_version>
-		<derby_version>10.11.1.1</derby_version>
-		<guava_version>18.0</guava_version>
-		<hamcrest_version>1.3</hamcrest_version>
-		<hibernate_version>4.2.12.Final</hibernate_version>
-		<hibernate_validator_version>5.1.0.Final</hibernate_validator_version>
-		<jetty_version>9.2.2.v20140723</jetty_version>
-		<jscience_version>4.3.1</jscience_version>
-		<junit_version>4.11</junit_version>
-		<logback_version>1.1.2</logback_version>
-		<maven_assembly_plugin_version>2.4.1</maven_assembly_plugin_version>
-		<maven_javadoc_plugin_version>2.9.1</maven_javadoc_plugin_version>
-		<maven_license_plugin_version>1.7</maven_license_plugin_version>
-		<maven_surefire_plugin_version>2.17</maven_surefire_plugin_version>
-		<maven_site_plugin_version>3.4</maven_site_plugin_version>
-		<maven_source_plugin_version>2.3</maven_source_plugin_version>
-		<mitreid-connect-version>1.1.8</mitreid-connect-version>
-		<mockito_version>1.9.5</mockito_version>
-		<phloc_schematron_version>2.7.1</phloc_schematron_version>
-		<phloc_commons_version>4.3.3</phloc_commons_version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<servlet_api_version>3.1.0</servlet_api_version>
-		<slf4j_version>1.7.7</slf4j_version>
-		<spring_version>4.1.0.RELEASE</spring_version>
-		<spring_security_version>3.2.4.RELEASE</spring_security_version>
-		<thymeleaf-version>2.1.3.RELEASE</thymeleaf-version>
-		<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
-		<woodstox_version>4.4.0</woodstox_version>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>${maven_surefire_plugin_version}</version>
-					<configuration>
-						<redirectTestOutputToFile>true</redirectTestOutputToFile>
-						<runOrder>random</runOrder>
-						<!--<argLine>-Dfile.encoding=ISO-8859-1</argLine> -->
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>${maven_site_plugin_version}</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-ssh</artifactId>
-							<version>1.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.doxia</groupId>
-							<artifactId>doxia-module-markdown</artifactId>
-							<version>1.6</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<skip>true</skip>
-						<skipDeploy>true</skipDeploy>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.8.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>${maven_javadoc_plugin_version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>${maven_source_plugin_version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>${maven_license_plugin_version}</version>
-					<configuration>
-						<verbose>true</verbose>
-						<addSvnKeyWords>false</addSvnKeyWords>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>${maven_site_plugin_version}</version>
-					<configuration>
-						<skip>false</skip>
-						<skipDeploy>true</skipDeploy>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-scm</artifactId>
-							<version>2.2</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.scm</groupId>
-							<artifactId>maven-scm-manager-plexus</artifactId>
-							<version>1.9</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.scm</groupId>
-							<artifactId>maven-scm-provider-gitexe</artifactId>
-							<version>1.9</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.maven.scm</groupId>
-							<artifactId>maven-scm-api</artifactId>
-							<version>1.9</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>copySubProjects</id>
-						<phase>site</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<copy todir="target/site/apidocs">
-									<fileset dir="hapi-fhir-base/target/site/apidocs"/>
-								</copy>
-								<copy todir="target/site/apidocs-dstu">
-									<fileset dir="hapi-fhir-structures-dstu/target/site/apidocs"/>
-								</copy>
-								<copy todir="target/site/apidocs-dev">
-									<fileset dir="hapi-fhir-structures-dev/target/site/apidocs"/>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-					<execution>
-						<id>addSyntaxHighlighter</id>
-						<phase>site</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<echo>Adding Syntax Highlighter</echo>
-								<replace dir="target/site" summary="true">
-									<include name="*.html"></include>
-									<replacetoken><![CDATA[</body>]]></replacetoken>
-									<replacevalue><![CDATA[
-<script type="text/javascript">
-	var elements = document.getElementsByClassName("source");
-	for (var i=0; i < elements.length; i++) {
-		var pres = elements[i].getElementsByTagName("pre");
-		for (var j = 0; j < pres.length; j++) {
-			var pre = pres[j];
-			if (pre.innerHTML.match(/\/\*/)) {
-				pre.className = 'brush: java';
-			} else if (pre.innerHTML.match(/^\/\//)) {
-				pre.className = 'brush: java';
-			} else if (pre.innerHTML.match(/^\{/)) {
-				pre.className = 'brush: jscript';
-			} else if (pre.innerHTML.match(/^\#/)) {
-				pre.className = 'brush: bash';
-			} else if (pre.innerHTML.match(/\&lt\;\//)) {
-				pre.className = 'brush: xml';
-			} else {
-				pre.className = 'brush: java';
-			}
-		}
-	}
-
-	SyntaxHighlighter.all();
-</script>
-</body>
-									]]></replacevalue>
-								</replace>
-							</target>
-						</configuration>
-					</execution>
-					<execution>
-						<id>addAnalytics</id>
-						<phase>post-site</phase>
-						<configuration>
-							<target>
-								<echo>Adding Google analytics in target/site for &lt;body&gt;</echo>
-								<replace dir="target/site" summary="true">
-									<include name="**/*.html"></include>
-									<replacefilter token="#build#" value="${label}" />
-									<replacefilter token="#version#" value="${project.version}" />
-									<replacetoken><![CDATA[</body>]]></replacetoken>
-									<replacevalue><![CDATA[
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-1395874-5', 'auto');
-  ga('require', 'displayfeatures');
-  ga('require', 'linkid', 'linkid.js');
-  ga('send', 'pageview');
-
-</script>
-                </body >
-                ]]></replacevalue>
-								</replace>
-								<echo>Adding Google analytics in target/site for &lt;BODY&gt;</echo>
-								<replace dir="target/site" summary="true">
-									<include name="**/*.html"></include>
-									<replacetoken><![CDATA[</BODY>]]></replacetoken>
-									<replacevalue><![CDATA[
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-1395874-5', 'auto');
-  ga('require', 'displayfeatures');
-  ga('require', 'linkid', 'linkid.js');
-  ga('send', 'pageview');
-
-</script>
-                </BODY >
-                ]]></replacevalue>
-								</replace>
-								<echo>Adding social plugins for HAPI</echo>
-								<replace dir="target/site/" summary="true">
-									<include name="**/*.html"></include>
-									<replacetoken><![CDATA[SOCIALPLUGINSHEREFHIR]]></replacetoken>
-									<replacevalue><![CDATA[
-            	<table cellpadding="0" cellspacing="0" border="0"><tr>
-            	<td><div class="g-plusone" data-annotation="inline" data-width="300" data-href="http://hl7api.sourceforge.net/"></div></td>
-            	<td><div class="fb-like" data-href="http://hl7api.sourceforge.net/" data-send="false" data-layout="button_count" data-width="450" data-show-faces="true"></div></td>
-            	</tr></table>
-<<<<<<< HEAD
-
-            	</p><p>
-            	<!-- Place this tag after the last +1 button tag. -->
-            	<script type="text/javascript">
-            	  (function() {
-            	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-            	    po.src = 'https://apis.google.com/js/plusone.js';
-            	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-            	  })();
-            	</script>
-            	<div id="fb-root"></div>
-            	<script>(function(d, s, id) {
-            	  var js, fjs = d.getElementsByTagName(s)[0];
-            	  if (d.getElementById(id)) return;
-            	  js = d.createElement(s); js.id = id;
-            	  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-            	  fjs.parentNode.insertBefore(js, fjs);
-            	}(document, 'script', 'facebook-jssdk'));</script>
-				]]></replacevalue>
-								</replace>
-
-
-=======
-
-            	</p><p>
-            	<!-- Place this tag after the last +1 button tag. -->
-            	<script type="text/javascript">
-            	  (function() {
-            	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-            	    po.src = 'https://apis.google.com/js/plusone.js';
-            	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-            	  })();
-            	</script>
-            	<div id="fb-root"></div>
-            	<script>(function(d, s, id) {
-            	  var js, fjs = d.getElementsByTagName(s)[0];
-            	  if (d.getElementById(id)) return;
-            	  js = d.createElement(s); js.id = id;
-            	  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-            	  fjs.parentNode.insertBefore(js, fjs);
-            	}(document, 'script', 'facebook-jssdk'));</script>
-				]]></replacevalue>
-								</replace>
-
-
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<version>1.12</version>
-				<inherited>true</inherited>
-				<configuration>
-					<signature>
-						<groupId>org.codehaus.mojo.signature</groupId>
-						<artifactId>java16</artifactId>
-						<version>1.01</version>
-					</signature>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>stage-for-scm-publish</id>
-						<phase>post-site</phase>
-						<goals>
-							<goal>stage</goal>
-						</goals>
-						<configuration>
-							<stagingDirectory>${siteMainDirectory}</stagingDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-scm-publish-plugin</artifactId>
-				<version>1.1</version>
-				<inherited>false</inherited>
-				<configuration>
-					<checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
-					<content>\${siteMainDirectory}</content>
-					<tryUpdate>true</tryUpdate>
-					<scmBranch>gh-pages</scmBranch>
-					<pubScmUrl>scm:git:git@github.com:jamesagnew/hapi-fhir.git</pubScmUrl>
-				</configuration>
-				<executions>
-					<execution>
-						<id>scm-publish</id>
-						<phase>site-deploy</phase>
-						<goals>
-							<goal>publish-scm</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changes-plugin</artifactId>
-				<version>2.11</version>
-				<inherited>false</inherited>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>changes-report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-				<configuration>
-					<feedType>atom_1.0</feedType>
-					<issueLinkTemplatePerSystem>
-						<default>https://github.com/jamesagnew/hapi-fhir/issues/%ISSUE%</default>
-					</issueLinkTemplatePerSystem>
-					<escapeHTML>false</escapeHTML>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>${maven_surefire_plugin_version}</version>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.7</version>
-				<inherited>false</inherited>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>project-team</report>
-							<report>issue-tracking</report>
-							<report>license</report>
-							<report>scm</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-<<<<<<< HEAD
-=======
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<classFilesDirectory>./hapi-fhir-base/target/classes</classFilesDirectory>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>findbugs</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-	
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> 
-				<version>1.1</version> </plugin> -->
-		</plugins>
-	</reporting>
-
-	<profiles>
-		<profile>
-			<id>ROOT</id>
-			<modules>
-			</modules>
-		</profile>
-		<profile>
-			<id>SIGN_ARTIFACTS</id>
-			<activation>
-				<property>
-					<name>gpg.passphrase</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>SITE</id>
-			<modules>
-				<module>hapi-fhir-base</module>
-				<module>hapi-fhir-structures-dstu</module>
-				<module>hapi-fhir-structures-dev</module>
-<<<<<<< HEAD
-=======
-				<module>examples</module>
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-			</modules>
-		</profile>
-		<profile>
-			<id>ALLMODULES</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>hapi-deployable-pom</module>
-				<module>hapi-fhir-base</module>
-				<module>hapi-fhir-oauth2</module>
-<<<<<<< HEAD
-				<module>hapi-fhir-base/examples</module>
-=======
->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2
-				<module>hapi-fhir-base/testmindeps</module>
-				<module>hapi-tinder-plugin</module>
-				<module>hapi-tinder-test</module>
-				<module>hapi-fhir-structures-dstu</module>
-				<module>hapi-fhir-structures-dev</module>
-				<module>hapi-fhir-jpaserver-base</module>
-				<module>hapi-fhir-jpaserver-test</module>
-				<module>restful-server-example</module>
-				<module>restful-server-example-test</module>
-				<module>hapi-fhir-testpage-overlay</module>
-				<module>hapi-fhir-jpaserver-uhnfhirtest</module>
-			</modules>
-		</profile>
-	</profiles>
-
-</project>
diff --git a/restful-server-example-test/pom.xml.orig b/restful-server-example-test/pom.xml.orig
deleted file mode 100644
index 92d2387a4b5..00000000000
--- a/restful-server-example-test/pom.xml.orig
+++ /dev/null
@@ -1,88 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>restful-server-example-test</artifactId>
-	<packaging>jar</packaging>
-
-	<name>HAPI FHIR Sample RESTful Server - Tests</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
-			<scope>test</scope>
->>>>>>> versions
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback_version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlets</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>${jetty_version}</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>		
-	</build>
-
-</project>
diff --git a/restful-server-example/pom.xml.orig b/restful-server-example/pom.xml.orig
deleted file mode 100644
index f8a84d94905..00000000000
--- a/restful-server-example/pom.xml.orig
+++ /dev/null
@@ -1,187 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-<<<<<<< HEAD
-	<!--
-	Because this example is a subproject in HAPI itself, it
-	points to the HAPI parent pom.xml. If you are creating your
-	own project using this project as a guide, you can remove
-	this parent declaration. 
-	-->
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<artifactId>hapi-fhir</artifactId>
-		<version>0.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-=======
-	<!-- 
-	HAPI projects use the Sonatype OSS parent project. 
-	You do not need to use this in your own projects.
-	-->
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
->>>>>>> versions
-	</parent>
-
-	
-	<groupId>ca.uhn.hapi.example</groupId>
-	<artifactId>restful-server-example</artifactId>
-	<packaging>war</packaging>
-
-	<name>HAPI FHIR Sample RESTful Server</name>
-
-	<repositories>
-		<repository>
-			<id>oss-snapshots</id>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<dependencies>
-
-		<!-- This dependency includes the core HAPI-FHIR classes -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.8-SNAPSHOT</version>
-<<<<<<< HEAD
-=======
-		</dependency>
-		<!-- At least one "structures" JAR must also be included -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>0.8-SNAPSHOT</version>
->>>>>>> versions
-		</dependency>
-
-		<!-- This dependency is used for the "FHIR Tester" web app overlay -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-testpage-overlay</artifactId>
-			<version>0.8-SNAPSHOT</version>
-			<type>war</type>
-			<scope>provided</scope>		
-		</dependency>
-
-		<!-- 
-		HAPI-FHIR uses Logback for logging support. The logback library is included 
-		automatically by Maven as a part of the hapi-fhir-base dependency, but you 
-		also need to include a logging library. Logback is used here, but log4j
-		would also be fine. 
-		-->
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-
-		<!-- Needed for JEE/Servlet support -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- 
-		If you are using HAPI narrative generation, you will need to include Thymeleaf
-		as well. Otherwise the following can be omitted.
-		 -->
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf</artifactId>
-			<version>2.1.3.RELEASE</version>
-		</dependency>
-
-		<!-- Used for CORS support -->
-		<dependency>
-			<groupId>org.ebaysf.web</groupId>
-			<artifactId>cors-filter</artifactId>
-			<version>1.0.1</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>servlet-api</artifactId>
-					<groupId>javax.servlet</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		
-
-	</dependencies>
-
-	<build>
-		
-		<!-- 
-		Tells Maven to name the generated WAR file as
-		restful-server-example.war
-		-->
-		<finalName>restful-server-example</finalName>
-		
-		<!-- 
-		The following is not required for the application to build, but
-		allows you to test it by issuing "mvn jetty:run" from the command
-		line. 
-		-->
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>jetty-maven-plugin</artifactId>
-					<version>9.1.1.v20140108</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	
-		<plugins>
-			<!-- 
-			Tell Maven which Java source version you want to use
-			-->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			
-			<!-- 
-			The configuration here tells the WAR plugin to include the FHIR Tester
-			overlay. You can omit it if you are not using that feature.
-			-->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<overlays>
-						<overlay>
-							<groupId>ca.uhn.hapi.fhir</groupId>
-							<artifactId>hapi-fhir-testpage-overlay</artifactId>
-						</overlay>
-					</overlays>
-				</configuration>
-			</plugin>
-			
-			<!-- 
-			This plugin is just a part of the HAPI internal build process, you do not
-			need to incude it in your own projects
-			-->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-    		
-		</plugins>
-	</build>
-
-</project>