This is an automated email from the ASF dual-hosted git repository.
OpenPj pushed a commit to branch CONNECTORS-1784
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1784 by this push:
new 1d32eb72a Fix for Virtual Threads, updated Jetty to version 12.1
(CONNECTORS-1784)
1d32eb72a is described below
commit 1d32eb72a2ed8fb55eb8e10735a1031ac34a666a
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon May 25 17:48:19 2026 +0200
Fix for Virtual Threads, updated Jetty to version 12.1 (CONNECTORS-1784)
---
build.xml | 15 ++-
connectors/alfresco-webscript/pom.xml | 6 +
connectors/cmis/pom.xml | 20 +++
connectors/solr/pom.xml | 10 ++
framework/build.xml | 2 +
framework/connector-common/pom.xml | 8 ++
framework/jetty-runner/pom.xml | 22 ----
framework/pull-agent/pom.xml | 26 ----
.../scripts-combined/combined-options.env.unix | 2 +-
.../scripts-combined/combined-options.env.win | 16 +--
framework/scripts-hsqldb/hsqldb-options.env.unix | 2 +-
framework/scripts-hsqldb/hsqldb-options.env.win | 10 +-
framework/scripts-jetty/jetty-options.env.unix | 2 +-
framework/scripts-jetty/jetty-options.env.win | 16 +--
framework/scripts-start/start-options.env.unix | 2 +-
framework/scripts-start/start-options.env.win | 16 +--
framework/scripts-zookeeper/zk-options.env.unix | 2 +-
framework/scripts-zookeeper/zk-options.env.win | 10 +-
pom.xml | 141 +++++++++++++++++++--
19 files changed, 224 insertions(+), 104 deletions(-)
diff --git a/build.xml b/build.xml
index 90baa1318..3f5935317 100644
--- a/build.xml
+++ b/build.xml
@@ -171,7 +171,7 @@
<property name="quartz.version" value="2.3.2"/>
<property name="boilerpipe.version" value="1.1.0"/>
<property name="dom4j.version" value="1.6.1"/>
- <property name="asm.version" value="9.7"/>
+ <property name="asm.version" value="9.10"/>
<property name="xmpcore.version" value="6.1.11"/>
<property name="mchange-commons-java.version" value="0.2.19"/>
<property name="dd-plist.version" value="1.23"/>
@@ -1437,11 +1437,20 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<mkdir dir="lib"/>
<property name="jetty-package" value="org/eclipse/jetty"/>
<property name="jetty-ee10-package" value="org/eclipse/jetty/ee10"/>
+ <property name="jetty-ee-package" value="org/eclipse/jetty/ee"/>
<property name="jetty-http2-package" value="org/eclipse/jetty/http2"/>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee10-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-ee10-apache-jsp"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-ee-webapp"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-ee-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee10-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-ee10-glassfish-jstl"/>
<param name="artifact-type" value="jar"/>
@@ -1504,10 +1513,6 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-name" value="jetty-session"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="jetty-ee"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-plus"/>
<param name="artifact-type" value="jar"/>
diff --git a/connectors/alfresco-webscript/pom.xml
b/connectors/alfresco-webscript/pom.xml
index 858f33462..fe13e767b 100644
--- a/connectors/alfresco-webscript/pom.xml
+++ b/connectors/alfresco-webscript/pom.xml
@@ -320,6 +320,12 @@
<artifactId>chemistry-opencmis-client-impl</artifactId>
<version>0.13.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/connectors/cmis/pom.xml b/connectors/cmis/pom.xml
index a9a75361d..ae45a83ca 100644
--- a/connectors/cmis/pom.xml
+++ b/connectors/cmis/pom.xml
@@ -429,6 +429,16 @@
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
<version>1.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -486,6 +496,16 @@
<version>1.1.0</version>
<type>war</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/connectors/solr/pom.xml b/connectors/solr/pom.xml
index beb54008b..698bc1c02 100644
--- a/connectors/solr/pom.xml
+++ b/connectors/solr/pom.xml
@@ -220,6 +220,16 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj-zookeeper</artifactId>
<version>${solr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/framework/build.xml b/framework/build.xml
index 7ba803037..cc861c9a8 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -363,6 +363,7 @@
<target name="compile-authority-servlet"
depends="compile-core,compile-agents,compile-pull-agent">
<mkdir dir="build/authority-servlet/classes"/>
<javac srcdir="authority-servlet/src/main/java"
destdir="build/authority-servlet/classes" deprecation="true" target="25"
source="25" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <compilerarg value="--enable-preview"/>
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -444,6 +445,7 @@
<target name="compile-crawler-ui"
depends="less-compiler-invocation,compile-core,compile-ui-core,compile-agents,compile-pull-agent">
<mkdir dir="build/crawler-ui/classes"/>
<javac srcdir="crawler-ui/src/main/java"
destdir="build/crawler-ui/classes" deprecation="true" target="25" source="25"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <compilerarg value="--enable-preview"/>
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
diff --git a/framework/connector-common/pom.xml
b/framework/connector-common/pom.xml
index 869312aa7..f5e6b2ca1 100644
--- a/framework/connector-common/pom.xml
+++ b/framework/connector-common/pom.xml
@@ -143,6 +143,14 @@
<groupId>jakarta.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/framework/jetty-runner/pom.xml b/framework/jetty-runner/pom.xml
index 8eae96ec5..3df64f992 100644
--- a/framework/jetty-runner/pom.xml
+++ b/framework/jetty-runner/pom.xml
@@ -253,37 +253,22 @@
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ee</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jndi</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-session</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlets</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -308,17 +293,10 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
diff --git a/framework/pull-agent/pom.xml b/framework/pull-agent/pom.xml
index a9cb85b9a..728adfb2f 100644
--- a/framework/pull-agent/pom.xml
+++ b/framework/pull-agent/pom.xml
@@ -106,31 +106,21 @@
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ee</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jndi</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -151,40 +141,24 @@
<version>${asm.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-session</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
diff --git a/framework/scripts-combined/combined-options.env.unix
b/framework/scripts-combined/combined-options.env.unix
index 04378c0d4..233a38603 100644
--- a/framework/scripts-combined/combined-options.env.unix
+++ b/framework/scripts-combined/combined-options.env.unix
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.:../lib/angus-activation-2.0.2.jar:../lib/apache-el-10.1.16.jar:../lib/apache-jsp-10.1.16.jar:../lib/asm-9.7.jar:../lib/asm-commons-9.7.jar:../lib/asm-tree-9.7.jar:../lib/commons-codec-1.16.1.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../l
[...]
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-combined/combined-options.env.win
b/framework/scripts-combined/combined-options.env.win
index 387a449b1..5ef16445a 100644
--- a/framework/scripts-combined/combined-options.env.win
+++ b/framework/scripts-combined/combined-options.env.win
@@ -1,8 +1,8 @@
--Xms512m
--Xmx512m
--Dorg.apache.manifoldcf.configfile=.\properties.xml
--Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
--Djava.security.auth.login.config=
---enable-preview
--cp
-.;..\lib\angus-activation-2.0.2.jar;..\lib\apache-el-10.1.16.jar;..\lib\apache-jsp-10.1.16.jar;..\lib\asm-9.7.jar;..\lib\asm-commons-9.7.jar;..\lib\asm-tree-9.7.jar;..\lib\commons-codec-1.16.1.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\l
[...]
+-Xms512m
+-Xmx512m
+-Dorg.apache.manifoldcf.configfile=.\properties.xml
+-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
+-Djava.security.auth.login.config=
+--enable-preview
+-cp
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/framework/scripts-hsqldb/hsqldb-options.env.unix
b/framework/scripts-hsqldb/hsqldb-options.env.unix
index 3bea3d943..d9075219c 100644
--- a/framework/scripts-hsqldb/hsqldb-options.env.unix
+++ b/framework/scripts-hsqldb/hsqldb-options.env.unix
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.:../lib/hsqldb-2.7.2.jar
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-hsqldb/hsqldb-options.env.win
b/framework/scripts-hsqldb/hsqldb-options.env.win
index a6fba4184..efb71eef8 100644
--- a/framework/scripts-hsqldb/hsqldb-options.env.win
+++ b/framework/scripts-hsqldb/hsqldb-options.env.win
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
---enable-preview
--cp
-.;..\lib\hsqldb-2.7.2.jar
+-Xms256m
+-Xmx256m
+--enable-preview
+-cp
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/framework/scripts-jetty/jetty-options.env.unix
b/framework/scripts-jetty/jetty-options.env.unix
index 47abcf3d6..bd98bd360 100644
--- a/framework/scripts-jetty/jetty-options.env.unix
+++ b/framework/scripts-jetty/jetty-options.env.unix
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.:../lib/angus-activation-2.0.2.jar:../lib/apache-el-10.1.16.jar:../lib/apache-jsp-10.1.16.jar:../lib/asm-9.7.jar:../lib/asm-commons-9.7.jar:../lib/asm-tree-9.7.jar:../lib/commons-codec-1.16.1.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../l
[...]
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-jetty/jetty-options.env.win
b/framework/scripts-jetty/jetty-options.env.win
index f94f0a1d4..272b95dfd 100644
--- a/framework/scripts-jetty/jetty-options.env.win
+++ b/framework/scripts-jetty/jetty-options.env.win
@@ -1,8 +1,8 @@
--Xms256m
--Xmx256m
--Dorg.apache.manifoldcf.configfile=.\properties.xml
--Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
--Djava.security.auth.login.config=
---enable-preview
--cp
-.;..\lib\angus-activation-2.0.2.jar;..\lib\apache-el-10.1.16.jar;..\lib\apache-jsp-10.1.16.jar;..\lib\asm-9.7.jar;..\lib\asm-commons-9.7.jar;..\lib\asm-tree-9.7.jar;..\lib\commons-codec-1.16.1.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\l
[...]
+-Xms256m
+-Xmx256m
+-Dorg.apache.manifoldcf.configfile=.\properties.xml
+-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
+-Djava.security.auth.login.config=
+--enable-preview
+-cp
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/framework/scripts-start/start-options.env.unix
b/framework/scripts-start/start-options.env.unix
index 04378c0d4..233a38603 100644
--- a/framework/scripts-start/start-options.env.unix
+++ b/framework/scripts-start/start-options.env.unix
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.:../lib/angus-activation-2.0.2.jar:../lib/apache-el-10.1.16.jar:../lib/apache-jsp-10.1.16.jar:../lib/asm-9.7.jar:../lib/asm-commons-9.7.jar:../lib/asm-tree-9.7.jar:../lib/commons-codec-1.16.1.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../l
[...]
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-start/start-options.env.win
b/framework/scripts-start/start-options.env.win
index 387a449b1..5ef16445a 100644
--- a/framework/scripts-start/start-options.env.win
+++ b/framework/scripts-start/start-options.env.win
@@ -1,8 +1,8 @@
--Xms512m
--Xmx512m
--Dorg.apache.manifoldcf.configfile=.\properties.xml
--Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
--Djava.security.auth.login.config=
---enable-preview
--cp
-.;..\lib\angus-activation-2.0.2.jar;..\lib\apache-el-10.1.16.jar;..\lib\apache-jsp-10.1.16.jar;..\lib\asm-9.7.jar;..\lib\asm-commons-9.7.jar;..\lib\asm-tree-9.7.jar;..\lib\commons-codec-1.16.1.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\l
[...]
+-Xms512m
+-Xmx512m
+-Dorg.apache.manifoldcf.configfile=.\properties.xml
+-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
+-Djava.security.auth.login.config=
+--enable-preview
+-cp
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/framework/scripts-zookeeper/zk-options.env.unix
b/framework/scripts-zookeeper/zk-options.env.unix
index d9d4c1dba..d9075219c 100644
--- a/framework/scripts-zookeeper/zk-options.env.unix
+++ b/framework/scripts-zookeeper/zk-options.env.unix
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.:../lib/log4j-1.2-api-2.23.1.jar:../lib/netty-handler-4.1.110.Final.jar:../lib/slf4j-api-2.0.13.jar:../lib/slf4j-simple-2.0.13.jar:../lib/zookeeper-3.9.1.jar:../lib/zookeeper-jute-3.9.1.jar
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-zookeeper/zk-options.env.win
b/framework/scripts-zookeeper/zk-options.env.win
index e2d1cc759..efb71eef8 100644
--- a/framework/scripts-zookeeper/zk-options.env.win
+++ b/framework/scripts-zookeeper/zk-options.env.win
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
---enable-preview
--cp
-.;..\lib\log4j-1.2-api-2.23.1.jar;..\lib\netty-handler-4.1.110.Final.jar;..\lib\slf4j-api-2.0.13.jar;..\lib\slf4j-simple-2.0.13.jar;..\lib\zookeeper-3.9.1.jar;..\lib\zookeeper-jute-3.9.1.jar
+-Xms256m
+-Xmx256m
+--enable-preview
+-cp
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/pom.xml b/pom.xml
index 5b1a58b8b..24e54e558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<postgresql.version>42.7.4</postgresql.version>
<mysql.version>5.1.47</mysql.version>
<hsqldb.version>2.6.1</hsqldb.version>
- <jetty.version>12.0.10</jetty.version>
+ <jetty.version>12.1.8</jetty.version>
<jetty-jsp-jdt.version>2.3.3</jetty-jsp-jdt.version>
<jetty-schemas.version>5.0</jetty-schemas.version>
<mail.version>2.1.3</mail.version>
@@ -81,7 +81,7 @@
<jstl.version>3.0.1</jstl.version>
<javax-el.version>5.0.1</javax-el.version>
<glassfish.version>2.1.v20091210</glassfish.version>
- <log4j.version>2.23.1</log4j.version>
+ <log4j.version>2.25.4</log4j.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<slf4j.version>2.0.13</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
@@ -93,7 +93,7 @@
<hadoop.version>3.3.6</hadoop.version>
<tomcat.version>10.1.25</tomcat.version>
<ecj.version>3.39.0</ecj.version>
- <asm.version>9.7</asm.version>
+ <asm.version>9.10</asm.version>
<json-simple.version>1.1.1</json-simple.version>
<commons-exec.version>1.3</commons-exec.version>
<jna.version>5.10.0</jna.version>
@@ -150,12 +150,67 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>jetty-http2-client-transport</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>jetty-http2-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>jetty-http2-common</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>jetty-http2-hpack</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>jetty-http2-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-java-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.compression</groupId>
+ <artifactId>jetty-compression-gzip</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.compression</groupId>
+ <artifactId>jetty-compression-common</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ee</artifactId>
+ <artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
@@ -190,23 +245,63 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
- <artifactId>jetty-ee10-apache-jsp</artifactId>
+ <artifactId>jetty-ee10-servlet-security</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-session</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-apache-jsp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
+ <artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</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-el-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>com.github.maoo.indexer</groupId>
@@ -221,6 +316,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -252,6 +351,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -267,6 +374,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -305,6 +416,12 @@
<artifactId>asm-tree</artifactId>
<version>${asm.version}</version>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.3.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
