From fa00ef23e2f438842aaa0d7a428a1c340921d4a5 Mon Sep 17 00:00:00 2001
From: michaelabuckley <michaelabuckley@gmail.com>
Date: Mon, 3 Apr 2023 16:04:18 -0400
Subject: [PATCH] Remove IntelliJ workaround now that IDEA-85478 is fixed.
 (#4710)

Remove IntelliJ workaround now that IDEA-85478 is fixed.
---
 ...10-remove-intellij-maven-version-hack.yaml |  4 +++
 pom.xml                                       | 30 -------------------
 2 files changed, 4 insertions(+), 30 deletions(-)
 create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4710-remove-intellij-maven-version-hack.yaml

diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4710-remove-intellij-maven-version-hack.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4710-remove-intellij-maven-version-hack.yaml
new file mode 100644
index 00000000000..7803abe8e22
--- /dev/null
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4710-remove-intellij-maven-version-hack.yaml
@@ -0,0 +1,4 @@
+---
+type: change
+issue: 4710
+title: "Removed maven configuration hack for IntelliJ now that Jetbrains supports different java versions in test and main (IDEA-85478)."
diff --git a/pom.xml b/pom.xml
index 145c4fcaca7..d78fe01bc24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2989,36 +2989,6 @@
 				</plugins>
 			</build>
 		</profile>
-
-		<!--
-		This profile is basically here to work around an IJ bug where the
-		<testSource> tag is ignored in IJ's compiler. See:
-		https://youtrack.jetbrains.com/issue/IDEA-85478
-		-->
-		<profile>
-			<id>ide</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<property>
-					<name>idea.maven.embedder.version</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<configuration>
-							<source>17</source>
-							<target>17</target>
-							<release>17</release>
-							<testSource>17</testSource>
-							<testTarget>17</testTarget>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>ossrh-repo</id>
 			<activation>