From e01aa876c85338e2b8e82ac5135222e15c68ebbc Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Thu, 27 Apr 2023 18:11:25 -0400
Subject: [PATCH] Bump HAPI to 6.4.1 (#1237)

* Bump HAPI to 6.4.1

* Fix broken checkstyle configs

* Fix checkstyle in convertors
---
 checkstyle_suppressions.xml         | 8 ++++++++
 org.hl7.fhir.convertors/pom.xml     | 4 ++++
 org.hl7.fhir.dstu2/pom.xml          | 4 ++++
 org.hl7.fhir.dstu2016may/pom.xml    | 4 ++++
 org.hl7.fhir.dstu3/pom.xml          | 4 ++++
 org.hl7.fhir.r4/pom.xml             | 4 ++++
 org.hl7.fhir.r4b/pom.xml            | 4 ++++
 org.hl7.fhir.r5/pom.xml             | 4 ++++
 org.hl7.fhir.report/pom.xml         | 1 +
 org.hl7.fhir.utilities/pom.xml      | 4 ++++
 org.hl7.fhir.validation.cli/pom.xml | 4 ++++
 org.hl7.fhir.validation/pom.xml     | 4 ++++
 pom.xml                             | 7 ++++---
 13 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 checkstyle_suppressions.xml

diff --git a/checkstyle_suppressions.xml b/checkstyle_suppressions.xml
new file mode 100644
index 000000000..1c51453aa
--- /dev/null
+++ b/checkstyle_suppressions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+  
+</suppressions>
diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index 1fb05c2dc..0337f7203 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.convertors</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
 
         <!-- Commons -->
diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml
index e1ffa7076..b12d7e30d 100644
--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.dstu2</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
 
         <!-- HAPI Dependencies -->
diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml
index 0f3011fd7..928ba1fe3 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.dstu2016may</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
 
         <!-- HAPI Dependencies -->
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
index e93cd40a7..dfc9b0ffc 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.dstu3</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
 
         <!-- HAPI Dependencies -->
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 5b7f5e6d7..522798b53 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -12,6 +12,10 @@
 	<artifactId>org.hl7.fhir.r4</artifactId>
 	<packaging>bundle</packaging>
 
+	<properties>
+		<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+	</properties>
+
 	<dependencies>
 
 		<!-- HAPI Dependencies -->
diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml
index d23e0d12a..b62368732 100644
--- a/org.hl7.fhir.r4b/pom.xml
+++ b/org.hl7.fhir.r4b/pom.xml
@@ -12,6 +12,10 @@
 	<artifactId>org.hl7.fhir.r4b</artifactId>
 	<packaging>bundle</packaging>
 
+	<properties>
+		<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+	</properties>
+
 	<dependencies>
 		<!-- HAPI Dependencies -->
 		<dependency>
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index 010294728..6cc1181eb 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -12,6 +12,10 @@
 	<artifactId>org.hl7.fhir.r5</artifactId>
 	<packaging>bundle</packaging>
 
+	<properties>
+		<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+	</properties>
+
 	<dependencies>
 		<!-- HAPI Dependencies -->
 		<dependency>
diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml
index 4454d915d..6b0ec355e 100644
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -16,6 +16,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
     </properties>
 
     <dependencies>
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index 8d3d5dca9..661054de8 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.utilities</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index 0256dc7b2..52ea78dfe 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.validation.cli</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index b9e981288..d3a9a006f 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>org.hl7.fhir.validation</artifactId>
     <packaging>bundle</packaging>
 
+    <properties>
+        <checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
+    </properties>
+
     <dependencies>
 
         <!-- HAPI Dependencies -->
diff --git a/pom.xml b/pom.xml
index 9af9d1968..109b4359c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-deployable-pom</artifactId>
-        <version>6.2.1</version>
+        <version>6.4.1</version>
     </parent>
 
     <!--
@@ -18,7 +18,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <hapi_fhir_version>6.2.1</hapi_fhir_version>
+        <hapi_fhir_version>6.4.1</hapi_fhir_version>
         <validator_test_case_version>1.3.0</validator_test_case_version>
         <jackson_version>2.14.0</jackson_version>
         <junit_jupiter_version>5.9.2</junit_jupiter_version>
@@ -39,6 +39,7 @@
         <maven.compiler.testSource>11</maven.compiler.testSource>
         <maven.compiler.testTarget>11</maven.compiler.testTarget>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+        <checkstyle_config_location>${project.basedir}</checkstyle_config_location>
     </properties>
 
     <name>HL7 Core Artifacts</name>
@@ -192,7 +193,7 @@
                             <enableRulesSummary>true</enableRulesSummary>
                             <enableSeveritySummary>true</enableSeveritySummary>
                             <consoleOutput>true</consoleOutput>
-                            <configLocation>${project.basedir}/../checkstyle.xml</configLocation>
+                            <configLocation>${checkstyle_config_location}/checkstyle.xml</configLocation>
                         </configuration>
                     </execution>
                 </executions>