Skip to content

Commit 4df7b1f

Browse files
authored
Merge pull request #232 from FasterXML/tatu/2.16.1/231-jakarta-activation-osgi
Fix #231: change OSGi dep of "activation" package to jakarta (from javax)
2 parents d222304 + 87b1dab commit 4df7b1f

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

jakarta-xmlbind/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
-->
3838
<!-- 02-Oct-2023, tatu: [modules-base#219]: Need to relax constraints for bind-annotations
3939
-->
40-
<osgi.import>javax.activation;resolution:=optional,
40+
<!-- 20-Dec-2023, tatu: [modules-base#231]: And make sure to use "right" actiovation dep
41+
-->
42+
<osgi.import>jakarta.activation;resolution:=optional,
4143
jakarta.xml.bind;version="[3.0,4.0.100)",
4244
jakarta.xml.bind.*;version="[3.0,4.0.100)",
4345
*

release-notes/CREDITS-2.x

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,10 @@ Marco Descher (@col-panic)
138138
Eran Leshem (@eranl)
139139

140140
* Contributed #227: Add `jackson-module-android-record
141+
(2.16.0)
142+
143+
Sammy Chu (@sammyhk)
141144

145+
* Reported#231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
146+
to `jakarta.activation;resolution:=optional` in `jakarta-xmlbind/pom.xml`
147+
(2.16.1)

release-notes/VERSION-2.x

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ Active maintainers:
2323
=== Releases ===
2424
------------------------------------------------------------------------
2525

26+
2.16.1 (not yet released)
27+
28+
#231: (jakarta-xmlbind) Missed change of `javax.activation;resolution:=optional`
29+
to `jakarta.activation;resolution:=optional` in `jakarta-xmlbind/pom.xml`
30+
(reported by Sammy C)
31+
2632
2.16.0 (15-Nov-2023)
2733

2834
#181: (blackbird) BlackBird proxy object error in Java 17

0 commit comments

Comments
 (0)