Index: jackrabbit-jcr-server/pom.xml
===================================================================
--- jackrabbit-jcr-server/pom.xml	(revision 1907912)
+++ jackrabbit-jcr-server/pom.xml	(working copy)
@@ -25,9 +25,9 @@
   <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-parent</artifactId>
+    <artifactId>jackrabbit-jcr-server-project</artifactId>
     <version>2.21.16-SNAPSHOT</version>
-    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+    <relativePath>../jackrabbit-jcr-server-project</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-server</artifactId>
   <name>Jackrabbit JCR Server</name>
@@ -190,108 +190,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-spi-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webdav</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-
-    <!-- OSGi support -->
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>5.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr.annotations</artifactId>
-      <version>1.12.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.annotation</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
Index: jackrabbit-jcr-server-jakarta/pom.xml
===================================================================
--- jackrabbit-jcr-server-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-jcr-server-jakarta/pom.xml	(working copy)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-jcr-server-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-jcr-server</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-jcr-server</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-webdav-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-server-jakarta
===================================================================
--- jackrabbit-jcr-server-jakarta	(nonexistent)
+++ jackrabbit-jcr-server-jakarta	(working copy)

Property changes on: jackrabbit-jcr-server-jakarta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-jcr-server-jakarta/pom.xml
===================================================================
--- jackrabbit-jcr-server-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-jcr-server-jakarta/pom.xml	(working copy)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-jcr-server-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-jcr-server</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-jcr-server</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-webdav-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-server-project/pom.xml
===================================================================
--- jackrabbit-jcr-server-project/pom.xml	(nonexistent)
+++ jackrabbit-jcr-server-project/pom.xml	(working copy)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-jcr-server-project</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>../jackrabbit-jcr-server</module>
+    <module>../jackrabbit-jcr-server-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-spi-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <!-- OSGi support -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr.annotations</artifactId>
+      <version>1.12.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-tests</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-server-project
===================================================================
--- jackrabbit-jcr-server-project	(nonexistent)
+++ jackrabbit-jcr-server-project	(working copy)

Property changes on: jackrabbit-jcr-server-project
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-jcr-server-project/pom.xml
===================================================================
--- jackrabbit-jcr-server-project/pom.xml	(nonexistent)
+++ jackrabbit-jcr-server-project/pom.xml	(working copy)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-jcr-server-project</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>../jackrabbit-jcr-server</module>
+    <module>../jackrabbit-jcr-server-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-spi-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <!-- OSGi support -->
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr.annotations</artifactId>
+      <version>1.12.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-tests</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-servlet/pom.xml
===================================================================
--- jackrabbit-jcr-servlet/pom.xml	(revision 1907912)
+++ jackrabbit-jcr-servlet/pom.xml	(working copy)
@@ -21,9 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-parent</artifactId>
+    <artifactId>jackrabbit-jcr-servlet-project</artifactId>
     <version>2.21.16-SNAPSHOT</version>
-    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+    <relativePath>../jackrabbit-jcr-servlet-project</relativePath>
   </parent>
 
   <artifactId>jackrabbit-jcr-servlet</artifactId>
@@ -36,31 +36,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 
 </project>
Index: jackrabbit-jcr-servlet-jakarta/pom.xml
===================================================================
--- jackrabbit-jcr-servlet-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-jcr-servlet-jakarta/pom.xml	(working copy)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-jcr-servlet-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-jcr-servlet-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-jcr-servlet</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-jcr-servlet</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-servlet-jakarta
===================================================================
--- jackrabbit-jcr-servlet-jakarta	(nonexistent)
+++ jackrabbit-jcr-servlet-jakarta	(working copy)

Property changes on: jackrabbit-jcr-servlet-jakarta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-jcr-servlet-jakarta/pom.xml
===================================================================
--- jackrabbit-jcr-servlet-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-jcr-servlet-jakarta/pom.xml	(working copy)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-jcr-servlet-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-jcr-servlet-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-jcr-servlet</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-jcr-servlet</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-servlet-project/pom.xml
===================================================================
--- jackrabbit-jcr-servlet-project/pom.xml	(nonexistent)
+++ jackrabbit-jcr-servlet-project/pom.xml	(working copy)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-jcr-servlet-project</artifactId>
+  <packaging>pom</packaging>
+  <name>Jackrabbit WebDAV Project</name>
+  <modules>
+    <module>../jackrabbit-jcr-servlet</module>
+    <module>../jackrabbit-jcr-servlet-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-jcr-servlet-project
===================================================================
--- jackrabbit-jcr-servlet-project	(nonexistent)
+++ jackrabbit-jcr-servlet-project	(working copy)

