diff --git a/afterburner/pom.xml b/afterburner/pom.xml index ecdd74ce..18b6ed2a 100644 --- a/afterburner/pom.xml +++ b/afterburner/pom.xml @@ -35,9 +35,7 @@ field access and method calls - org.objectweb.asm;resolution:=optional, @@ -64,7 +62,7 @@ field access and method calls org.ow2.asm asm - + com.fasterxml.jackson.core jackson-annotations provided diff --git a/mrbean/pom.xml b/mrbean/pom.xml index 74dc463f..5843d284 100644 --- a/mrbean/pom.xml +++ b/mrbean/pom.xml @@ -36,8 +36,14 @@ dynamically ("bean materialization"), integrated with Jackson (although usable e ${project.groupId}.mrbean.*;version=${project.version} - - org.objectweb.asm.* + + org.objectweb.asm;resolution:=optional, +* + + @@ -89,11 +95,9 @@ ${project.groupId}.mrbean.*;version=${project.version} shade -false -foobar-shaded - org.objectweb.asm:asm + org.ow2.asm:asm @@ -113,6 +117,33 @@ ${project.groupId}.mrbean.*;version=${project.version} org.moditect moditect-maven-plugin + + io.github.floverfelt + find-and-replace-maven-plugin + 1.1.0 + + + exec + package + + find-and-replace + + + file-contents + ${basedir} + 4.0.0]]> + dependency-reduced-pom.xml + + + + + + 4.0.0]]> + false + + + + diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 36dfc6cb..3ca9c1ce 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -20,6 +20,10 @@ Active maintainers: === Releases === ------------------------------------------------------------------------ +2.15.2 (not yet released) + +#207: Mr Bean exposing `Asm` as Maven dependency despite shading + 2.15.1 (16-May-2023) #204: (afterburner, mrbean) Gradle metadata for `jackson-core` `2.15.0` adds