From 07c9bd92f1baf35a2ee42fae9ae52b5cd0a48bdc Mon Sep 17 00:00:00 2001
From: haynescd <haynescd@chop.edu>
Date: Sat, 11 Nov 2023 09:41:04 -0500
Subject: [PATCH] Update to use shade plugin to not overrite resources

---
 pom.xml                                       | 29 +++++++++++++++----
 ...licationContext-persistenceConnections.xml |  6 ++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dc4c948..6d73b31a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,18 +221,35 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-shade-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>create-my-bundle</id>
+						<id>assembly</id>
 						<phase>package</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<descriptorRefs>
-								<descriptorRef>jar-with-dependencies</descriptorRef>
-							</descriptorRefs>
+							<transformers>
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.handlers</resource>
+								</transformer>
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.schemas</resource>
+								</transformer>
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.tooling</resource>
+								</transformer>
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+								<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+									<addHeader>false</addHeader>
+								</transformer>
+							</transformers>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/src/main/resources/applicationContext-persistenceConnections.xml b/src/main/resources/applicationContext-persistenceConnections.xml
index 15204bb3..da28a5d2 100644
--- a/src/main/resources/applicationContext-persistenceConnections.xml
+++ b/src/main/resources/applicationContext-persistenceConnections.xml
@@ -5,9 +5,9 @@
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
-     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
+     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
     <beans profile="dbcp,jndi">
         <bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">