From 19ed6959c514b26281dd6f0b3bf8693171adbc1f Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 31 Oct 2025 16:08:18 -0700
Subject: [PATCH] Fix #320: rm shading of byte-buddy by mr-bean module

---
 mrbean/pom.xml        | 45 +++----------------------------------------
 release-notes/VERSION |  2 ++
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/mrbean/pom.xml b/mrbean/pom.xml
index 360dbd06..a1b41993 100644
--- a/mrbean/pom.xml
+++ b/mrbean/pom.xml
@@ -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>
@@ -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>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 9a9cb749..64666b19 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -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)