diff --git a/jackrabbit-jcr-server-jakarta/pom.xml b/jackrabbit-jcr-server-jakarta/pom.xml
index a8144bdce..aab0bf791 100644
--- a/jackrabbit-jcr-server-jakarta/pom.xml
+++ b/jackrabbit-jcr-server-jakarta/pom.xml
@@ -96,6 +96,11 @@
jackrabbit-webdav-jakarta
${project.version}
+
+ org.apache.tika
+ tika-core
+ ${tika.jakarta.version}
+
jakarta.servlet
jakarta.servlet-api
diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 2233ab9ee..1101c97af 100644
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -51,7 +51,8 @@
1.22.14
9.2.30.v20200428
- 2.7.0
+ 2.9.0
+ 3.0.0-SNAPSHOT
${project.build.sourceEncoding}
1.7.36
1.7.36
diff --git a/jackrabbit-webapp-jakarta/pom.xml b/jackrabbit-webapp-jakarta/pom.xml
index 0a85da68d..ad42ab869 100644
--- a/jackrabbit-webapp-jakarta/pom.xml
+++ b/jackrabbit-webapp-jakarta/pom.xml
@@ -30,11 +30,69 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ get-webapp
+ process-resources
+
+ unpack
+
+
+ ${project.build.directory}/webapp
+
+
+ org.apache.jackrabbit
+ jackrabbit-webapp
+ ${project.version}
+ war
+
+
+ **/jackrabbit-jcr-server*, **/jackrabbit-jcr-servlet*, **/jackrabbit-webdav*, **/jaxb-runtime*, **/tika*, **/bcmail*
+
+
+
+
maven-war-plugin
-
- true
-
+
+
+
+ exploded
+
+
+
+ default-war
+
+ war
+
+
+ true
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ copy-webapp
+ package
+
+
+
+
+
+
+
+
+ run
+
+
+
org.eclipse.transformer
@@ -48,17 +106,31 @@
- default-war
+ transform-war
- jar
+ transform
-
- org.apache.jackrabbit
- jackrabbit-webapp
- ${project.version}
-
+ ${project.build.directory}/${project.build.finalName}
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ pack-wer
+ package
+
+
+
+
+
+ run
+
@@ -112,43 +184,44 @@
${project.version}
+ org.apache.tika
+ tika-core
+ ${tika.jakarta.version}
+
+
+ org.apache.tika
+ tika-parsers-standard-package
+ ${tika.jakarta.version}
+
+
org.apache.tomcat.embed
tomcat-embed-core
${tomcat.version}
+ test
org.apache.tomcat.embed
tomcat-embed-jasper
${tomcat.version}
+ test
org.apache.tomcat
tomcat-jasper
${tomcat.version}
+ test
org.apache.tomcat
tomcat-jasper-el
${tomcat.version}
+ test
org.apache.tomcat
tomcat-jsp-api
${tomcat.version}
-
-
- org.apache.tika
- tika-parsers-standard-package
-
-
- org.bouncycastle
- bcmail-jdk15on
-
-
- org.bouncycastle
- bcprov-jdk15on
-
-
+ test
\ No newline at end of file
diff --git a/jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java b/jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
index 0299a509a..d8ffeb5a4 100644
--- a/jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
+++ b/jackrabbit-webapp-jakarta/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
@@ -26,15 +26,18 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.apache.catalina.Context;
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.apache.tomcat.util.scan.StandardJarScanner;
import org.slf4j.bridge.SLF4JBridgeHandler;
import com.gargoylesoftware.htmlunit.WebClient;
@@ -86,7 +89,9 @@ public class TomcatIT extends TestCase {
tomcat.setHostname(url.getHost());
tomcat.setPort(url.getPort());
tomcat.getConnector();
- tomcat.addWebapp("", war.getAbsolutePath());
+
+ Context ctx = tomcat.addWebapp("", war.getAbsolutePath());
+ ((StandardJarScanner)ctx.getJarScanner()).setScanClassPath(false);
tomcat.start();
@@ -96,6 +101,11 @@ public class TomcatIT extends TestCase {
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)) {
+ java.nio.file.Files.move(destFolderPath, destFolderPath.resolveSibling(destFolderPath.getFileName() + "_original"),
+ StandardCopyOption.ATOMIC_MOVE,
+ StandardCopyOption.REPLACE_EXISTING);
+ }
if (!java.nio.file.Files.exists(destFolderPath)) {
try (ZipFile zipFile = new ZipFile(warFile, ZipFile.OPEN_READ)){
Enumeration entries = zipFile.entries();
@@ -109,7 +119,7 @@ public class TomcatIT extends TestCase {
java.nio.file.Files.createDirectories(entryPath.getParent());
try (InputStream in = zipFile.getInputStream(entry)){
try (OutputStream out = new FileOutputStream(entryPath.toFile())){
- IOUtils.copy(in, out);
+ IOUtils.copy(in, out);
}
}
}
@@ -119,7 +129,7 @@ public class TomcatIT extends TestCase {
}
return destFolderPath.toFile();
}
-
+
protected void mkdirs(File dir, String errorMessageFormat) {
if (dir.exists() && dir.isDirectory()) {
return;
@@ -129,7 +139,7 @@ public class TomcatIT extends TestCase {
throw new RuntimeException(String.format(errorMessageFormat, dir.getPath()));
}
}
-
+
public void testTomcat() throws Exception {
HtmlPage page = client.getPage(url);
assertEquals("Content Repository Setup", page.getTitleText());
diff --git a/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java b/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
index a54775817..c43e22eb3 100644
--- a/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
+++ b/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
@@ -25,8 +25,10 @@ import java.util.List;
import junit.framework.TestCase;
+import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.FileUtils;
+import org.apache.tomcat.util.scan.StandardJarScanner;
import org.slf4j.bridge.SLF4JBridgeHandler;
import com.gargoylesoftware.htmlunit.WebClient;
@@ -76,7 +78,8 @@ public class TomcatIT extends TestCase {
tomcat.setHostname(url.getHost());
tomcat.setPort(url.getPort());
- tomcat.addWebapp("", war.getAbsolutePath());
+ Context ctx = tomcat.addWebapp("", war.getAbsolutePath());
+ ((StandardJarScanner)ctx.getJarScanner()).setScanClassPath(false);
tomcat.start();