Property changes on: jackrabbit-jcr-servlet-project
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-jcr-servlet-project/pom.xml
===================================================================
--- jackrabbit-jcr-servlet-project/pom.xml	(nonexistent)
+++ jackrabbit-jcr-servlet-project/pom.xml	(working copy)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-jcr-servlet-project</artifactId>
+  <packaging>pom</packaging>
+  <name>Jackrabbit WebDAV Project</name>
+  <modules>
+    <module>../jackrabbit-jcr-servlet</module>
+    <module>../jackrabbit-jcr-servlet-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webapp/pom.xml
===================================================================
--- jackrabbit-webapp/pom.xml	(revision 1908148)
+++ jackrabbit-webapp/pom.xml	(working copy)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -16,49 +15,24 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <!-- ====================================================================== -->
   <!-- P R O J E C T  D E S C R I P T I O N                                   -->
   <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-parent</artifactId>
+    <artifactId>jackrabbit-webapp-project</artifactId>
     <version>2.21.16-SNAPSHOT</version>
-    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+    <relativePath>../jackrabbit-webapp-project</relativePath>
   </parent>
   <artifactId>jackrabbit-webapp</artifactId>
   <packaging>war</packaging>
   <name>Jackrabbit Web Application</name>
   <description>Web application that hosts and serves a Jackrabbit content repository</description>
