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 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 @@ - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0 - camel-blueprint camel-http cxf-jaxrs 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 @@ mvn:org.apache.httpcomponents/httpcore-osgi/${solr.httpcore.version} mvn:org.apache.httpcomponents/httpclient-osgi/${solr.httpclient.version} mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0 mvn:ddf.platform.solr/solr-dependencies/${project.version} 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 @@ slf4j-api - org.apache.servicemix.specs - org.apache.servicemix.specs.jsr339-api-2.0 - ${jsr339-api.bundle.version} + jakarta.ws.rs + jakarta.ws.rs-api org.apache.commons 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 @@ test - org.apache.servicemix.specs - org.apache.servicemix.specs.jsr339-api-2.0 - ${jsr339-api.bundle.version} - test + jakarta.ws.rs + jakarta.ws.rs-api + test ddf.mime.tika diff --git a/pom.xml b/pom.xml index 4ab87b9b7589..ec62a3799ce0 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,6 @@ 1.18.3 3.0.2 ${jsr305.version}_1 - 2.6.0 1.20.0 1.17.1 2.6.1 @@ -345,7 +344,7 @@ 20240303 - https://dlcdn.apache.org + https://archive.apache.org/dist ${project.build.directory}/site/${project.report.output.directory}/jacoco/jacoco.xml