From 676d998e01073e1eb350733f58d6fdd87e786011 Mon Sep 17 00:00:00 2001
From: Alexa Bird <alexa.bird@octo.us>
Date: Sun, 2 Nov 2025 15:23:30 -0700
Subject: [PATCH 1/2] Upgrade xmlbeans to match expected version by poi-ooxml

---
 catalog/transformer/catalog-transformer-xlsx/pom.xml | 8 ++++----
 features/utilities/src/main/feature/feature.xml      | 2 +-
 pom.xml                                              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/catalog/transformer/catalog-transformer-xlsx/pom.xml b/catalog/transformer/catalog-transformer-xlsx/pom.xml
index 2f536ee8af6c..103408ea3813 100644
--- a/catalog/transformer/catalog-transformer-xlsx/pom.xml
+++ b/catalog/transformer/catalog-transformer-xlsx/pom.xml
@@ -27,17 +27,17 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>${xlsx.transformer.poi.version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>${xlsx.transformer.poi.version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-full</artifactId>
-            <version>${xlsx.transformer.poi.version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
-            <version>${xlsx.transformer.poi.version}</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>ddf.catalog.core</groupId>
diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
index c9476917b61e..38eb96ccbe13 100644
--- a/features/utilities/src/main/feature/feature.xml
+++ b/features/utilities/src/main/feature/feature.xml
@@ -213,7 +213,7 @@
         <feature dependency="true">tika</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.9.1-6_1</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}_1</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${servicemix.bundles.xmlbeans.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-math3/${commons-math3.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
diff --git a/pom.xml b/pom.xml
index ec62a3799ce0..d21ac481af35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
         <pac4j.version>6.1.2</pac4j.version>
         <pdfbox.version>3.0.5</pdfbox.version>
         <poi.version>5.4.1</poi.version>
-        <xlsx.transformer.poi.version>5.2.2</xlsx.transformer.poi.version>
+        <xmlbeans.version>5.3.0</xmlbeans.version>
         <protobuf.version>4.28.2</protobuf.version>
         <quartz.version>2.3.2</quartz.version>
         <require-css.version>0.1.10</require-css.version>
@@ -289,6 +289,7 @@
         <hazelcast.version>5.3.5</hazelcast.version>
         <saxon.version>9.6.0-4</saxon.version>
         <servicemix.bundles.poi.version>${poi.version}_1</servicemix.bundles.poi.version>
+        <servicemix.bundles.xmlbeans.version>${xmlbeans.version}_1</servicemix.bundles.xmlbeans.version>
         <servicemix.bundles.jaxb.version>${jaxb.version}_3</servicemix.bundles.jaxb.version>
         <servicemix-depends.version>1.4.0</servicemix-depends.version>
         <servicemix.specs.jaxb.version>2.9.0</servicemix.specs.jaxb.version>
@@ -322,7 +323,6 @@
         <xerces.version>2.12.2</xerces.version>
         <xerces.bundle.version>2.12.2_1</xerces.bundle.version>
         <xml-apis.version>1.4.01</xml-apis.version>
-        <xmlbeans.version>5.0.3</xmlbeans.version>
         <xmlsec.version>2.3.1</xmlsec.version>
         <xpp3.bundle.version>1.1.4c_6</xpp3.bundle.version>
         <xstream.bundle.version>1.4.20_1</xstream.bundle.version>

From 764db4ebcdd80868e25670b429df63739f01cbdd Mon Sep 17 00:00:00 2001
From: Alexa Bird <alexa.bird@octo.us>
Date: Mon, 10 Nov 2025 15:37:12 -0700
Subject: [PATCH 2/2] Updates

---
 features/utilities/src/main/feature/feature.xml | 3 ++-
 pom.xml                                         | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
index 38eb96ccbe13..087a39aa6c07 100644
--- a/features/utilities/src/main/feature/feature.xml
+++ b/features/utilities/src/main/feature/feature.xml
@@ -213,7 +213,6 @@
         <feature dependency="true">tika</feature>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.9.1-6_1</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${servicemix.bundles.xmlbeans.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-math3/${commons-math3.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
@@ -221,6 +220,7 @@
         <bundle>wrap:mvn:xml-apis/xml-apis-ext/1.3.04</bundle>
         <bundle>mvn:org.apache.santuario/xmlsec/${xmlsec.version}</bundle>
         <bundle>wrap:mvn:org.apache.xmlgraphics/xmlgraphics-commons/2.7</bundle>
+        <bundle>wrap:mvn:org.apache.xmlbeans/xmlbeans/${xmlbeans.version}</bundle>
         <bundle>mvn:org.apache.pdfbox/pdfbox/${pdfbox.version}</bundle>
         <bundle>mvn:org.apache.pdfbox/fontbox/${pdfbox.version}</bundle>
         <bundle>mvn:org.apache.pdfbox/pdfbox-io/${pdfbox.version}</bundle>
@@ -228,6 +228,7 @@
         <bundle>wrap:mvn:de.rototor.pdfbox/graphics2d/0.38</bundle>
         <bundle>wrap:mvn:org.apache.poi/poi/${poi.version}</bundle>
         <bundle>wrap:mvn:org.apache.poi/poi-ooxml/${poi.version}</bundle>
+        <bundle>wrap:mvn:org.apache.poi/poi-ooxml-full/${poi.version}</bundle>
         <bundle>wrap:mvn:org.apache.poi/poi-scratchpad/${poi.version}</bundle>
     </feature>
 
diff --git a/pom.xml b/pom.xml
index d21ac481af35..18da453c9b61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,8 +288,6 @@
         <sardine.version>5.7</sardine.version>
         <hazelcast.version>5.3.5</hazelcast.version>
         <saxon.version>9.6.0-4</saxon.version>
-        <servicemix.bundles.poi.version>${poi.version}_1</servicemix.bundles.poi.version>
-        <servicemix.bundles.xmlbeans.version>${xmlbeans.version}_1</servicemix.bundles.xmlbeans.version>
         <servicemix.bundles.jaxb.version>${jaxb.version}_3</servicemix.bundles.jaxb.version>
         <servicemix-depends.version>1.4.0</servicemix-depends.version>
         <servicemix.specs.jaxb.version>2.9.0</servicemix.specs.jaxb.version>