Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions features/admin/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion features/solr/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions platform/landing-page/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 3 additions & 4 deletions platform/mime/core/platform-mime-core-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -345,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>
Expand Down
Loading