Merge changes for FasterXML#81

Author: cowtowncoder

jaxb/pom.xml

@@ -23,6 +23,8 @@ data-binding.
            when ser/deser'ing javax.a.DataHandlers
       -->
     <osgi.import>javax.activation;resolution:=optional,*</osgi.import>
+
+    <version.jaxb.impl>2.3.2</version.jaxb.impl>
   </properties>
   <dependencies>
     <!-- Extends Jackson core and mapper; minor dep on annotations too (JsonInclude) -->
@@ -41,35 +43,40 @@ data-binding.
 
     <!--  and actual JAXB annotations, types -->
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.1</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>javax.activation-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>${version.jaxb.impl}</version>
     </dependency>
+
     <!-- 14-Mar-2019, tatu: Looks like this is needed for JDK11 and later
       -->
-    <!-- 05-May-2019, tatu: Apparently this isn't as good as alternative
+    <!-- 05-May-2019, tatu: Apparently these ain't it...
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>javax.activation-api</artifactId>
       <version>1.2.0</version>
       <scope>provided</scope>
     </dependency>
-    -->
-
-      <!-- ... and this is the real mccoy? -->
-      <dependency>
+    <dependency>
           <groupId>com.jwebmp.thirdparty</groupId>
           <artifactId>javax.activation</artifactId>
           <version>0.67.0.5</version>
           <scope>provided</scope>
-      </dependency>
+    </dependency>
+-->
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+
+    <!-- may also need JAXB impl for tests -->
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>${version.jaxb.impl}</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>