Re-apply #235 but now with 2.18 target (not sure what happened earlier)

Author: cowtowncoder

jaxb/pom.xml

@@ -37,7 +37,9 @@ for configuring data-binding.
       -->
     <osgi.import>javax.activation;resolution:=optional,*</osgi.import>
 
+    <!-- 20-May-2024, tatu: no longer needed it seems:
     <version.jaxb.impl>2.3.3</version.jaxb.impl>
+    -->
   </properties>
   <dependencies>
     <!-- Extends Jackson core and mapper; minor dep on annotations too (JsonInclude) -->
@@ -55,13 +57,13 @@ for configuring data-binding.
     </dependency>
 
     <!--  and actual JAXB annotations, types -->
-    <!-- NOTE! Despite groupId, this is "old" JAXB, not Jakarta
-         (3.x is real Jakarta one)
-      -->
+    <!-- 20-May-2024: [modules-base#233]: Tolerate [2.2,3) for javax.xml.bind Import-Package
+	    in the generated MANIFEST.MF -->
+    <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>${version.jaxb.impl}</version>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.2.12</version>
     </dependency>
 
     <!-- 14-Mar-2019, tatu: Looks like this is needed for JDK11 and later
@@ -73,12 +75,14 @@ for configuring data-binding.
     </dependency>
 
     <!-- may also need JAXB impl for tests -->
+    <!-- 20-May-2024, tatu: no longer needed it seems:
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>${version.jaxb.impl}</version>
       <scope>test</scope>
     </dependency>
+    -->
 
   </dependencies>
 

release-notes/CREDITS-2.x

@@ -142,6 +142,12 @@ Eran Leshem (@eranl)
 
 Sammy Chu (@sammyhk)
 
-* Reported#231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
+* Reported #231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
   to `jakarta.activation;resolution:=optional` in `jakarta-xmlbind/pom.xml`
  (2.16.1)
+
+Jack Dunning (@JDUNNIN)
+
+* Contributed #233: (jaxb) Tolerate JAX-RS 2.2 in jackson-module-jaxb-annotations so
+  that it can be deployed in Liberty alongside features which use 2.2
+ (2.18.0)

release-notes/VERSION-2.x

@@ -25,7 +25,9 @@ Active maintainers:
 
 2.18.0 (not yet released)
 
-No changes since 2.17
+#233: (jaxb) Tolerate JAX-RS 2.2 in jackson-module-jaxb-annotations so
+  that it can be deployed in Liberty alongside features which use 2.2
+ (contributed by Jack D)
 
 2.17.1 (04-May-2024)
 2.17.0 (12-Mar-2024)