Skip to content

Commit 5de53a0

Browse files
authored
Merge pull request #128 from intergral/127-shade-plugin
fix(shade): correct the shade used to include the META-INF/services f…
2 parents 1a820fd + 15d446d commit 5de53a0

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.github/workflows/on_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Update java version
3535
run: mvn versions:set -DnewVersion=${VERSION} -B -U
3636
- name: Build and Release
37-
run: mvn -s .ci-settings.xml clean deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make
37+
run: mvn -s .ci-settings.xml clean package deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make
3838

3939
- name: Upload agent to release
4040
uses: svenstaro/upload-release-action@v2

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.2.2 - (23/0352024)
2+
- **[BUGFIX]**: build: fix shade include of META-INF/services [#128](https://github.com/intergral/deep/pull/128) [@Umaaz](https://github.com/Umaaz)
3+
-
14
# 1.2.1 - (12/03/2024)
25
- **[BUGFIX]**: plugin: fix ColdFusion detection on Windows [#116](https://github.com/intergral/deep/pull/116) [@LMarkie](https://github.com/LMarkie)
36
- **[BUGFIX]**: plugin: ensure that failed plugins do not block start up [#118](https://github.com/intergral/deep/pull/118) [@Umaaz](https://github.com/Umaaz)

agent/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@
370370
${project.build.directory}/unpack/META-INF/native/netty_tcnative_windows_x86_64.dll
371371
</file>
372372
</transformer>
373+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
373374
</transformers>
374375
<filters>
375376
<!-- Excluded all signatures from other jars -->

0 commit comments

Comments
 (0)