From 1b843082d5d404d90f9f68bc6673c672598a6119 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Fri, 3 Feb 2023 16:36:54 +0000
Subject: [PATCH] Remove dependency on jaxb-api2 compat package

---
 ...rta.activation-namespace-in-jaxb-api.patch | 696 ++++++++++++++++++
 jackson-modules-base.spec                     |   9 +-
 2 files changed, 703 insertions(+), 2 deletions(-)
 create mode 100644 0001-Use-jakarta.activation-namespace-in-jaxb-api.patch

diff --git a/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
new file mode 100644
index 0000000..ef88dbc
--- /dev/null
+++ b/0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
@@ -0,0 +1,696 @@
+From d361f9ad2e658ee6e14ab29685463274faaa57a6 Mon Sep 17 00:00:00 2001
+From: Chris Kelley <ckelley@redhat.com>
+Date: Fri, 3 Feb 2023 16:33:42 +0000
+Subject: [PATCH] Use jakarta.activation namespace in jaxb-api
+
+---
+ afterburner/dependency-reduced-pom.xml        | 103 ++++++++++++++++++
+ .../jackson/module/jaxb/AdapterConverter.java |   2 +-
+ .../jaxb/JaxbAnnotationIntrospector.java      |  16 +--
+ .../module/jaxb/adapters/MapAdapter.java      |   4 +-
+ .../jaxb/adapters/TestAdaptedMapType.java     |   4 +-
+ .../module/jaxb/adapters/TestAdapters.java    |  14 +--
+ .../adapters/TestAdaptersForContainers.java   |   4 +-
+ .../jaxb/adapters/TestIdentityAdapters.java   |   4 +-
+ .../module/jaxb/failing/TestUnwrapping.java   |   2 +-
+ .../module/jaxb/failing/TestXmlID3.java       |   4 +-
+ .../jackson/module/jaxb/id/TestXmlID.java     |   2 +-
+ .../jackson/module/jaxb/id/TestXmlID2.java    |   2 +-
+ .../jaxb/introspect/TestAccessType.java       |   6 +-
+ .../introspect/TestAnnotationPriority.java    |   2 +-
+ .../jaxb/introspect/TestIntrospectorPair.java |   2 +-
+ .../TestJaxbAnnotationIntrospector.java       |   6 +-
+ .../jaxb/introspect/TestJaxbAutoDetect.java   |   2 +-
+ .../jaxb/introspect/TestJaxbFieldAccess.java  |   2 +-
+ .../jaxb/introspect/TestPropertyOrdering.java |   2 +-
+ .../introspect/TestPropertyVisibility.java    |   2 +-
+ .../module/jaxb/introspect/TestXmlValue.java  |   2 +-
+ .../module/jaxb/misc/TestElementWrapper.java  |   4 +-
+ .../jackson/module/jaxb/misc/TestEnums.java   |   2 +-
+ .../jaxb/misc/TestJaxbNullProperties.java     |   4 +-
+ .../module/jaxb/misc/TestRootName.java        |   2 +-
+ .../jaxb/misc/TestSchemaGeneration.java       |   2 +-
+ .../jaxb/misc/TestSerializationInclusion.java |   2 +-
+ .../misc/TestXmlAnyElementWithElementRef.java |   2 +-
+ .../module/jaxb/misc/package-info.java        |   4 +-
+ .../module/jaxb/types/PolymorpicTestBase.java |   2 +-
+ .../module/jaxb/types/TestCyclicTypes.java    |   2 +-
+ .../jaxb/types/TestJaxbPolymorphic.java       |   2 +-
+ .../jaxb/types/TestJaxbPolymorphicLists.java  |   2 +-
+ .../jaxb/types/TestJaxbPolymorphicMaps.java   |   2 +-
+ .../jaxb/types/TestJaxbTypeCoercion1023.java  |   2 +-
+ .../module/jaxb/types/TestJaxbTypes.java      |   2 +-
+ 36 files changed, 163 insertions(+), 60 deletions(-)
+ create mode 100644 afterburner/dependency-reduced-pom.xml
+
+diff --git a/afterburner/dependency-reduced-pom.xml b/afterburner/dependency-reduced-pom.xml
+new file mode 100644
+index 00000000..275bc903
+--- /dev/null
++++ b/afterburner/dependency-reduced-pom.xml
+@@ -0,0 +1,103 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++  <parent>
++    <artifactId>jackson-modules-base</artifactId>
++    <groupId>com.fasterxml.jackson.module</groupId>
++    <version>2.15.0-SNAPSHOT</version>
++  </parent>
++  <modelVersion>4.0.0</modelVersion>
++  <artifactId>jackson-module-afterburner</artifactId>
++  <packaging>bundle</packaging>
++  <name>Jackson module: Afterburner</name>
++  <description>Jackson (https://github.com/FasterXML/jackson) extension module
++used to enhance performance using bytecode generation to replace use of Reflection for
++field access and method calls</description>
++  <url>https://github.com/FasterXML/jackson-modules-base</url>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>com.google.code.maven-replacer-plugin</groupId>
++        <artifactId>replacer</artifactId>
++        <executions>
++          <execution>
++            <id>process-packageVersion</id>
++            <phase>generate-sources</phase>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
++        <artifactId>maven-shade-plugin</artifactId>
++        <executions>
++          <execution>
++            <phase>package</phase>
++            <goals>
++              <goal>shade</goal>
++            </goals>
++            <configuration>
++              <artifactSet>
++                <includes>
++                  <include>org.ow2.asm:asm</include>
++                </includes>
++              </artifactSet>
++              <relocations>
++                <relocation>
++                  <pattern>org.objectweb.asm</pattern>
++                  <shadedPattern>com.fasterxml.jackson.module.afterburner.asm</shadedPattern>
++                </relocation>
++              </relocations>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
++        <groupId>org.moditect</groupId>
++        <artifactId>moditect-maven-plugin</artifactId>
++      </plugin>
++    </plugins>
++  </build>
++  <dependencies>
++    <dependency>
++      <groupId>com.fasterxml.jackson.core</groupId>
++      <artifactId>jackson-core</artifactId>
++      <version>2.15.0-SNAPSHOT</version>
++      <scope>compile</scope>
++    </dependency>
++    <dependency>
++      <groupId>com.fasterxml.jackson.core</groupId>
++      <artifactId>jackson-databind</artifactId>
++      <version>2.15.0-SNAPSHOT</version>
++      <scope>compile</scope>
++    </dependency>
++    <dependency>
++      <groupId>com.fasterxml.jackson.core</groupId>
++      <artifactId>jackson-annotations</artifactId>
++      <version>2.15.0-SNAPSHOT</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.13.2</version>
++      <scope>test</scope>
++      <exclusions>
++        <exclusion>
++          <artifactId>hamcrest-core</artifactId>
++          <groupId>org.hamcrest</groupId>
++        </exclusion>
++      </exclusions>
++    </dependency>
++  </dependencies>
++  <properties>
++    <packageVersion.dir>com/fasterxml/jackson/module/afterburner</packageVersion.dir>
++    <osgi.import>org.objectweb.asm;resolution:=optional,
++*</osgi.import>
++    <packageVersion.package>${project.groupId}.afterburner</packageVersion.package>
++  </properties>
++</project>
+diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java
+index 3e45f695..a3482e52 100644
+--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java
++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/AdapterConverter.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb;
+ 
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+ 
+ import com.fasterxml.jackson.databind.JavaType;
+ import com.fasterxml.jackson.databind.type.TypeFactory;
+diff --git a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
+index 908b89e0..d859b9b2 100644
+--- a/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
++++ b/jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java
+@@ -4,9 +4,9 @@ import java.lang.annotation.Annotation;
+ import java.lang.reflect.*;
+ import java.util.*;
+ 
+-import javax.xml.bind.*;
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.*;
++import jakarta.xml.bind.*;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+ import com.fasterxml.jackson.annotation.*;
+@@ -33,17 +33,17 @@ import com.fasterxml.jackson.module.jaxb.ser.DataHandlerJsonSerializer;
+  *  </li>
+  * <li>{@link XmlAnyElement} not supported; unlikely to ever be supported.
+  *   </li>
+- * <li>{@link javax.xml.bind.annotation.XmlAttachmentRef}: JSON does not support external attachments
++ * <li>{@link jakarta.xml.bind.annotation.XmlAttachmentRef}: JSON does not support external attachments
+  * <li>{@link XmlElementDecl}
+  * <li>{@link XmlElementRefs} because Jackson doesn't have any support for 'named' collection items;
+  *    some parts could theoretically be supported
+  *   </li>
+- * <li>{@link javax.xml.bind.annotation.XmlInlineBinaryData} since the underlying concepts
++ * <li>{@link jakarta.xml.bind.annotation.XmlInlineBinaryData} since the underlying concepts
+  *    (like XOP) do not exist in JSON -- Jackson will always use inline base64 encoding as the method
+- * <li>{@link javax.xml.bind.annotation.XmlList} because JSON does not have (or necessarily need)
++ * <li>{@link jakarta.xml.bind.annotation.XmlList} because JSON does not have (or necessarily need)
+  *    method of serializing list of values as space-separated Strings
+- * <li>{@link javax.xml.bind.annotation.XmlMimeType}
+- * <li>{@link javax.xml.bind.annotation.XmlMixed} since JSON has no concept of mixed content
++ * <li>{@link jakarta.xml.bind.annotation.XmlMimeType}
++ * <li>{@link jakarta.xml.bind.annotation.XmlMixed} since JSON has no concept of mixed content
+  * <li>{@link XmlRegistry} not supported, unlikely to ever be.
+  * <li>{@link XmlSchema} not supported, unlikely to ever be.
+  * <li>{@link XmlSchemaType} not supported, unlikely to ever be.
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
+index 239e88f6..7509a918 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/MapAdapter.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.adapters;
+ 
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+ 
+ 
+ import java.util.HashMap;
+@@ -29,4 +29,4 @@ public class MapAdapter<K, V> extends XmlAdapter<MapType<K, V>, Map<K, V>>
+      }
+      return theMap;
+   }
+-}
+\ No newline at end of file
++}
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
+index 72f94232..29d0161c 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptedMapType.java
+@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters;
+ import java.io.*;
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
+-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
+index 5b91d555..e85b82b6 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdapters.java
+@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.adapters;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
+-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+@@ -77,7 +77,7 @@ public class TestAdapters extends BaseJaxbTest
+         
+         @Override
+         public Calendar unmarshal(String value) {
+-            return (javax.xml.bind.DatatypeConverter.parseDateTime(value));
++            return (jakarta.xml.bind.DatatypeConverter.parseDateTime(value));
+         }
+     
+         @Override
+@@ -85,7 +85,7 @@ public class TestAdapters extends BaseJaxbTest
+             if (value == null) {
+                 return null;
+             }
+-            return (javax.xml.bind.DatatypeConverter.printDateTime(value));
++            return (jakarta.xml.bind.DatatypeConverter.printDateTime(value));
+         }
+     }
+     
+@@ -111,7 +111,7 @@ public class TestAdapters extends BaseJaxbTest
+     public static class Adapter1 extends XmlAdapter<String, Long> {
+         @Override
+         public Long unmarshal(String value) {
+-            return ((long) javax.xml.bind.DatatypeConverter.parseLong(value));
++            return ((long) jakarta.xml.bind.DatatypeConverter.parseLong(value));
+         }
+ 
+         @Override
+@@ -119,7 +119,7 @@ public class TestAdapters extends BaseJaxbTest
+             if (value == null) {
+                 return null;
+             }
+-            return (javax.xml.bind.DatatypeConverter.printLong((long) (long) value));
++            return (jakarta.xml.bind.DatatypeConverter.printLong((long) (long) value));
+         }   
+     }    
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
+index f0b7df80..b720d8f4 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestAdaptersForContainers.java
+@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.adapters;
+ import java.util.*;
+ import java.util.Map.Entry;
+ 
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.*;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.SerializationFeature;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
+index bd2792f4..9053a447 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/adapters/TestIdentityAdapters.java
+@@ -1,7 +1,7 @@
+ package com.fasterxml.jackson.module.jaxb.adapters;
+ 
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
+-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
+index a428b49d..a180a529 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestUnwrapping.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.failing;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonUnwrapped;
+ import com.fasterxml.jackson.databind.*;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
+index 71d9492c..4d944602 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java
+@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.jaxb.failing;
+ import java.util.Arrays;
+ import java.util.List;
+ 
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlID;
++import jakarta.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlID;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
+index af5b235f..9b6b1161 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
+index eabb71f4..4a775a0c 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.id;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+ import com.fasterxml.jackson.core.type.TypeReference;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
+index 82cc66a8..6c3151dc 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java
+@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
+-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+ 
+ import com.fasterxml.jackson.databind.*;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
+index 2d2b341b..46a9f3ee 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAnnotationPriority.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+-import javax.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlElement;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
+index 66006a31..5ecf19bf 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestIntrospectorPair.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.*;
+ import com.fasterxml.jackson.databind.*;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
+index f5bfa936..9931f1af 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java
+@@ -2,9 +2,9 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
+-import javax.xml.bind.annotation.adapters.XmlAdapter;
+-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+ import javax.xml.namespace.QName;
+ 
+ import com.fasterxml.jackson.databind.*;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
+index 5e7c79eb..9841c930 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java
+@@ -4,7 +4,7 @@ import java.io.*;
+ import java.math.BigDecimal;
+ import java.util.Map;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.*;
+ import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
+index 5fc85b9f..b9530d3e 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbFieldAccess.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.io.IOException;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.*;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
+index 17a347a9..dcbd1dac 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyOrdering.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
+index f73ff664..691bc7d8 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.io.IOException;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+ import com.fasterxml.jackson.databind.*;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
+index 9b440492..52c040f9 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestXmlValue.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.introspect;
+ 
+ import java.io.IOException;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonProperty;
+ import com.fasterxml.jackson.databind.*;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
+index fbaf7dd3..b5e5165c 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java
+@@ -2,8 +2,8 @@ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlElementWrapper;
++import jakarta.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlElementWrapper;
+ 
+ import com.fasterxml.jackson.databind.MapperFeature;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
+index 50de1236..4ffccf32 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestEnums.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+-import javax.xml.bind.annotation.XmlEnum;
++import jakarta.xml.bind.annotation.XmlEnum;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
+index d684df7f..5172819e 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestJaxbNullProperties.java
+@@ -1,7 +1,7 @@
+ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
++import jakarta.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlRootElement;
+ 
+ import com.fasterxml.jackson.annotation.JsonInclude;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
+index 98fed553..f45b5728 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestRootName.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+-import javax.xml.bind.annotation.XmlRootElement;
++import jakarta.xml.bind.annotation.XmlRootElement;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.SerializationFeature;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
+index 513ae199..c3fa4b71 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSchemaGeneration.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.JsonNode;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
+index 95a6592b..c4688bef 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestSerializationInclusion.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+ import java.util.List;
+ 
+-import javax.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlElement;
+ 
+ import com.fasterxml.jackson.annotation.JsonInclude;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
+index 55731622..977ea0b5 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestXmlAnyElementWithElementRef.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.misc;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
+index 83bfdde4..ef27cae6 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/package-info.java
+@@ -1,8 +1,8 @@
+ /**
+  * Package info can be used to add "package annotations", so here we are...
+  */
+-@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters({
+-  @javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(
++@jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters({
++  @jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter(
+     type = javax.xml.namespace.QName.class,
+     value = com.fasterxml.jackson.module.jaxb.introspect.TestJaxbAnnotationIntrospector.QNameAdapter.class
+   )
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java
+index 8d4f635e..a6bedfc4 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/PolymorpicTestBase.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.types;
+ 
+-import javax.xml.bind.annotation.XmlRootElement;
++import jakarta.xml.bind.annotation.XmlRootElement;
+ 
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
+index 9454eeba..3d2d57a5 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestCyclicTypes.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.*;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
+index e97df8bd..1ea9514e 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphic.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
+index 41909219..afe417d1 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicLists.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
+index b3568f32..67bc045e 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbPolymorphicMaps.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ 
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
+index 6b49fd20..843f0a0a 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypeCoercion1023.java
+@@ -1,6 +1,6 @@
+ package com.fasterxml.jackson.module.jaxb.types;
+ 
+-import javax.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlElement;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.module.jaxb.BaseJaxbTest;
+diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
+index 2031f014..2efec6a2 100644
+--- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
++++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/types/TestJaxbTypes.java
+@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.jaxb.types;
+ 
+ import java.util.*;
+ 
+-import javax.xml.bind.annotation.*;
++import jakarta.xml.bind.annotation.*;
+ 
+ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+ import com.fasterxml.jackson.annotation.JsonTypeInfo;
+-- 
+2.39.0
+
diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec
index 03f692d..aa59989 100644
--- a/jackson-modules-base.spec
+++ b/jackson-modules-base.spec
@@ -2,7 +2,7 @@
 
 Name:           jackson-modules-base
 Version:        2.14.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jackson modules: Base
 License:        Apache-2.0
 
@@ -10,6 +10,7 @@ URL:            https://github.com/FasterXML/jackson-modules-base
 Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 Patch1:         0001-Expose-javax.security.auth-from-JDK-internals.patch
 Patch2:         0001-Replace-javax.activation-imports-with-jakarta.activa.patch
+Patch3:         0001-Use-jakarta.activation-namespace-in-jaxb-api.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(cglib:cglib)
@@ -19,7 +20,7 @@ BuildRequires:  mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version}
 BuildRequires:  mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
 BuildRequires:  mvn(com.google.code.maven-replacer-plugin:replacer)
 BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
-BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api:2.3.3)
+BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.mockito:mockito-all)
@@ -45,6 +46,7 @@ framework to read and write XML.
 %setup -q -n %{name}-%{name}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime
 %pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin"
@@ -102,6 +104,9 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja
 %license LICENSE NOTICE
 
 %changelog
+* Fri Feb 03 2023 Chris Kelley <ckelley@redhat.com> - 2.14.2-3
+- Remove dependency on jaxb-api2 compat package
+
 * Fri Feb 03 2023 Chris Kelley <ckelley@redhat.com> - 2.14.2-2
 - Remove dependency on jakarta-activation1 compat package