Skip to content

Commit

Permalink
Fix #204: exclude ASM from GMM
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Apr 27, 2023
1 parent e6e2125 commit 4c27d0f
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 16 deletions.
20 changes: 14 additions & 6 deletions afterburner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,20 @@ field access and method calls
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>process-packageVersion</id>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>

<!-- 27-Apr-2023, tatu: [modules-base#204] GMM plugin needs help -->
<plugin>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
<configuration>
<removedDependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
</removedDependencies>
</configuration>
</plugin>

<plugin>
Expand Down
20 changes: 11 additions & 9 deletions mrbean/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,18 @@ ${project.groupId}.mrbean.*;version=${project.version}
<artifactId>replacer</artifactId>
</plugin>

<!-- 27-Apr-2023, tatu: [modules-base#204] GMM plugin needs help -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- [modules-base#109] Enable testing with Java 8 features,
especially default methods in interfaces
-->
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
</configuration>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
<configuration>
<removedDependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
</removedDependencies>
</configuration>
</plugin>

<plugin>
Expand Down
7 changes: 6 additions & 1 deletion release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ Active maintainers:
=== Releases ===
------------------------------------------------------------------------

2.15.0 (23-Aprr-2023)
2.15.1 (not yet released)

#204: (afterburner, mrbean) Gradle metadata for `jackson-core` `2.15.0` adds
dependency on shaded `org.ow2.asm:asm`

2.15.0 (23-Apr-2023)

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

0 comments on commit 4c27d0f

Please sign in to comment.