From 3bf24e44cb1cc74dfdbbc6ed067c082222e37b3c Mon Sep 17 00:00:00 2001
From: Ben Evans <beevans@redhat.com>
Date: Mon, 20 Nov 2023 19:24:40 +0100
Subject: [PATCH 1/3] Add JAR Shading

---
 pom.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5d0ce36..667e121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,9 +35,12 @@
     <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+    <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
     <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
     <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
     <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
+
+    <shade.prefix>com.redhat.insights.agent.shaded</shade.prefix>
   </properties>
 
   <dependencyManagement>
@@ -268,6 +271,67 @@
         </dependencies>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>${maven-shade-plugin.version}</version>
+        <configuration></configuration>
+        <executions>
+          <execution>
+            <id>shade-jar-with-dependencies</id>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <useDependencyReducedPomInJar>false</useDependencyReducedPomInJar>
+              <createSourcesJar>true</createSourcesJar>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>shaded</shadedClassifierName>
+              <relocations>
+                <relocation>
+                  <pattern>org.apache</pattern>
+                  <shadedPattern>${shade.prefix}.org.apache.shaded</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.slf4j</pattern>
+                  <shadedPattern>${shade.prefix}.org.slf4j</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.wildfly.common</pattern>
+                  <shadedPattern>${shade.prefix}.org.wildfly.common</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.wildfly.security</pattern>
+                  <shadedPattern>${shade.prefix}.org.wildfly.security</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.jboss</pattern>
+                  <shadedPattern>${shade.prefix}.org.jboss</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.fasterxml.jackson</pattern>
+                  <shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
+                </relocation>
+              </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Agent-Class>com.redhat.insights.agent.AgentMain</Agent-Class>
+                  </manifestEntries>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"></transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <addHeader>false</addHeader>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>

From 19adfa0d9bc9033ea43ac26a4c86138db099461d Mon Sep 17 00:00:00 2001
From: Ben Evans <beevans@redhat.com>
Date: Tue, 21 Nov 2023 17:17:19 +0100
Subject: [PATCH 2/3] Update pom.xml

Co-authored-by: Elliott Baron <ebaron@redhat.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 667e121..b73a1fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
               <relocations>
                 <relocation>
                   <pattern>org.apache</pattern>
-                  <shadedPattern>${shade.prefix}.org.apache.shaded</shadedPattern>
+                  <shadedPattern>${shade.prefix}.org.apache</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.slf4j</pattern>

From a5d1ab295070c9cc88c23ea39950cbae7e0e1531 Mon Sep 17 00:00:00 2001
From: Ben Evans <beevans@redhat.com>
Date: Tue, 21 Nov 2023 17:21:32 +0100
Subject: [PATCH 3/3] Fix up pom per ebaron suggestions

---
 pom.xml | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 667e121..b45af2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,11 +292,7 @@
               <relocations>
                 <relocation>
                   <pattern>org.apache</pattern>
-                  <shadedPattern>${shade.prefix}.org.apache.shaded</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.slf4j</pattern>
-                  <shadedPattern>${shade.prefix}.org.slf4j</shadedPattern>
+                  <shadedPattern>${shade.prefix}.org.apache</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.wildfly.common</pattern>
@@ -314,11 +310,41 @@
                   <pattern>com.fasterxml.jackson</pattern>
                   <shadedPattern>${shade.prefix}.com.fasterxml.jackson</shadedPattern>
                 </relocation>
+                <!-- TODO Remove the following relocations once this bug is fixed:
+                                  https://issues.apache.org/jira/browse/MSHADE-406 -->
+                <relocation>
+                  <pattern>META-INF/versions/9/</pattern>
+                  <shadedPattern>META-INF/versions/9/${shade.prefix}/</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>META-INF/versions/11/</pattern>
+                  <shadedPattern>META-INF/versions/11/${shade.prefix}/</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>META-INF/versions/17/</pattern>
+                  <shadedPattern>META-INF/versions/17/${shade.prefix}/</shadedPattern>
+                </relocation>
               </relocations>
+              <!-- TODO Revisit the following filters once this bug is fixed:
+                  https://issues.apache.org/jira/browse/MSHADE-406 -->
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>**/module-info.class</exclude>
+                    <exclude>META-INF/DEPENDENCIES</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
                     <Agent-Class>com.redhat.insights.agent.AgentMain</Agent-Class>
+                    <Multi-Release>true</Multi-Release>
                   </manifestEntries>
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>