(camel-karaf) branch main updated: Ref #619: Add missing TW2 dependency to jakarta jaxb runtime (#618)

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new a30125b78 Ref #619: Add missing TW2 dependency to jakarta jaxb runtime (#618)
a30125b78 is described below

commit a30125b78d9db7e865acd7172f67c32972b2603e
Author: aenevala <ae...@gmail.com>
AuthorDate: Fri Apr 25 13:16:08 2025 +0300

    Ref #619: Add missing TW2 dependency to jakarta jaxb runtime (#618)
---
 features/src/main/feature/camel-features.xml | 7 ++++---
 pom.xml                                      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 1c9b9d964..caf4a0a05 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -61,15 +61,15 @@
     <feature name="jaxb-runtime" version="${jaxb3-core-version}">
         <feature version="[3,4)">jakarta-xml-bind</feature>
         <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/${jaxb3-core-version}</bundle>
-        <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/${jaxb3-impl-version}</bundle>
-        <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-osgi/${jaxb3-osgi-version}</bundle>
     </feature>
 
     <feature name="jaxb-runtime" version="${jaxb-core-version}">
+        <feature prerequisite="true">wrap</feature>
         <feature version="[4,5)">jakarta-xml-bind</feature>
         <bundle dependency="true">mvn:com.sun.istack/istack-commons-runtime/${auto-detect-version}</bundle>
         <bundle dependency="true">mvn:org.glassfish.jaxb/jaxb-core/${glassfish-jaxb-runtime-version}</bundle>
-        <bundle dependency='true'>mvn:org.glassfish.jaxb/jaxb-runtime/${glassfish-jaxb-runtime-version}</bundle>
+        <bundle dependency="true">mvn:org.glassfish.jaxb/jaxb-runtime/${glassfish-jaxb-runtime-version}</bundle>
+        <bundle dependency="true">wrap:mvn:org.glassfish.jaxb/txw2/${glassfish-jaxb-runtime-version}</bundle>
         <bundle>mvn:org.glassfish.hk2/osgi-resource-locator/${osgi-resource-locator-version}</bundle>
     </feature>
 
@@ -2331,6 +2331,7 @@
         <feature version='${camel-osgi-version-range}'>camel-core</feature>
         <feature version='${camel-osgi-jackson2-version}'>jackson</feature>
         <feature version='[3,4)'>jakarta-validation</feature>
+        <feature version='[3,4)'>jaxb-runtime</feature>
         <bundle dependency='true'>wrap:mvn:org.apache.camel/camel-tooling-util/${camel-version}$Export-Package=org.apache.camel*;version=${camel-version}</bundle>
         <bundle dependency='true'>wrap:mvn:org.apache.camel/camel-xml-io/${camel-version}$Export-Package=org.apache.camel*;version=${camel-version}</bundle>
         <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 67c0456f7..e17feaea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,7 +528,7 @@
         <camel-osgi-jakarta-annotation-version>[3,4)</camel-osgi-jakarta-annotation-version>
         <camel-osgi-jakarta-activation-version>[2.1,3)</camel-osgi-jakarta-activation-version>
         <camel-osgi-jakarta-activation-runtime-version>[2,3)</camel-osgi-jakarta-activation-runtime-version>
-        <camel-osgi-jakarta-bind-version>[3,5)</camel-osgi-jakarta-bind-version>
+        <camel-osgi-jakarta-bind-version>[4,5)</camel-osgi-jakarta-bind-version>
         <camel-osgi-jakarta-jws-version>[3,4)</camel-osgi-jakarta-jws-version>
         <camel-osgi-jakarta-servlet-version>[5,7)</camel-osgi-jakarta-servlet-version>
         <camel-osgi-jakarta-soap-version>[3,4)</camel-osgi-jakarta-soap-version>