TPRUN-8232 Patch Xerces to accept JAXP 1.5 properties.

Talend · Jun 13, 2024 · 1bfc5f3 · 1bfc5f3
1 parent 65f2491
commit 1bfc5f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
@@ -75,7 +75,7 @@
         <bundle start-level="25" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard4.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
         <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
-        <!-- <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle> -->
+        <!-- <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.tesb.version}</bundle> -->
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version}</bundle>

diff --git a/pom.xml b/pom.xml
@@ -40,8 +40,8 @@
     </issueManagement>
     <properties>
         <upstream.version>3.4.10</upstream.version>
-        <apache-cxf.features.tesb.version>3.4.10.tesb7</apache-cxf.features.tesb.version>
-        <cxf-services-xkms.features.tesb.version>3.4.10.tesb1</cxf-services-xkms.features.tesb.version>
+        <apache-cxf.features.tesb.version>3.4.10.tesb8</apache-cxf.features.tesb.version>
+        <cxf-services-xkms.features.tesb.version>${apache-cxf.features.tesb.version}</cxf-services-xkms.features.tesb.version>
         <cxf-core.tesb.version>3.4.10.tesb1</cxf-core.tesb.version>
         <cxf-logging.tesb.version>3.4.10.tesb1</cxf-logging.tesb.version>
         <cxf-services-wsn-core.tesb.version>3.4.10.tesb2</cxf-services-wsn-core.tesb.version>
@@ -55,6 +55,7 @@
         <cxf.activemq.tesb.version>5.15.16</cxf.activemq.tesb.version>
         <cxf.james.mime4j.tesb.version>0.8.11</cxf.james.mime4j.tesb.version>
         <cxf.xmlsec.bundle.tesb.version>2.2.6</cxf.xmlsec.bundle.tesb.version>
+        <cxf.xerces.bundle.tesb.version>2.12.2.tesb1_1</cxf.xerces.bundle.tesb.version>
 
         <cxf.compiler.fork>false</cxf.compiler.fork>
         <cxf.build-utils.version>3.4.4</cxf.build-utils.version>
@@ -468,6 +469,7 @@
                             <cxf.activemq.tesb.version>${cxf.activemq.tesb.version}</cxf.activemq.tesb.version>
                             <cxf.james.mime4j.tesb.version>${cxf.james.mime4j.tesb.version}</cxf.james.mime4j.tesb.version>
                             <cxf.xmlsec.bundle.tesb.version>${cxf.xmlsec.bundle.tesb.version}</cxf.xmlsec.bundle.tesb.version>
+                            <cxf.xerces.bundle.tesb.version>${cxf.xerces.bundle.tesb.version}</cxf.xerces.bundle.tesb.version>
                         </properties>
                     </configuration>
                     <executions>

diff --git a/services/xkms/xkms-features/src/main/resources/features.xml b/services/xkms/xkms-features/src/main/resources/features.xml
@@ -37,7 +37,7 @@
         <feature>cxf-http</feature>
         <feature>http</feature>
         <feature>wss4j</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
+        <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.tesb.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-common/${upstream.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-x509-handlers/${upstream.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-service/${upstream.version}</bundle>