From 3eb50edc4a704dd91fceb43393e9cf16480731fc Mon Sep 17 00:00:00 2001
From: Ian <ian_bacher@brown.edu>
Date: Mon, 2 Aug 2021 12:59:50 -0400
Subject: [PATCH] Optimise the size of the JAR and remove some unnecessary
 libraries

---
 api-2.1/pom.xml                    |  4 +++
 api-2.2/pom.xml                    |  3 --
 api/pom.xml                        |  9 +++++
 omod/pom.xml                       |  8 ++---
 omod/src/main/resources/config.xml |  2 +-
 pom.xml                            | 57 +++++++++++++++++++++++++++---
 6 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/api-2.1/pom.xml b/api-2.1/pom.xml
index 5bb83f22f..abf48dd15 100644
--- a/api-2.1/pom.xml
+++ b/api-2.1/pom.xml
@@ -19,6 +19,10 @@
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openmrs.api</groupId>
+            <artifactId>openmrs-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/api-2.2/pom.xml b/api-2.2/pom.xml
index bd1c56e5b..c1695e0fb 100644
--- a/api-2.2/pom.xml
+++ b/api-2.2/pom.xml
@@ -28,9 +28,6 @@
         <dependency>
             <groupId>org.openmrs.api</groupId>
             <artifactId>openmrs-api</artifactId>
-            <version>${openmrsPlatformVersion}</version>
-            <type>jar</type>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
diff --git a/api/pom.xml b/api/pom.xml
index e96b8fad8..64c68d33b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,6 +12,10 @@
 	<description>API for FHIR2</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.openmrs.api</groupId>
+			<artifactId>openmrs-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
@@ -52,6 +56,11 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>${project.parent.artifactId}-test-data</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index 77de2e15b..602cb77a4 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -51,6 +51,10 @@
 					<artifactId>servlet-api</artifactId>
 					<groupId>javax.servlet</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.javassist</groupId>
+					<artifactId>javassist</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -61,10 +65,6 @@
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-r4</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
index 077dacbc1..46a6e07c4 100644
--- a/omod/src/main/resources/config.xml
+++ b/omod/src/main/resources/config.xml
@@ -17,7 +17,7 @@
 	<name>${project.parent.name}</name>
 	<version>${project.parent.version}</version>
 	<package>org.openmrs.module.fhir2</package>
-	<author>ibacher</author>
+	<author>OpenMRS FHIR Squad</author>
 	<description>
 			${project.parent.description}
 	</description>
diff --git a/pom.xml b/pom.xml
index b32f23ea9..a9cfb93ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,12 @@
                 <version>${openmrsPlatformVersion}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.javassist</groupId>
+                        <artifactId>javassist</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.openmrs.web</groupId>
@@ -208,6 +214,10 @@
                         <artifactId>servlet-api</artifactId>
                         <groupId>javax.servlet</groupId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -219,6 +229,10 @@
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-messaging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib-jdk8</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -230,6 +244,12 @@
                 <groupId>ca.uhn.hapi.fhir</groupId>
                 <artifactId>hapi-fhir-structures-dstu3</artifactId>
                 <version>${hapifhirVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib-jdk8</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>ca.uhn.hapi.fhir</groupId>
@@ -240,6 +260,10 @@
                         <groupId>xpp3</groupId>
                         <artifactId>xpp3</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib-jdk8</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -251,6 +275,30 @@
                         <groupId>net.sf.saxon</groupId>
                         <artifactId>Saxon-HE</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>ca.uhn.hapi.fhir</groupId>
+                        <artifactId>org.hl7.fhir.dstu2</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ca.uhn.hapi.fhir</groupId>
+                        <artifactId>org.hl7.fhir.dstu2016may</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ca.uhn.hapi.fhir</groupId>
+                        <artifactId>org.hl7.fhir.dstu3</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ca.uhn.hapi.fhir</groupId>
+                        <artifactId>org.hl7.fhir.r4</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ca.uhn.hapi.fhir</groupId>
+                        <artifactId>org.hl7.fhir.r5</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib-jdk8</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -328,6 +376,10 @@
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.javassist</groupId>
+                        <artifactId>javassist</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -387,14 +439,11 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.openmrs.api</groupId>
-            <artifactId>openmrs-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.openmrs.api</groupId>
             <artifactId>openmrs-api</artifactId>
             <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openmrs.test</groupId>