Skip to content

upgrade jsr-339 to jakarta #6948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brendan-hofmann wants to merge 2 commits into
base: 2.29.x
Choose a base branch
from
+6 −12
Open

upgrade jsr-339 to jakarta #6948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97dff79
upgrade jsr-339 to jakarta
brendan-hofmann Dec 22, 2025
2e09025
revert solr download
brendan-hofmann Dec 22, 2025
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
2 changes: 0 additions & 2 deletions features/admin/src/main/feature/feature.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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