From cd45c81ed47fc380e13af9be476c8518ea2ee365 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 23 May 2024 10:52:00 +0100
Subject: [PATCH 1/3] fix(shade): correct the shade used to include the
 META-INF/services files

closes #127
---
 .github/workflows/on_release.yml | 2 +-
 agent/pom.xml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index f9bb55b..202b334 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Update java version
         run: mvn versions:set -DnewVersion=${VERSION} -B -U
       - name: Build and Release
-        run: mvn -s .ci-settings.xml clean deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make
+        run: mvn -s .ci-settings.xml clean package deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make
 
       - name: Upload agent to release
         uses: svenstaro/upload-release-action@v2
diff --git a/agent/pom.xml b/agent/pom.xml
index 950c2fc..dd674e7 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -370,6 +370,7 @@
                     ${project.build.directory}/unpack/META-INF/native/netty_tcnative_windows_x86_64.dll
                   </file>
                 </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
               </transformers>
               <filters>
                 <!-- Excluded all signatures from other jars -->
@@ -381,7 +382,6 @@
                     <exclude>META-INF/*.RSA</exclude>
                     <exclude>META-INF/native-image/**/*.*</exclude>
                     <exclude>META-INF/proguard/**/*.*</exclude>
-                    <exclude>META-INF/native/**/*.*</exclude>
                     <exclude>META-INF/dgminfo</exclude>
                     <exclude>META-INF/*.properties</exclude>
                     <exclude>**/LICENSE.txt</exclude>

From b1e3f16aa11591d156164064b21cd92c1ad6b90d Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 23 May 2024 10:53:58 +0100
Subject: [PATCH 2/3] fix(shade): update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f77a91..0be9150 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.2.2 - (23/0352024)
+- **[BUGFIX]**: build: fix shade include of META-INF/services [#128](https://github.com/intergral/deep/pull/128) [@Umaaz](https://github.com/Umaaz)
+- 
 # 1.2.1 - (12/03/2024)
 - **[BUGFIX]**: plugin: fix ColdFusion detection on Windows [#116](https://github.com/intergral/deep/pull/116) [@LMarkie](https://github.com/LMarkie) 
 - **[BUGFIX]**: plugin: ensure that failed plugins do not block start up [#118](https://github.com/intergral/deep/pull/118) [@Umaaz](https://github.com/Umaaz) 

From 15d446d29f2ceadc9e07c49da30aff7bfda655f9 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Thu, 23 May 2024 10:56:39 +0100
Subject: [PATCH 3/3] fix(shade): revert bad change

---
 agent/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/agent/pom.xml b/agent/pom.xml
index dd674e7..a1b5fed 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -382,6 +382,7 @@
                     <exclude>META-INF/*.RSA</exclude>
                     <exclude>META-INF/native-image/**/*.*</exclude>
                     <exclude>META-INF/proguard/**/*.*</exclude>
+                    <exclude>META-INF/native/**/*.*</exclude>
                     <exclude>META-INF/dgminfo</exclude>
                     <exclude>META-INF/*.properties</exclude>
                     <exclude>**/LICENSE.txt</exclude>