[
https://issues.apache.org/jira/browse/JCR-4892?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17987160#comment-17987160
]
Julian Reschke edited comment on JCR-4892 at 7/1/25 2:17 PM:
-------------------------------------------------------------
ok, so I tried to deploy the new bundles in jackrabbit-is-osgi and that fails.
Maybe because of missing OSGi metadata?
{code:xml}
diff --git a/jackrabbit-it-osgi/pom.xml b/jackrabbit-it-osgi/pom.xml
index db8ff449d..1a93eff4d 100644
--- a/jackrabbit-it-osgi/pom.xml
+++ b/jackrabbit-it-osgi/pom.xml
@@ -88,12 +88,24 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav-jakarta</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
diff --git a/jackrabbit-it-osgi/test-bundles.xml
b/jackrabbit-it-osgi/test-bundles.xml
index 26f981483..41d8448d6 100644
--- a/jackrabbit-it-osgi/test-bundles.xml
+++ b/jackrabbit-it-osgi/test-bundles.xml
@@ -30,6 +30,7 @@
<includes>
<include>javax.jcr:jcr</include>
<include>javax.servlet:javax.servlet-api</include>
+ <include>jakarta.servlet:javkarta.servlet-api</include>
<include>commons-io:commons-io</include>
<include>org.apache.commons:commons-collections4</include>
<include>commons-fileupload:commons-fileupload</include>
@@ -39,8 +40,8 @@
<include>org.apache.tika:tika-core</include>
<include>org.apache.httpcomponents:httpclient-osgi</include>
<include>org.apache.httpcomponents:httpcore-osgi</include>
- <include>org.apache.jackrabbit:jackrabbit-webdav</include>
- <include>org.apache.jackrabbit:jackrabbit-jcr-server</include>
+ <include>org.apache.jackrabbit:jackrabbit-webdav-jakarta</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-server-jakarta</include>
</includes>
</dependencySet>
</dependencySets>
{code}
was (Author: reschke):
ok, so I tried to deploy the new bundles in jackrabbit-is-osgi and that fails.
Maybe because of mssing OSGi metadata?
{code:xml}
diff --git a/jackrabbit-it-osgi/pom.xml b/jackrabbit-it-osgi/pom.xml
index db8ff449d..1a93eff4d 100644
--- a/jackrabbit-it-osgi/pom.xml
+++ b/jackrabbit-it-osgi/pom.xml
@@ -88,12 +88,24 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav-jakarta</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
diff --git a/jackrabbit-it-osgi/test-bundles.xml
b/jackrabbit-it-osgi/test-bundles.xml
index 26f981483..41d8448d6 100644
--- a/jackrabbit-it-osgi/test-bundles.xml
+++ b/jackrabbit-it-osgi/test-bundles.xml
@@ -30,6 +30,7 @@
<includes>
<include>javax.jcr:jcr</include>
<include>javax.servlet:javax.servlet-api</include>
+ <include>jakarta.servlet:javkarta.servlet-api</include>
<include>commons-io:commons-io</include>
<include>org.apache.commons:commons-collections4</include>
<include>commons-fileupload:commons-fileupload</include>
@@ -39,8 +40,8 @@
<include>org.apache.tika:tika-core</include>
<include>org.apache.httpcomponents:httpclient-osgi</include>
<include>org.apache.httpcomponents:httpcore-osgi</include>
- <include>org.apache.jackrabbit:jackrabbit-webdav</include>
- <include>org.apache.jackrabbit:jackrabbit-jcr-server</include>
+ <include>org.apache.jackrabbit:jackrabbit-webdav-jakarta</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-server-jakarta</include>
</includes>
</dependencySet>
</dependencySets>
{code}
> support the jakarta.servlet package name
> ----------------------------------------
>
> Key: JCR-4892
> URL: https://issues.apache.org/jira/browse/JCR-4892
> Project: Jackrabbit Content Repository
> Issue Type: New Feature
> Reporter: Julian Reschke
> Priority: Major
> Fix For: 2.24
>
> Attachments: JCR-4892_v2_project_root.patch,
> JCR-4892_v2_workspace_root.patch, JCR-4892_v3.patch, JCR-4892_v4.patch, clean
> install-Output.txt, jackrabbit-webdav-jakarta.patch, patch.txt, webapp.patch,
> webapp2.patch
>
>
> ...without breaking existing uses for now.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
