From 97dff79499a78e0e46514daf7736b4ae4fb32223 Mon Sep 17 00:00:00 2001
From: Brendan Hofmann <brendan.hofmann@octoconsulting.com>
Date: Mon, 22 Dec 2025 12:12:28 -0700
Subject: [PATCH 1/3] upgrade jsr-339 to jakarta

---
 features/admin/src/main/feature/feature.xml        | 2 --
 features/solr/src/main/feature/feature.xml         | 1 -
 platform/landing-page/pom.xml                      | 5 ++---
 platform/mime/core/platform-mime-core-impl/pom.xml | 7 +++----
 pom.xml                                            | 1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/features/admin/src/main/feature/feature.xml b/features/admin/src/main/feature/feature.xml
index d335a144abef..18c1925cfe5e 100644
--- a/features/admin/src/main/feature/feature.xml
+++ b/features/admin/src/main/feature/feature.xml
@@ -56,8 +56,6 @@
 
     <feature name="platform-configuration" version="${project.version}"
              description="Shared platform configuration">
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0
-        </bundle>
         <feature>camel-blueprint</feature>
         <feature>camel-http</feature>
         <feature>cxf-jaxrs</feature>
diff --git a/features/solr/src/main/feature/feature.xml b/features/solr/src/main/feature/feature.xml
index 24177c3e5128..fa9523df17dc 100644
--- a/features/solr/src/main/feature/feature.xml
+++ b/features/solr/src/main/feature/feature.xml
@@ -33,7 +33,6 @@
         <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${solr.httpcore.version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${solr.httpclient.version}</bundle>
         <bundle>mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0</bundle>
         <bundle>mvn:ddf.platform.solr/solr-dependencies/${project.version}</bundle>
     </feature>
 
diff --git a/platform/landing-page/pom.xml b/platform/landing-page/pom.xml
index e525265abf5f..6b3334fdf7d7 100644
--- a/platform/landing-page/pom.xml
+++ b/platform/landing-page/pom.xml
@@ -46,9 +46,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
-            <version>${jsr339-api.bundle.version}</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/platform/mime/core/platform-mime-core-impl/pom.xml b/platform/mime/core/platform-mime-core-impl/pom.xml
index ed1e266df62b..aaa8796a12f9 100644
--- a/platform/mime/core/platform-mime-core-impl/pom.xml
+++ b/platform/mime/core/platform-mime-core-impl/pom.xml
@@ -64,10 +64,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
-            <version>${jsr339-api.bundle.version}</version>
-            <scope>test</scope>
+            <groupId>jakarta.ws.rs</groupId>
+	    <artifactId>jakarta.ws.rs-api</artifactId>
+	    <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ddf.mime.tika</groupId>
diff --git a/pom.xml b/pom.xml
index 4ab87b9b7589..c7bb72ed5e7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,6 @@
         <jsoup.version>1.18.3</jsoup.version>
         <jsr305.version>3.0.2</jsr305.version>
         <jsr305.bundle.version>${jsr305.version}_1</jsr305.bundle.version>
-        <jsr339-api.bundle.version>2.6.0</jsr339-api.bundle.version>
         <jts.version>1.20.0</jts.version>
         <jts.spatial4j.version>1.17.1</jts.spatial4j.version>
         <jvnet-ogc.version>2.6.1</jvnet-ogc.version>

From 2e0902518aa894631441c7e6110d7b730fb624d5 Mon Sep 17 00:00:00 2001
From: Brendan Hofmann <brendan.hofmann@octoconsulting.com>
Date: Mon, 22 Dec 2025 14:56:29 -0700
Subject: [PATCH 2/3] revert solr download

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c7bb72ed5e7b..ec62a3799ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,7 +344,7 @@
         <org.json.version>20240303</org.json.version>
 
         <!--temporary solr download url> -->
-        <solr.download.url>https://dlcdn.apache.org</solr.download.url>
+        <solr.download.url>https://archive.apache.org/dist</solr.download.url>
 
         <!-- SonarQube Properties -->
         <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/${project.report.output.directory}/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>

From b0cc6801d4f8970410a9ff872b296f74a39a40f7 Mon Sep 17 00:00:00 2001
From: Jay McNallie <jay.mcnallie@decisivellc.us>
Date: Tue, 23 Dec 2025 11:22:10 -0700
Subject: [PATCH 3/3] free up disk space before runners build

---
 .github/workflows/ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d7aa215dc2e..203d2810dfee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -72,6 +79,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4