diff --git a/hapi-fhir-android-realm/.project b/hapi-fhir-android-realm/.project
deleted file mode 100644
index 13005c6b849..00000000000
--- a/hapi-fhir-android-realm/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>hapi-fhir-android-realm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml
index ad72b81abb3..20756e49cc3 100644
--- a/hapi-fhir-docs/pom.xml
+++ b/hapi-fhir-docs/pom.xml
@@ -129,12 +129,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-client-apache-http5</artifactId>
-			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 25a1afcd16e..4e812d0350c 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -410,7 +410,6 @@
 
 	<build>
 		<plugins>
-			<!-- Generate the Spring ContextCfg classes for loading JPA DAOs and RPs -->
 			<plugin>
 				<groupId>ca.uhn.hapi.fhir</groupId>
 				<artifactId>hapi-tinder-plugin</artifactId>
@@ -424,12 +423,9 @@
 							<version>dstu2</version>
 							<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
 							<packageBase>ca.uhn.fhir.jpa.rp.dstu2</packageBase>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu2.xml
-							</targetResourceSpringBeansFile>
+							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu2.xml</targetResourceSpringBeansFile>
 							<baseResourceNames/>
-							<excludeResourceNames>
-								<!-- <excludeResourceName>OperationDefinition</excludeResourceName> <excludeResourceName>OperationOutcome</excludeResourceName> -->
-							</excludeResourceNames>
+							<excludeResourceNames/>
 						</configuration>
 					</execution>
 					<execution>
@@ -441,11 +437,9 @@
 							<version>dstu3</version>
 							<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
 							<packageBase>ca.uhn.fhir.jpa.rp.dstu3</packageBase>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu3.xml
-							</targetResourceSpringBeansFile>
-							<baseResourceNames></baseResourceNames>
-							<excludeResourceNames>
-							</excludeResourceNames>
+							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-dstu3.xml</targetResourceSpringBeansFile>
+							<baseResourceNames/>
+							<excludeResourceNames/>
 						</configuration>
 					</execution>
 					<execution>
@@ -457,11 +451,9 @@
 							<version>r4</version>
 							<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
 							<packageBase>ca.uhn.fhir.jpa.rp.r4</packageBase>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4.xml
-							</targetResourceSpringBeansFile>
-							<baseResourceNames></baseResourceNames>
-							<excludeResourceNames>
-							</excludeResourceNames>
+							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4.xml</targetResourceSpringBeansFile>
+							<baseResourceNames/>
+							<excludeResourceNames/>
 						</configuration>
 					</execution>
 					<execution>
@@ -473,11 +465,9 @@
 							<version>r4b</version>
 							<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
 							<packageBase>ca.uhn.fhir.jpa.rp.r4b</packageBase>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4b.xml
-							</targetResourceSpringBeansFile>
-							<baseResourceNames></baseResourceNames>
-							<excludeResourceNames>
-							</excludeResourceNames>
+							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r4b.xml</targetResourceSpringBeansFile>
+							<baseResourceNames/>
+							<excludeResourceNames/>
 						</configuration>
 					</execution>
 					<execution>
@@ -489,13 +479,61 @@
 							<version>r5</version>
 							<configPackageBase>ca.uhn.fhir.jpa.config</configPackageBase>
 							<packageBase>ca.uhn.fhir.jpa.rp.r5</packageBase>
-							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r5.xml
-							</targetResourceSpringBeansFile>
-							<baseResourceNames></baseResourceNames>
+							<targetResourceSpringBeansFile>hapi-fhir-server-resourceproviders-r5.xml</targetResourceSpringBeansFile>
+							<baseResourceNames/>
+						</configuration>
+					</execution>
+					<!-- Generate the DDL schema files -->
+					<execution>
+						<id>generate-ddl</id>
+						<goals>
+							<goal>generate-ddl</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+							<packageNames>
+								<packageName>ca.uhn.fhir.jpa.entity</packageName>
+								<packageName>ca.uhn.fhir.jpa.model.entity</packageName>
+							</packageNames>
+							<dialects>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirDerbyDialect</className>
+									<targetFileName>derby.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirMySQLDialect</className>
+									<targetFileName>mysql.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirMariaDBDialect</className>
+									<targetFileName>mariadb.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirOracleDialect</className>
+									<targetFileName>oracle.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirSQLServerDialect</className>
+									<targetFileName>sqlserver.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirCockroachDialect</className>
+									<targetFileName>cockroachdb.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect</className>
+									<targetFileName>h2.sql</targetFileName>
+								</dialect>
+								<dialect>
+									<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect</className>
+									<targetFileName>postgres.sql</targetFileName>
+									<appendFile>classpath:ca/uhn/fhir/jpa/docs/database/hapifhirpostgres94-init01.sql</appendFile>
+								</dialect>
+							</dialects>
+							<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
-
 				<dependencies>
 					<dependency>
 						<groupId>ca.uhn.hapi.fhir</groupId>