-
-  <properties>
-    <tomcat.version>8.5.86</tomcat.version>
-  </properties>
-
   <dependencies>
     <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-parsers-standard-package</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-server</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -68,32 +42,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>${tomcat.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
       <version>${tomcat.version}</version>
       <scope>test</scope>
@@ -111,35 +60,20 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-      <version>2.70.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
+     <groupId>org.apache.tika</groupId>
+     <artifactId>tika-parsers-standard-package</artifactId>
+     <exclusions>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcmail-jdk15on</artifactId>
+      </exclusion>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcprov-jdk15on</artifactId>
+      </exclusion>
+     </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>31.1-jre</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -191,21 +125,5 @@
         </configuration>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <configuration>
-            <systemProperties>
-              <property>
-                <name>derby.stream.error.file</name>
-                <value>target/derby.log</value>
-              </property>
-            </systemProperties>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
-
 </project>
Index: jackrabbit-webapp-jakarta/pom.xml
===================================================================
--- jackrabbit-webapp-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/pom.xml	(working copy)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-webapp-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-webapp-jakarta</artifactId>
+  <packaging>war</packaging>
+  <properties>
+    <tomcat.version>10.1.6</tomcat.version>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-war</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-webapp</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-webapp</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-servlet-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-jasper</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper-el</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jsp-api</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.apache.tika</groupId>
+     <artifactId>tika-parsers-standard-package</artifactId>
+     <exclusions>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcmail-jdk15on</artifactId>
+      </exclusion>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcprov-jdk15on</artifactId>
+      </exclusion>
+     </exclusions>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml
===================================================================
--- jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(working copy)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>
Index: jackrabbit-webapp-jakarta
===================================================================
--- jackrabbit-webapp-jakarta	(nonexistent)
+++ jackrabbit-webapp-jakarta	(working copy)

Property changes on: jackrabbit-webapp-jakarta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml
===================================================================
--- jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(working copy)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml
===================================================================
--- jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(working copy)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
===================================================================
--- jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java	(working copy)
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.j2ee;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
+
+import junit.framework.TestCase;
+
+public class TomcatIT extends TestCase {
+
+    static {
+        SLF4JBridgeHandler.install();
+    }
+
+    private URL url;
+
+    private Tomcat tomcat;
+
+    private WebClient client;
+
+    protected void setUp() throws Exception {
+        File war = null;
+        for (File f : new File("target").listFiles()) {
+            if (f.isFile() && f.getName().endsWith("war")) {
+                war = extractWarFile(f);
+                break;
+            }
+        }
+        assertNotNull(war);
+        rewriteWebXml(war);
+
+        File bootstrap = new File("target", "bootstrap.properties");
+        bootstrap.delete();
+
+        File baseDir = new File("target", "tomcat");
+        FileUtils.deleteQuietly(baseDir);
+
+        File repoDir = new File("target", "repository");
+        FileUtils.deleteQuietly(repoDir);
+
+        url = new URL("http://localhost:12856/");
+
+        tomcat = new Tomcat();
+        tomcat.setSilent(true);
+        tomcat.setBaseDir(baseDir.getPath());
+        tomcat.setHostname(url.getHost());
+        tomcat.setPort(url.getPort());
+        tomcat.getConnector();
+        tomcat.addWebapp("", war.getAbsolutePath());
+
+        tomcat.start();
+
+        client = new WebClient();
+    }
+
+    private File extractWarFile(File warFile) throws IOException{
+        String fileBaseName = FilenameUtils.getBaseName(warFile.getName());
+        Path destFolderPath = Paths.get(warFile.getParent(), fileBaseName);
+        if (!java.nio.file.Files.exists(destFolderPath)) {
+	        try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
+	            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+	            while (entries.hasMoreElements()) {
+	                ZipEntry entry = entries.nextElement();
+	                Path entryPath = destFolderPath.resolve(entry.getName());
+	                if (entryPath.normalize().startsWith(destFolderPath.normalize())){
+	                    if (entry.isDirectory()) {
+	                        java.nio.file.Files.createDirectories(entryPath);
+	                    } else {
+	                        java.nio.file.Files.createDirectories(entryPath.getParent());
+	                        try (InputStream in = zipFile.getInputStream(entry)){
+	                        	try (OutputStream out = new FileOutputStream(entryPath.toFile())){
+	                        		IOUtils.copy(in, out);                          
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+	        }
+        }
+        return destFolderPath.toFile();
+    }
+    
+    protected void mkdirs(File dir, String errorMessageFormat) {
+    	if (dir.exists() && dir.isDirectory()) {
+    		return;
+        }
+        dir.mkdirs();
+        if (!dir.exists()) {
+        	throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
+        }
+    }
+    
+	public void testTomcat() throws Exception {
+        HtmlPage page = client.getPage(url);
+        assertEquals("Content Repository Setup", page.getTitleText());
+
+        page = submitNewRepositoryForm(page);
+        assertEquals("Content Repository Ready", page.getTitleText());
+
+        page = page.getAnchorByText("home").click();
+        assertEquals("Apache Jackrabbit JCR Server", page.getTitleText());
+    }
+
+    private HtmlPage submitNewRepositoryForm(HtmlPage page) throws IOException {
+        for (HtmlForm form : page.getForms()) {
+            for (HtmlInput mode : form.getInputsByName("mode")) {
+                if ("new".equals(mode.getValueAttribute())) {
+                    for (HtmlInput home : form.getInputsByName("repository_home")) {
+                        home.setValueAttribute("target/repository");
+                        for (HtmlElement submit : form.getElementsByAttribute("input", "type", "submit")) {
+                            return submit.click();
+                        }
+                    }
+                }
+            }
+        }
+        fail();
+        return null;
+    }
+
+    private void rewriteWebXml(File war) throws IOException {
+        File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+        assertTrue(webXml.exists());
+        List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+        BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+        try {
+            for (String line : lines) {
+                line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+                        "<param-value>target/bootstrap.properties</param-value>");
+                writer.write(line);
+                writer.write(System.lineSeparator());
+            }
+        } finally {
+            writer.close();
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        client.close();
+
+        tomcat.stop();
+    }
+
+}
Index: jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml
===================================================================
--- jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(working copy)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>
Index: jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml
===================================================================
--- jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/src/test/resources/logback-test.xml	(working copy)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>
Index: jackrabbit-webapp-jakarta/pom.xml
===================================================================
--- jackrabbit-webapp-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-webapp-jakarta/pom.xml	(working copy)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-webapp-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-webapp-jakarta</artifactId>
+  <packaging>war</packaging>
+  <properties>
+    <tomcat.version>10.1.6</tomcat.version>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-war</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-webapp</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-webapp</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-server-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-servlet-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-jasper</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper-el</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jsp-api</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.apache.tika</groupId>
+     <artifactId>tika-parsers-standard-package</artifactId>
+     <exclusions>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcmail-jdk15on</artifactId>
+      </exclusion>
+      <exclusion>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcprov-jdk15on</artifactId>
+      </exclusion>
+     </exclusions>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webapp-project/pom.xml
===================================================================
--- jackrabbit-webapp-project/pom.xml	(nonexistent)
+++ jackrabbit-webapp-project/pom.xml	(working copy)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-webapp-project</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>../jackrabbit-webapp</module>
+    <module>../jackrabbit-webapp-jakarta</module>
+  </modules>
+  <properties>
+    <tomcat.version>8.5.86</tomcat.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers-standard-package</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-servlet-api</artifactId>
+      <version>${tomcat.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.htmlunit</groupId>
+      <artifactId>htmlunit</artifactId>
+      <version>2.67.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>31.1-jre</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <configuration>
+            <systemProperties>
+              <property>
+                <name>derby.stream.error.file</name>
+                <value>target/derby.log</value>
+              </property>
+            </systemProperties>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
\ No newline at end of file
Index: jackrabbit-webapp-project
===================================================================
--- jackrabbit-webapp-project	(nonexistent)
+++ jackrabbit-webapp-project	(working copy)

Property changes on: jackrabbit-webapp-project
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-webapp-project/pom.xml
===================================================================
--- jackrabbit-webapp-project/pom.xml	(nonexistent)
+++ jackrabbit-webapp-project/pom.xml	(working copy)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-webapp-project</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>../jackrabbit-webapp</module>
+    <module>../jackrabbit-webapp-jakarta</module>
+  </modules>
+  <properties>
+    <tomcat.version>8.5.86</tomcat.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers-standard-package</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-servlet-api</artifactId>
+      <version>${tomcat.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.htmlunit</groupId>
+      <artifactId>htmlunit</artifactId>
+      <version>2.67.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>31.1-jre</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <configuration>
+            <systemProperties>
+              <property>
+                <name>derby.stream.error.file</name>
+                <value>target/derby.log</value>
+              </property>
+            </systemProperties>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
\ No newline at end of file
Index: jackrabbit-webdav/pom.xml
===================================================================
--- jackrabbit-webdav/pom.xml	(revision 1907912)
+++ jackrabbit-webdav/pom.xml	(working copy)
@@ -25,9 +25,9 @@
 <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-parent</artifactId>
+    <artifactId>jackrabbit-webdav-project</artifactId>
     <version>2.21.16-SNAPSHOT</version>
-    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+    <relativePath>../jackrabbit-webdav-project</relativePath>
   </parent>
   <artifactId>jackrabbit-webdav</artifactId>
   <packaging>bundle</packaging>
@@ -56,43 +56,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.annotation</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.16</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
Index: jackrabbit-webdav-jakarta/pom.xml
===================================================================
--- jackrabbit-webdav-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-webdav-jakarta/pom.xml	(working copy)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-webdav-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-webdav-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-webdav</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-webdav</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webdav-jakarta
===================================================================
--- jackrabbit-webdav-jakarta	(nonexistent)
+++ jackrabbit-webdav-jakarta	(working copy)

Property changes on: jackrabbit-webdav-jakarta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-webdav-jakarta/pom.xml
===================================================================
--- jackrabbit-webdav-jakarta/pom.xml	(nonexistent)
+++ jackrabbit-webdav-jakarta/pom.xml	(working copy)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-webdav-project</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackrabbit-webdav-jakarta</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-webdav</artifactId>
+                <version>${project.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.transformer</groupId>
+            <artifactId>transformer-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <rules>
+                <jakartaDefaults>true</jakartaDefaults>
+              </rules>
+            </configuration>
+            <executions>
+              <execution>
+                <id>source-jar</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <artifact>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-webdav</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                  </artifact>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webdav-project/pom.xml
===================================================================
--- jackrabbit-webdav-project/pom.xml	(nonexistent)
+++ jackrabbit-webdav-project/pom.xml	(working copy)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-webdav-project</artifactId>
+  <packaging>pom</packaging>
+  <name>Jackrabbit JCR Servlet Project</name>
+  <modules>
+    <module>../jackrabbit-webdav</module>
+    <module>../jackrabbit-webdav-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: jackrabbit-webdav-project
===================================================================
--- jackrabbit-webdav-project	(nonexistent)
+++ jackrabbit-webdav-project	(working copy)

Property changes on: jackrabbit-webdav-project
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+.*
+target
+*.iml
+*.ipr
+*.iws
Index: jackrabbit-webdav-project/pom.xml
===================================================================
--- jackrabbit-webdav-project/pom.xml	(nonexistent)
+++ jackrabbit-webdav-project/pom.xml	(working copy)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>jackrabbit-parent</artifactId>
+    <version>2.21.16-SNAPSHOT</version>
+    <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>jackrabbit-webdav-project</artifactId>
+  <packaging>pom</packaging>
+  <name>Jackrabbit JCR Servlet Project</name>
+  <modules>
+    <module>../jackrabbit-webdav</module>
+    <module>../jackrabbit-webdav-jakarta</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.16</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
Index: pom.xml
===================================================================
--- pom.xml	(revision 1907912)
+++ pom.xml	(working copy)
@@ -43,11 +43,11 @@
     <module>jackrabbit-aws-ext</module>
     <module>jackrabbit-vfs-ext</module>
     <module>jackrabbit-core</module>
-    <module>jackrabbit-webdav</module>
-    <module>jackrabbit-jcr-server</module>
+    <module>jackrabbit-webdav-project</module>
+    <module>jackrabbit-jcr-server-project</module>
     <module>jackrabbit-jcr-rmi</module>
-    <module>jackrabbit-jcr-servlet</module>
-    <module>jackrabbit-webapp</module>
+    <module>jackrabbit-jcr-servlet-project</module>
+    <module>jackrabbit-webapp-project</module>
     <module>jackrabbit-jca</module>
     <module>jackrabbit-spi</module>
     <module>jackrabbit-spi-commons</module>