diff --git a/.gitignore b/.gitignore
index 82f2d97e5d6..2a64f04d425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,40 @@ crashlytics.properties
crashlytics-build.properties
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
diff --git a/examples/.gitignore b/examples/.gitignore
index d404441a4f6..c03ad9739e0 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -86,3 +86,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-android/.gitignore b/hapi-fhir-android/.gitignore
index 4cecfb69fd2..d4c1bbda97b 100644
--- a/hapi-fhir-android/.gitignore
+++ b/hapi-fhir-android/.gitignore
@@ -88,3 +88,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-base/.gitignore b/hapi-fhir-base/.gitignore
index 4cecfb69fd2..d4c1bbda97b 100644
--- a/hapi-fhir-base/.gitignore
+++ b/hapi-fhir-base/.gitignore
@@ -88,3 +88,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-jpaserver-base/.gitignore b/hapi-fhir-jpaserver-base/.gitignore
index 9256339c0a5..443f39c7696 100644
--- a/hapi-fhir-jpaserver-base/.gitignore
+++ b/hapi-fhir-jpaserver-base/.gitignore
@@ -88,3 +88,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-jpaserver-example/.gitignore b/hapi-fhir-jpaserver-example/.gitignore
index 1ff3abdb42a..271ee2518a7 100644
--- a/hapi-fhir-jpaserver-example/.gitignore
+++ b/hapi-fhir-jpaserver-example/.gitignore
@@ -88,3 +88,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.gitignore b/hapi-fhir-jpaserver-uhnfhirtest/.gitignore
index e3f9e3ad7d2..d70edcadcdd 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/.gitignore
+++ b/hapi-fhir-jpaserver-uhnfhirtest/.gitignore
@@ -91,3 +91,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-oauth2/.gitignore b/hapi-fhir-oauth2/.gitignore
index 65461b8479e..1c77f6c4f3d 100644
--- a/hapi-fhir-oauth2/.gitignore
+++ b/hapi-fhir-oauth2/.gitignore
@@ -87,3 +87,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-structures-dev/.gitignore b/hapi-fhir-structures-dev/.gitignore
index e4ffb1578cd..f4d02737d8c 100644
--- a/hapi-fhir-structures-dev/.gitignore
+++ b/hapi-fhir-structures-dev/.gitignore
@@ -90,3 +90,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-structures-dstu/.gitignore b/hapi-fhir-structures-dstu/.gitignore
index c8f86430a74..54fa5f1db6d 100644
--- a/hapi-fhir-structures-dstu/.gitignore
+++ b/hapi-fhir-structures-dstu/.gitignore
@@ -94,3 +94,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-structures-dstu2/.gitignore b/hapi-fhir-structures-dstu2/.gitignore
index 857b7691d7e..603d9d44e91 100644
--- a/hapi-fhir-structures-dstu2/.gitignore
+++ b/hapi-fhir-structures-dstu2/.gitignore
@@ -98,3 +98,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-structures-hl7org-dstu2/.gitignore b/hapi-fhir-structures-hl7org-dstu2/.gitignore
index 5f014080234..88dc6eaba34 100644
--- a/hapi-fhir-structures-hl7org-dstu2/.gitignore
+++ b/hapi-fhir-structures-hl7org-dstu2/.gitignore
@@ -87,3 +87,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-fhir-testpage-overlay/.classpath b/hapi-fhir-testpage-overlay/.classpath
deleted file mode 100644
index 3b87ea27399..00000000000
--- a/hapi-fhir-testpage-overlay/.classpath
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hapi-fhir-testpage-overlay/.gitignore b/hapi-fhir-testpage-overlay/.gitignore
index d404441a4f6..c03ad9739e0 100644
--- a/hapi-fhir-testpage-overlay/.gitignore
+++ b/hapi-fhir-testpage-overlay/.gitignore
@@ -86,3 +86,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-tinder-plugin/.gitignore b/hapi-tinder-plugin/.gitignore
index d33f514221d..6a6c8a46784 100644
--- a/hapi-tinder-plugin/.gitignore
+++ b/hapi-tinder-plugin/.gitignore
@@ -87,3 +87,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/hapi-tinder-test/.gitignore b/hapi-tinder-test/.gitignore
index 62814026f1d..f686a9931df 100644
--- a/hapi-tinder-test/.gitignore
+++ b/hapi-tinder-test/.gitignore
@@ -90,3 +90,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/pom.xml b/pom.xml
index 9a6b45db8eb..7abf996f2f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,7 @@
4.12
1.1.2
1.8
+ 1.9.1
2.5.3
2.18.1
1.6
@@ -354,6 +355,25 @@
+
+
+
+ org.codehaus.mojo
+
+
+ build-helper-maven-plugin
+
+
+ [1.9.1,)
+
+
+ add-source
+
+
+
+
+
+
@@ -364,6 +384,7 @@
org.codehaus.mojo
license-maven-plugin
+ false
update-project-license
diff --git a/restful-server-example-test/.gitignore b/restful-server-example-test/.gitignore
index d404441a4f6..c03ad9739e0 100644
--- a/restful-server-example-test/.gitignore
+++ b/restful-server-example-test/.gitignore
@@ -86,3 +86,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
diff --git a/restful-server-example/.gitignore b/restful-server-example/.gitignore
index 7e4fb0f9cc0..b21d4a71d48 100644
--- a/restful-server-example/.gitignore
+++ b/restful-server-example/.gitignore
@@ -86,3 +86,42 @@ crashlytics.properties
crashlytics-build.properties
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+