From 2775872485763b48d4d687061f250ec6e826774f Mon Sep 17 00:00:00 2001
From: Alexa Bird <alexa.bird@fed.ibm.com>
Date: Tue, 20 Oct 2026 18:19:25 -0700
Subject: [PATCH] Resolve karaf/paxweb and ddfjson-rpc version conflicts

---
 pom.xml                  | 7 ++++---
 ui-frontend/package.json | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 77d1a67561..07cf1c9751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,8 @@
 
     <!--Backend properties-->
     <ddf.version>2.29.33</ddf.version>
-    <ddf-jsonrpc.version>0.10.5</ddf-jsonrpc.version>
+    <!-- jsonrpc 0.10.5 expects ddf 2.30.x -->
+    <ddf-jsonrpc.version>0.10.4</ddf-jsonrpc.version>
     <ddf.support.version>2.3.16</ddf.support.version>
     <antlr.version>4.3</antlr.version>
     <c3p0.version>0.9.5.5</c3p0.version>
@@ -86,7 +87,7 @@
     <jsr305.version>3.0.2</jsr305.version>
     <jvnet.jaxb2.version>0.11.0</jvnet.jaxb2.version>
     <jvnet-ogc.version>2.6.1</jvnet-ogc.version>
-    <karaf.version>4.4.8</karaf.version>
+    <karaf.version>4.4.10</karaf.version>
     <nimbus.oidc.version>11.24</nimbus.oidc.version>
     <nimbus.jose.jwt.version>10.3</nimbus.jose.jwt.version>
     <org.apache.cxf.version>3.6.7</org.apache.cxf.version>
@@ -95,7 +96,7 @@
     <owasp-html-sanitizer.version>20220608.1</owasp-html-sanitizer.version>
     <ows-v_1_0_0-schema.version>1.1.0</ows-v_1_0_0-schema.version>
     <pac4j.version>6.1.2</pac4j.version>
-    <pax.web.version>8.0.33</pax.web.version>
+    <pax.web.version>8.0.34</pax.web.version>
     <jetty.version>9.4.58.v20250814</jetty.version>
     <quartz.version>2.3.2</quartz.version>
     <restassured.version>3.3.0</restassured.version>
diff --git a/ui-frontend/package.json b/ui-frontend/package.json
index ecb3d28289..8d5780e2f7 100644
--- a/ui-frontend/package.json
+++ b/ui-frontend/package.json
@@ -16,7 +16,7 @@
     "build:admin": "cd packages/admin && yarn build",
     "build:cesium": "cd packages/cesium-assets && yarn build",
     "build:logout": "cd packages/logout && yarn build",
-    "postbuild": "mkdirp target && ace gen-feature",
+    "postbuild": "mkdirp target && ace gen-feature --exclude jetty,pax-web-api,pax-web-extender-whiteboard",
     "mvn:create-archive": "mvn org.apache.maven.plugins:maven-assembly-plugin:single@create-archive",
     "mvn:install-file": "mvn org.apache.maven.plugins:maven-install-plugin:install-file -Dfile=target/packages-packages.zip -DpomFile=pom.xml -Dclassifier=packages -Dpackaging=zip",
     "postinstall": "yarn install:all && exitzero yarn audit && exitzero yarn audit:all",