Manual perf of fix for #207 to master

FasterXML · May 19, 2023 · 756eaa8 · 756eaa8
1 parent 22bf704
commit 756eaa8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 13 deletions.
diff --git a/afterburner/pom.xml b/afterburner/pom.xml
@@ -32,13 +32,7 @@ field access and method calls
     <packageVersion.dir>tools/jackson/module/afterburner</packageVersion.dir>
     <packageVersion.package>${project.groupId}.afterburner</packageVersion.package>
 
-    <!-- 29-Oct-2015, tatu: default export should work fine; but for import may need dynamic/optional
-      -->
-
-    <!-- 09-Oct-2011, tatu: should NOT require "tools.jackson.databind.deser.impl", but
-       Maven Bundle plug-in insists for some reason?!?
-       (will try to hide via resolution directive)
-      -->
+    <!-- 29-Oct-2015, tatu: default export should work fine; but for import may need dynamic/optional -->
     <osgi.import>net.bytebuddy;resolution:=optional,
 *
      </osgi.import>
@@ -60,7 +54,7 @@ field access and method calls
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
     </dependency>
-    <dependency> <!--  tests use Jackson annotations -->
+    <dependency> <!-- tests use Jackson annotations -->
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
       <scope>provided</scope>

diff --git a/.../main/java/tools/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java b/.../main/java/tools/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java
@@ -569,7 +569,7 @@ public JsonTypeInfo.Value findPolymorphicTypeInfo(MapperConfig<?> config, Annota
         // JAXB always uses type name as id; let's consider WRAPPER_OBJECT to be canonical inclusion method
         // (TODO: should it be possible to merge such annotations in AnnotationIntrospector pair?)
         return JsonTypeInfo.Value.construct(JsonTypeInfo.Id.NAME, JsonTypeInfo.As.WRAPPER_OBJECT,
-                "", null, false);
+                "", null, false, null);
 /*// in 2.0 we had:
         TypeResolverBuilder<?> b = new StdTypeResolverBuilder();
         // JAXB always uses type name as id

diff --git a/jaxb/src/main/java/tools/jackson/module/jaxb/JaxbAnnotationIntrospector.java b/jaxb/src/main/java/tools/jackson/module/jaxb/JaxbAnnotationIntrospector.java
@@ -569,7 +569,7 @@ public JsonTypeInfo.Value findPolymorphicTypeInfo(MapperConfig<?> config, Annota
         // JAXB always uses type name as id; let's consider WRAPPER_OBJECT to be canonical inclusion method
         // (TODO: should it be possible to merge such annotations in AnnotationIntrospector pair?)
         return JsonTypeInfo.Value.construct(JsonTypeInfo.Id.NAME, JsonTypeInfo.As.WRAPPER_OBJECT,
-                "", null, false);
+                "", null, false, null);
 /*// in 2.0 we had:
         TypeResolverBuilder<?> b = new StdTypeResolverBuilder();
         // JAXB always uses type name as id

diff --git a/mrbean/pom.xml b/mrbean/pom.xml
@@ -98,8 +98,6 @@ ${project.groupId}.mrbean.*;version=${project.version}
               <goal>shade</goal>
             </goals>
             <configuration>
-<shadedArtifactAttached>false</shadedArtifactAttached>
-<shadedArtifactId>foobar-shaded</shadedArtifactId>
               <artifactSet>
                 <includes>
                   <include>net.bytebuddy:byte-buddy</include>
@@ -122,6 +120,33 @@ ${project.groupId}.mrbean.*;version=${project.version}
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
       </plugin>
+     <plugin>
+        <groupId>io.github.floverfelt</groupId>
+        <artifactId>find-and-replace-maven-plugin</artifactId>
+        <version>1.1.0</version>
+        <executions>
+          <execution>
+            <id>exec</id>
+            <phase>package</phase>
+            <goals>
+              <goal>find-and-replace</goal>
+            </goals>
+            <configuration>
+              <replacementType>file-contents</replacementType>
+              <baseDir>${basedir}</baseDir>
+              <findRegex><![CDATA[<modelVersion>4.0.0</modelVersion>]]></findRegex>
+              <fileMask>dependency-reduced-pom.xml</fileMask>
+              <replaceValue><![CDATA[  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>]]></replaceValue>
+              <recursive>false</recursive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@ not datatype, data format, or JAX-RS provider modules.
     <!-- 17-Oct-2017, tatu: MrBean and Afterburner will use Byte Buddy instead of raw ASM
           starting with 3.0
       -->
-    <version.bytebuddy>1.12.17</version.bytebuddy>
+    <version.bytebuddy>1.14.4</version.bytebuddy>
   </properties>
 
   <dependencyManagement>