@@ -512,69 +550,11 @@
 						<artifactId>hapi-fhir-structures-r4</artifactId>
 						<version>${project.version}</version>
 					</dependency>
-
 					<dependency>
 						<groupId>ca.uhn.hapi.fhir</groupId>
 						<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
 						<version>${project.version}</version>
 					</dependency>
-				</dependencies>
-			</plugin>
-			<!-- Generate the DDL schema files -->
-			<plugin>
-				<groupId>ca.uhn.hapi.fhir</groupId>
-				<artifactId>hapi-tinder-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-ddl</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<skip>false</skip>
-					<packageNames>
-						<packageName>ca.uhn.fhir.jpa.entity</packageName>
-						<packageName>ca.uhn.fhir.jpa.model.entity</packageName>
-					</packageNames>
-					<dialects>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirDerbyDialect</className>
-							<targetFileName>derby.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirMySQLDialect</className>
-							<targetFileName>mysql.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirMariaDBDialect</className>
-							<targetFileName>mariadb.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirOracleDialect</className>
-							<targetFileName>oracle.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirSQLServerDialect</className>
-							<targetFileName>sqlserver.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirCockroachDialect</className>
-							<targetFileName>cockroachdb.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect</className>
-							<targetFileName>h2.sql</targetFileName>
-						</dialect>
-						<dialect>
-							<className>ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect</className>
-							<targetFileName>postgres.sql</targetFileName>
-							<appendFile>classpath:ca/uhn/fhir/jpa/docs/database/hapifhirpostgres94-init01.sql</appendFile>
-						</dialect>
-					</dialects>
-					<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database</outputDirectory>
-				</configuration>
-				<dependencies>
 					<dependency>
 						<groupId>ca.uhn.hapi.fhir</groupId>
 						<artifactId>hapi-fhir-jpaserver-model</artifactId>
diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java
index 524d66c372f..16db6d3dcc6 100644
--- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java
+++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/EntityIndexStatusEnum.java
@@ -1,3 +1,22 @@
+/*-
+ * #%L
+ * HAPI FHIR JPA Model
+ * %%
+ * Copyright (C) 2014 - 2024 Smile CDR, Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
 package ca.uhn.fhir.jpa.model.entity;
 
 public enum EntityIndexStatusEnum {
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index e302f81ab08..458c5467000 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -156,32 +156,6 @@
 						</webApp>
 					</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>
@@ -195,7 +169,6 @@
 		</plugins>
 		<finalName>hapi-fhir-jpaserver</finalName>
 	</build>
-
 	<profiles>
 		<profile>
 			<id>DIST</id>
diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index 685cd767523..95129881980 100644
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@@ -349,35 +349,6 @@
 				</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>
 		<resources>
 			<resource>
 				<directory>${basedir}/src/main/resources</directory>
diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml
index fbf798fb4cd..e48e08de468 100644
--- a/hapi-fhir-test-utilities/pom.xml
+++ b/hapi-fhir-test-utilities/pom.xml
@@ -161,11 +161,6 @@
 			<artifactId>junit-jupiter</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>net.javacrumbs.json-unit</groupId>
 			<artifactId>json-unit-assertj</artifactId>
@@ -214,14 +209,6 @@
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
 		</dependency>
-		<!-- FIXME KHS do we need this?
-<dependency>
-	<groupId>com.github.seregamorph</groupId>
-	<artifactId>hamcrest-more-matchers</artifactId>
-	<version>0.1</version>
-	<scope>test</scope>
-</dependency>
--->
 </dependencies>
 
 <build>
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index fa868a09061..1956c5d7147 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -12,15 +12,11 @@
 
 	<artifactId>hapi-tinder-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
-	<!-- <packaging>jar</packaging> -->
 
 	<name>HAPI Tinder Plugin</name>
 
 	<properties>
-		<previous_hapi_fhir_version>6.1.0</previous_hapi_fhir_version>
-		<!-- TODO KHS is this still needed?
-		<maven_version>3.1.1</maven_version>
-		-->
+		<previous_hapi_fhir_version>7.6.0</previous_hapi_fhir_version>
 	</properties>
 
 	<dependencies>
@@ -255,42 +251,6 @@
 				</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 b/hapi-tinder-test/pom.xml
index 64a3c161626..1e9c38c3b97 100644
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@@ -533,61 +533,6 @@
 				</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>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>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>ca.uhn.hapi.fhir</groupId>
-										<artifactId>hapi-tinder-plugin</artifactId>
-										<versionRange>[0.4-SNAPSHOT,)</versionRange>
-										<goals>
-											<goal>generate-multi-files</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>ca.uhn.hapi.fhir</groupId>
-										<artifactId>hapi-tinder-plugin</artifactId>
-										<versionRange>[0.4-SNAPSHOT,)</versionRange>
-										<goals>
-											<goal>generate-single-file</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<resources>
 			<resource>
 				<directory>${basedir}/src/main/resources</directory>
diff --git a/pom.xml b/pom.xml
index 7472ab8a289..50a195ff760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1071,6 +1071,7 @@
 		<log4j_to_slf4j_version>2.24.1</log4j_to_slf4j_version>
 		<spring_version>6.1.14</spring_version>
 		<spring_data_bom_version>2024.0.5</spring_data_bom_version>
+		<spring_framework_bom_version>6.1.15</spring_framework_bom_version>
 		<spring_boot_version>3.3.5</spring_boot_version>
 		<spring_retry_version>2.0.10</spring_retry_version>
 		<json_path_version>2.9.0</json_path_version>
@@ -1104,7 +1105,7 @@
 		<maven-resources-plugin-version>3.3.0</maven-resources-plugin-version>
 		<buildnumber-maven-plugin-version>3.2.1</buildnumber-maven-plugin-version>
 		<jacoco-maven-plugin-version>0.8.12</jacoco-maven-plugin-version>
-		<maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
+		<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
 		<maven-license-plugin-version>2.5.0</maven-license-plugin-version>
 		<maven-enforcer-plugin-version>3.5.0</maven-enforcer-plugin-version>
 		<maven-checkstyle-version>3.4.0</maven-checkstyle-version>
@@ -1131,6 +1132,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-framework-bom</artifactId>
+				<version>${spring_framework_bom_version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>aopalliance</groupId>
 				<artifactId>aopalliance</artifactId>
@@ -1965,11 +1973,6 @@
 				<artifactId>hibernate-envers</artifactId>
 				<version>${hibernate_version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-envers</artifactId>
-				<version>${spring_boot_version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.hibernate.validator</groupId>
 				<artifactId>hibernate-validator</artifactId>
@@ -2493,29 +2496,6 @@
 						<fork>true</fork>
 						<meminitial>500m</meminitial>
 						<maxmem>2000m</maxmem>
-						<forceLegacyJavacApi>true</forceLegacyJavacApi>
-							<compilerArgs>
-								<arg>-XDcompilePolicy=simple</arg>
-								<arg>--should-stop=ifError=FLOW</arg>
-								<arg>-Xplugin:ErrorProne -Xep:MissingSummary:OFF -Xep:JavaUtilDate:OFF -XepExcludedPaths:.*/src/test/java/.*|.*/hapi-fhir-docs/src/main/java/.*</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
-								<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
-								<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
-								<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
-							</compilerArgs>
-						<annotationProcessorPaths>
-							<path>
-								<groupId>com.google.errorprone</groupId>
-								<artifactId>error_prone_core</artifactId>
-								<version>${error_prone_core_version}</version>
-							</path>
-						</annotationProcessorPaths>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -2676,59 +2656,6 @@
 						<skip>true</skip>
 					</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>
-											ca.uhn.hapi.fhir
-										</groupId>
-										<artifactId>
-											hapi-tinder-plugin
-										</artifactId>
-										<versionRange>
-											[0.8-SNAPSHOT,)
-										</versionRange>
-										<goals>
-											<goal>
-												generate-jparest-server
-											</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-antrun-plugin
-										</artifactId>
-										<versionRange>
-											[1.7,)
-										</versionRange>
-										<goals>
-											<goal>run</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
@@ -3130,6 +3057,45 @@
 	</reporting>
 
 	<profiles>
+		<profile>
+			<id>ERRORPRONE</id>
+			<build>
+				<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<encoding>UTF-8</encoding>
+						<fork>true</fork>
+						<meminitial>500m</meminitial>
+						<maxmem>2000m</maxmem>
+						<forceLegacyJavacApi>true</forceLegacyJavacApi>
+						<compilerArgs>
+							<arg>-XDcompilePolicy=simple</arg>
+							<arg>--should-stop=ifError=FLOW</arg>
+							<arg>-Xplugin:ErrorProne -Xep:MissingSummary:OFF -Xep:JavaUtilDate:OFF -XepExcludedPaths:.*/src/test/java/.*|.*/hapi-fhir-docs/src/main/java/.*</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+							<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+							<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+							<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+						</compilerArgs>
+						<annotationProcessorPaths>
+							<path>
+								<groupId>com.google.errorprone</groupId>
+								<artifactId>error_prone_core</artifactId>
+								<version>${error_prone_core_version}</version>
+							</path>
+						</annotationProcessorPaths>
+					</configuration>
+				</plugin></plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>DIST</id>
 			<build>