Skip to content

Commit 395e69e

Browse files
authored
Merge pull request #205 from FasterXML/tatu/204-gmm-shaded-asm-module-dep
Fix #204: exclude ASM from GMM
2 parents e6e2125 + 4c27d0f commit 395e69e

File tree

3 files changed

+31
-16
lines changed

3 files changed

+31
-16
lines changed

afterburner/pom.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,20 @@ field access and method calls
7777
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
7878
<groupId>com.google.code.maven-replacer-plugin</groupId>
7979
<artifactId>replacer</artifactId>
80-
<executions>
81-
<execution>
82-
<id>process-packageVersion</id>
83-
<phase>generate-sources</phase>
84-
</execution>
85-
</executions>
80+
</plugin>
81+
82+
<!-- 27-Apr-2023, tatu: [modules-base#204] GMM plugin needs help -->
83+
<plugin>
84+
<groupId>de.jjohannes</groupId>
85+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
86+
<configuration>
87+
<removedDependencies>
88+
<dependency>
89+
<groupId>org.ow2.asm</groupId>
90+
<artifactId>asm</artifactId>
91+
</dependency>
92+
</removedDependencies>
93+
</configuration>
8694
</plugin>
8795

8896
<plugin>

mrbean/pom.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,18 @@ ${project.groupId}.mrbean.*;version=${project.version}
6464
<artifactId>replacer</artifactId>
6565
</plugin>
6666

67+
<!-- 27-Apr-2023, tatu: [modules-base#204] GMM plugin needs help -->
6768
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-compiler-plugin</artifactId>
70-
<configuration>
71-
<!-- [modules-base#109] Enable testing with Java 8 features,
72-
especially default methods in interfaces
73-
-->
74-
<testSource>1.8</testSource>
75-
<testTarget>1.8</testTarget>
76-
</configuration>
69+
<groupId>de.jjohannes</groupId>
70+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
71+
<configuration>
72+
<removedDependencies>
73+
<dependency>
74+
<groupId>org.ow2.asm</groupId>
75+
<artifactId>asm</artifactId>
76+
</dependency>
77+
</removedDependencies>
78+
</configuration>
7779
</plugin>
7880

7981
<plugin>

release-notes/VERSION-2.x

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ Active maintainers:
2020
=== Releases ===
2121
------------------------------------------------------------------------
2222

23-
2.15.0 (23-Aprr-2023)
23+
2.15.1 (not yet released)
24+
25+
#204: (afterburner, mrbean) Gradle metadata for `jackson-core` `2.15.0` adds
26+
dependency on shaded `org.ow2.asm:asm`
27+
28+
2.15.0 (23-Apr-2023)
2429

2530
#190: Filter annotated by JsonInclude.Include.CUSTOM does not get called if
2631
property is null with Afterburner/Blackbird module registered

0 commit comments

Comments
 (0)