Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 3 additions & 42 deletions mrbean/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ dynamically ("bean materialization"), integrated with Jackson (although usable e
<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>tools/jackson/module/mrbean</packageVersion.dir>
<packageVersion.package>${project.groupId}.mrbean</packageVersion.package>
<!-- not 100% sure this is needed, but due to shading better safe than sorry -->
<osgi.export>
${project.groupId}.mrbean.*;version=${project.version}
</osgi.export>
<!-- default import definitions should work fine -->
<osgi.private>net.bytebuddy.*</osgi.private>
</properties>

<dependencies>
Expand Down Expand Up @@ -79,47 +73,14 @@ ${project.groupId}.mrbean.*;version=${project.version}
<artifactId>cyclonedx-maven-plugin</artifactId>
</plugin>

<plugin>
<!-- We will shade ByteBuddy, to simplify deployment, avoid version conflicts -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>net.bytebuddy:byte-buddy</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>net.bytebuddy</pattern>
<shadedPattern>tools.jackson.module.mrbean.bytebuddy</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>

<!-- 31-Oct-2025, tatu: No more shading of ByteBuddy
(see [modules-base#320])
-->
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
<plugin>
<groupId>org.gradlex</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
<configuration>
<!-- 28-Feb-2025, jjohannes: remove shaded dependency-->
<removedDependencies>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>
</removedDependencies>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Active maintainers:
3.1.0 (not yet released)

#317: (afterburner, mrbean) Update byte-buddy to latest (1.17.8) from 1.15.1
#320: (mrbean) Remove shade plugin from 3.1 MrBean
(fix by @cowtowncoder, w/ Claude code)

3.0.2 (not yet released)

Expand Down