Merge branch '2.16' into 2.17

FasterXML · Dec 21, 2023 · 7d3e9f9 · 7d3e9f9
2 parents 2024cb7 + 4df7b1f
commit 7d3e9f9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml
@@ -37,7 +37,9 @@
       -->
     <!-- 02-Oct-2023, tatu: [modules-base#219]: Need to relax constraints for bind-annotations
       -->
-    <osgi.import>javax.activation;resolution:=optional,
+    <!-- 20-Dec-2023, tatu: [modules-base#231]: And make sure to use "right" actiovation dep
+      -->
+    <osgi.import>jakarta.activation;resolution:=optional,
       jakarta.xml.bind;version="[3.0,4.0.100)",
       jakarta.xml.bind.*;version="[3.0,4.0.100)",
       *

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -138,4 +138,10 @@ Marco Descher (@col-panic)
 Eran Leshem (@eranl)
 
 * Contributed #227: Add `jackson-module-android-record
+ (2.16.0)
+
+Sammy Chu (@sammyhk)
 
+* Reported#231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
+  to `jakarta.activation;resolution:=optional` in `jakarta-xmlbind/pom.xml`
+ (2.16.1)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -27,6 +27,12 @@ Active maintainers:
 
 -
 
+2.16.1 (not yet released)
+
+#231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
+  to `jakarta.activation;resolution:=optional` in `jakarta-xmlbind/pom.xml`
+ (reported by Sammy C)
+
 2.16.0 (15-Nov-2023)
 
 #181: (blackbird) BlackBird proxy object error in Java 17