diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index 4a793b05942..bd47a54f59d 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -15,177 +15,6 @@
 	<name>HAPI FHIR - Distribution Archive</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>sources</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<classifier>javadoc</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-		
-		
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-cli-app</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<!-- Don't include in standard distribution -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-android</artifactId>
-			<version>2.3-SNAPSHOT</version>
-			<!-- Don't include in standard distribution -->
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.phloc</groupId>
-			<artifactId>phloc-schematron</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.phloc</groupId>
-			<artifactId>phloc-commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -203,6 +32,178 @@
 	<profiles>
 		<profile>
 			<id>DIST</id>
+			<dependencies>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-base</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-base</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-base</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+		
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+		
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+		
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+				
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+		
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu3</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu3</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>sources</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu3</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<classifier>javadoc</classifier>
+					<scope>provided</scope>
+				</dependency>
+		
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
+					<version>2.3-SNAPSHOT</version>
+				</dependency>
+				
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-cli-app</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<!-- Don't include in standard distribution -->
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-android</artifactId>
+					<version>2.3-SNAPSHOT</version>
+					<!-- Don't include in standard distribution -->
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.thymeleaf</groupId>
+					<artifactId>thymeleaf</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>com.phloc</groupId>
+					<artifactId>phloc-schematron</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>com.phloc</groupId>
+					<artifactId>phloc-commons</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</dependency>
+			</dependencies>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirConfigurationException.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirConfigurationException.java
index aa7890316d2..5336f50f85e 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirConfigurationException.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirConfigurationException.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirProviderBundle.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirProviderBundle.java
index cd0a190071a..dbd5d28eed8 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirProviderBundle.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirProviderBundle.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServer.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServer.java
index 4bdfaa98c0b..1561fe992b3 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServer.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServer.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServerImpl.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServerImpl.java
index 07d81c40c80..2d10cb29d22 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServerImpl.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/FhirServerImpl.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/SimpleFhirProviderBundle.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/SimpleFhirProviderBundle.java
index c3ec74b1d42..1a2ac16af95 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/SimpleFhirProviderBundle.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/SimpleFhirProviderBundle.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.
diff --git a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/impl/FhirServerManager.java b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/impl/FhirServerManager.java
index e7624cfd6c3..df63ed4deee 100644
--- a/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/impl/FhirServerManager.java
+++ b/hapi-fhir-osgi-core/src/main/java/ca/uhn/fhir/osgi/impl/FhirServerManager.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.osgi.impl;
  * #%L
  * HAPI FHIR - OSGi Bundle
  * %%
- * Copyright (C) 2014 - 2016 University Health Network
+ * 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.