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 78e1fc8fc Reverted Virtual Threads to Platform Threads
(CONNECTORS-1784)
78e1fc8fc is described below
commit 78e1fc8fc3367c9d58f068d0d942c3d5602f936c
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Thu May 14 18:24:01 2026 +0200
Reverted Virtual Threads to Platform Threads (CONNECTORS-1784)
---
connectors/activedirectory/pom.xml | 7 -
connectors/alfresco-webscript/pom.xml | 7 -
connectors/amazoncloudsearch/pom.xml | 7 -
connectors/amazons3/pom.xml | 7 -
connectors/cmis/pom.xml | 7 -
connectors/confluence-v6/pom.xml | 6 -
connectors/contentlimiter/pom.xml | 7 -
connectors/documentfilter/pom.xml | 7 -
connectors/dropbox/pom.xml | 7 -
connectors/elasticsearch/pom.xml | 7 -
connectors/email/pom.xml | 7 -
connectors/filesystem/pom.xml | 7 -
connectors/forcedmetadata/pom.xml | 7 -
connectors/generic/pom.xml | 7 -
connectors/googledrive/pom.xml | 7 -
connectors/gts/pom.xml | 7 -
connectors/hdfs/pom.xml | 13 -
connectors/html-extractor/pom.xml | 7 -
connectors/jcifs/pom.xml | 7 -
connectors/jdbc/pom.xml | 7 -
connectors/jira/pom.xml | 6 -
connectors/kafka/pom.xml | 7 -
connectors/ldap/pom.xml | 7 -
connectors/mongodb/pom.xml | 7 -
connectors/nullauthority/pom.xml | 7 -
connectors/nulloutput/pom.xml | 7 -
connectors/nulltransformation/pom.xml | 7 -
connectors/nuxeo/pom.xml | 6 -
connectors/opennlp/pom.xml | 7 -
connectors/opensearchserver/pom.xml | 7 -
connectors/regexpmapper/pom.xml | 7 -
connectors/rocketchat/pom.xml | 7 -
connectors/rss/pom.xml | 7 -
connectors/searchblox/pom.xml | 6 -
connectors/sharepoint/pom.xml | 7 -
connectors/slack/pom.xml | 7 -
connectors/solr/pom.xml | 7 -
connectors/tika/pom.xml | 7 -
connectors/tikaservice/pom.xml | 7 -
.../connectors/webcrawler/ThrottledFetcher.java | 3 +-
connectors/webcrawler/pom.xml | 7 -
connectors/wiki/pom.xml | 7 -
distribution/pom.xml | 10 +
distribution/src/main/assembly/bin.xml | 109 ++++++++
.../manifoldcf/agents/system/AgentsDaemon.java | 4 +-
framework/api-service/pom.xml | 7 -
framework/authority-service/pom.xml | 7 -
framework/combined-service/pom.xml | 305 ++++++++++-----------
framework/connector-common/pom.xml | 6 -
.../connectorcommon/common/CommonsHTTPSender.java | 3 +-
framework/core/pom.xml | 5 +-
framework/crawler-ui/pom.xml | 5 +-
framework/pom.xml | 45 +++
.../manifoldcf/crawler/system/CrawlerAgent.java | 40 +--
.../scripts-combined/combined-options.env.unix | 2 +-
.../scripts-combined/combined-options.env.win | 2 +-
framework/scripts-hsqldb/hsqldb-options.env.unix | 2 +-
framework/scripts-hsqldb/hsqldb-options.env.win | 2 +-
framework/scripts-jetty/jetty-options.env.unix | 2 +-
framework/scripts-jetty/jetty-options.env.win | 2 +-
framework/scripts-start/start-options.env.unix | 2 +-
framework/scripts-start/start-options.env.win | 2 +-
framework/scripts-zookeeper/zk-options.env.unix | 2 +-
framework/scripts-zookeeper/zk-options.env.win | 2 +-
framework/scripts/options.env.unix | 2 +-
framework/scripts/options.env.win | 2 +-
pom.xml | 86 +++++-
67 files changed, 439 insertions(+), 509 deletions(-)
diff --git a/connectors/activedirectory/pom.xml
b/connectors/activedirectory/pom.xml
index d6086a2ea..2ef5d0cef 100644
--- a/connectors/activedirectory/pom.xml
+++ b/connectors/activedirectory/pom.xml
@@ -343,12 +343,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/alfresco-webscript/pom.xml
b/connectors/alfresco-webscript/pom.xml
index ce24a255a..858f33462 100644
--- a/connectors/alfresco-webscript/pom.xml
+++ b/connectors/alfresco-webscript/pom.xml
@@ -465,13 +465,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
diff --git a/connectors/amazoncloudsearch/pom.xml
b/connectors/amazoncloudsearch/pom.xml
index bedea2305..2dfbe7d28 100644
--- a/connectors/amazoncloudsearch/pom.xml
+++ b/connectors/amazoncloudsearch/pom.xml
@@ -369,12 +369,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/amazons3/pom.xml b/connectors/amazons3/pom.xml
index 45fe73f94..2e014b790 100644
--- a/connectors/amazons3/pom.xml
+++ b/connectors/amazons3/pom.xml
@@ -365,13 +365,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
diff --git a/connectors/cmis/pom.xml b/connectors/cmis/pom.xml
index bccd9237e..a9a75361d 100644
--- a/connectors/cmis/pom.xml
+++ b/connectors/cmis/pom.xml
@@ -597,12 +597,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/confluence-v6/pom.xml b/connectors/confluence-v6/pom.xml
index d5e09d531..a9d9f94a6 100755
--- a/connectors/confluence-v6/pom.xml
+++ b/connectors/confluence-v6/pom.xml
@@ -338,12 +338,6 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/contentlimiter/pom.xml
b/connectors/contentlimiter/pom.xml
index 6b6168079..3f7176b2e 100644
--- a/connectors/contentlimiter/pom.xml
+++ b/connectors/contentlimiter/pom.xml
@@ -343,12 +343,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/documentfilter/pom.xml
b/connectors/documentfilter/pom.xml
index ed8f3810b..054cde0a3 100644
--- a/connectors/documentfilter/pom.xml
+++ b/connectors/documentfilter/pom.xml
@@ -343,12 +343,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/dropbox/pom.xml b/connectors/dropbox/pom.xml
index e992a4bd7..8bd10d476 100644
--- a/connectors/dropbox/pom.xml
+++ b/connectors/dropbox/pom.xml
@@ -367,12 +367,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/elasticsearch/pom.xml b/connectors/elasticsearch/pom.xml
index 07778156b..96df29a87 100644
--- a/connectors/elasticsearch/pom.xml
+++ b/connectors/elasticsearch/pom.xml
@@ -378,13 +378,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- Elastic Search dependencies -->
<dependency>
<groupId>org.elasticsearch</groupId>
diff --git a/connectors/email/pom.xml b/connectors/email/pom.xml
index 6b1cfde96..d2dddc221 100644
--- a/connectors/email/pom.xml
+++ b/connectors/email/pom.xml
@@ -341,13 +341,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
diff --git a/connectors/filesystem/pom.xml b/connectors/filesystem/pom.xml
index 670cceea4..1ceccf039 100644
--- a/connectors/filesystem/pom.xml
+++ b/connectors/filesystem/pom.xml
@@ -356,12 +356,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/forcedmetadata/pom.xml
b/connectors/forcedmetadata/pom.xml
index 939093563..48a0c8543 100644
--- a/connectors/forcedmetadata/pom.xml
+++ b/connectors/forcedmetadata/pom.xml
@@ -336,12 +336,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/generic/pom.xml b/connectors/generic/pom.xml
index 4238311a2..651ed011d 100644
--- a/connectors/generic/pom.xml
+++ b/connectors/generic/pom.xml
@@ -348,13 +348,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
diff --git a/connectors/googledrive/pom.xml b/connectors/googledrive/pom.xml
index 646032ca8..4bafa0249 100644
--- a/connectors/googledrive/pom.xml
+++ b/connectors/googledrive/pom.xml
@@ -362,13 +362,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-drive</artifactId>
diff --git a/connectors/gts/pom.xml b/connectors/gts/pom.xml
index 8877f74f4..0ae41e075 100644
--- a/connectors/gts/pom.xml
+++ b/connectors/gts/pom.xml
@@ -346,13 +346,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/hdfs/pom.xml b/connectors/hdfs/pom.xml
index 2ecbdfd4e..25624aa39 100644
--- a/connectors/hdfs/pom.xml
+++ b/connectors/hdfs/pom.xml
@@ -342,23 +342,10 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/connectors/html-extractor/pom.xml
b/connectors/html-extractor/pom.xml
index a6c0bd7d0..225a4f272 100644
--- a/connectors/html-extractor/pom.xml
+++ b/connectors/html-extractor/pom.xml
@@ -347,12 +347,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/jcifs/pom.xml b/connectors/jcifs/pom.xml
index ce44c5a3b..65ae30594 100644
--- a/connectors/jcifs/pom.xml
+++ b/connectors/jcifs/pom.xml
@@ -346,13 +346,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index 169fb1641..a0e6a87ec 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -341,12 +341,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/jira/pom.xml b/connectors/jira/pom.xml
index 528ca56f1..403736bee 100644
--- a/connectors/jira/pom.xml
+++ b/connectors/jira/pom.xml
@@ -362,11 +362,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index e4fab8207..421e6b256 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -487,13 +487,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
diff --git a/connectors/ldap/pom.xml b/connectors/ldap/pom.xml
index 56ddf143f..eecd7cbd4 100644
--- a/connectors/ldap/pom.xml
+++ b/connectors/ldap/pom.xml
@@ -340,12 +340,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/mongodb/pom.xml b/connectors/mongodb/pom.xml
index 9aae23efb..f6d91af74 100644
--- a/connectors/mongodb/pom.xml
+++ b/connectors/mongodb/pom.xml
@@ -223,13 +223,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/connectors/nullauthority/pom.xml b/connectors/nullauthority/pom.xml
index 95d0e8360..9c9a4dc8d 100644
--- a/connectors/nullauthority/pom.xml
+++ b/connectors/nullauthority/pom.xml
@@ -341,12 +341,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/nulloutput/pom.xml b/connectors/nulloutput/pom.xml
index 63fcf5da4..6a0b5b486 100644
--- a/connectors/nulloutput/pom.xml
+++ b/connectors/nulloutput/pom.xml
@@ -336,12 +336,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/nulltransformation/pom.xml
b/connectors/nulltransformation/pom.xml
index 066f74e75..aefbdfb2a 100644
--- a/connectors/nulltransformation/pom.xml
+++ b/connectors/nulltransformation/pom.xml
@@ -336,12 +336,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/nuxeo/pom.xml b/connectors/nuxeo/pom.xml
index e8c84de46..37905d2e5 100755
--- a/connectors/nuxeo/pom.xml
+++ b/connectors/nuxeo/pom.xml
@@ -360,12 +360,6 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
diff --git a/connectors/opennlp/pom.xml b/connectors/opennlp/pom.xml
index 5438b4a1a..136ffe808 100644
--- a/connectors/opennlp/pom.xml
+++ b/connectors/opennlp/pom.xml
@@ -347,13 +347,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/opensearchserver/pom.xml
b/connectors/opensearchserver/pom.xml
index 988f8a5da..ff61a19ba 100644
--- a/connectors/opensearchserver/pom.xml
+++ b/connectors/opensearchserver/pom.xml
@@ -371,12 +371,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/regexpmapper/pom.xml b/connectors/regexpmapper/pom.xml
index 6efd84d18..8aa24fade 100644
--- a/connectors/regexpmapper/pom.xml
+++ b/connectors/regexpmapper/pom.xml
@@ -342,12 +342,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/rocketchat/pom.xml b/connectors/rocketchat/pom.xml
index 4ca2e98ae..805958e07 100644
--- a/connectors/rocketchat/pom.xml
+++ b/connectors/rocketchat/pom.xml
@@ -341,13 +341,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/connectors/rss/pom.xml b/connectors/rss/pom.xml
index c418ca6df..7f125b700 100644
--- a/connectors/rss/pom.xml
+++ b/connectors/rss/pom.xml
@@ -376,13 +376,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/searchblox/pom.xml b/connectors/searchblox/pom.xml
index 7a8e4ae4c..9b98a7050 100644
--- a/connectors/searchblox/pom.xml
+++ b/connectors/searchblox/pom.xml
@@ -456,12 +456,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
diff --git a/connectors/sharepoint/pom.xml b/connectors/sharepoint/pom.xml
index 663a80f67..1d88227b3 100644
--- a/connectors/sharepoint/pom.xml
+++ b/connectors/sharepoint/pom.xml
@@ -447,13 +447,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
diff --git a/connectors/slack/pom.xml b/connectors/slack/pom.xml
index f91a02134..c1ea71eb6 100644
--- a/connectors/slack/pom.xml
+++ b/connectors/slack/pom.xml
@@ -341,13 +341,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/connectors/solr/pom.xml b/connectors/solr/pom.xml
index 430ec4030..beb54008b 100644
--- a/connectors/solr/pom.xml
+++ b/connectors/solr/pom.xml
@@ -419,12 +419,5 @@
<artifactId>jetty-http2-server</artifactId>
<version>${jetty.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/tika/pom.xml b/connectors/tika/pom.xml
index 9c773f3e4..f8bad0191 100644
--- a/connectors/tika/pom.xml
+++ b/connectors/tika/pom.xml
@@ -363,12 +363,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/tikaservice/pom.xml b/connectors/tikaservice/pom.xml
index 9226c2a0b..4eec12acf 100644
--- a/connectors/tikaservice/pom.xml
+++ b/connectors/tikaservice/pom.xml
@@ -363,12 +363,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git
a/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
b/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
index 30e07298f..cd28dc0c9 100644
---
a/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
+++
b/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
@@ -700,7 +700,8 @@ public class ThrottledFetcher
methodThread = new ExecuteMethodThread(this, fetchThrottler, httpClient,
hostHost, fetchMethod, cookieStore);
try
{
- methodThreadRef = Thread.ofVirtual().name("ExecuteMethod
thread").start(methodThread);
+ methodThreadRef = new Thread(methodThread, "ExecuteMethod thread");
+ methodThreadRef.start();
threadStarted = true;
try
{
diff --git a/connectors/webcrawler/pom.xml b/connectors/webcrawler/pom.xml
index 15fa47c45..8996b8621 100644
--- a/connectors/webcrawler/pom.xml
+++ b/connectors/webcrawler/pom.xml
@@ -367,12 +367,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/connectors/wiki/pom.xml b/connectors/wiki/pom.xml
index 6f6bd2e4d..4b22aa219 100644
--- a/connectors/wiki/pom.xml
+++ b/connectors/wiki/pom.xml
@@ -361,12 +361,5 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 293f3e052..c77d0ba26 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -342,6 +342,16 @@
<artifactId>mcf-wiki-connector</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>${jstl.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/distribution/src/main/assembly/bin.xml
b/distribution/src/main/assembly/bin.xml
index b5351bd85..5b5a6d191 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -92,8 +92,117 @@
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.eclipse.jetty*:*</include>
+ <include>org.glassfish.web:*</include>
+ <include>jakarta.servlet.jsp.jstl:*</include>
+ <include>jakarta.servlet:jakarta.servlet-api</include>
+ <include>jakarta.annotation:jakarta.annotation-api</include>
+ <include>jakarta.el:jakarta.el-api</include>
+ <include>org.apache.tomcat:*</include>
+ <include>org.mortbay.jasper:*</include>
+ <include>org.ow2.asm:*</include>
+ <include>org.hsqldb:hsqldb</include>
+ <include>org.postgresql:postgresql</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>org.apache.commons:commons-collections4</include>
+ <include>commons-discovery:commons-discovery</include>
+ <include>commons-el:commons-el</include>
+ <include>org.apache.commons:commons-exec</include>
+ <include>org.apache.commons:commons-fileupload2-core</include>
+
<include>org.apache.commons:commons-fileupload2-jakarta-servlet6</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-lang:commons-lang</include>
+ <include>org.apache.commons:commons-lang3</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.eclipse.jdt:ecj</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.google.guava:guava</include>
+ <include>org.apache.httpcomponents:httpclient</include>
+ <include>org.apache.httpcomponents:httpcore</include>
+ <include>org.apache.httpcomponents:httpmime</include>
+ <include>jakarta.mail:jakarta.mail-api</include>
+ <include>net.java.dev.jna:jna</include>
+ <include>net.java.dev.jna:jna-platform</include>
+ <include>com.googlecode.json-simple:json-simple</include>
+ <include>org.apache.logging.log4j:*</include>
+ <include>org.slf4j:*</include>
+ <include>io.netty:netty-handler</include>
+ <include>io.netty:netty-common</include>
+ <include>io.netty:netty-buffer</include>
+ <include>io.netty:netty-transport</include>
+ <include>io.netty:netty-codec</include>
+ <include>io.netty:netty-resolver</include>
+ <include>xalan:serializer</include>
+ <include>org.apache.velocity:velocity-engine-core</include>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xml-apis:xml-apis</include>
+ <include>org.apache.zookeeper:*</include>
+ <include>org.eclipse.angus:angus-activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.manifoldcf:*</exclude>
+ </excludes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>connector-common-lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
<excludes>
<exclude>org.apache.manifoldcf:*</exclude>
+ <exclude>org.eclipse.jetty*:*</exclude>
+ <exclude>org.glassfish.web:*</exclude>
+ <exclude>jakarta.servlet.jsp.jstl:*</exclude>
+ <exclude>jakarta.servlet:jakarta.servlet-api</exclude>
+ <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
+ <exclude>jakarta.el:jakarta.el-api</exclude>
+ <exclude>org.apache.tomcat:*</exclude>
+ <exclude>org.mortbay.jasper:*</exclude>
+ <exclude>org.ow2.asm:*</exclude>
+ <exclude>org.hsqldb:hsqldb</exclude>
+ <exclude>org.postgresql:postgresql</exclude>
+ <exclude>commons-codec:commons-codec</exclude>
+ <exclude>commons-collections:commons-collections</exclude>
+ <exclude>org.apache.commons:commons-collections4</exclude>
+ <exclude>commons-discovery:commons-discovery</exclude>
+ <exclude>commons-el:commons-el</exclude>
+ <exclude>org.apache.commons:commons-exec</exclude>
+ <exclude>org.apache.commons:commons-fileupload2-core</exclude>
+
<exclude>org.apache.commons:commons-fileupload2-jakarta-servlet6</exclude>
+ <exclude>commons-io:commons-io</exclude>
+ <exclude>commons-lang:commons-lang</exclude>
+ <exclude>org.apache.commons:commons-lang3</exclude>
+ <exclude>commons-logging:commons-logging</exclude>
+ <exclude>org.eclipse.jdt:ecj</exclude>
+ <exclude>com.google.code.gson:gson</exclude>
+ <exclude>com.google.guava:guava</exclude>
+ <exclude>org.apache.httpcomponents:httpclient</exclude>
+ <exclude>org.apache.httpcomponents:httpcore</exclude>
+ <exclude>org.apache.httpcomponents:httpmime</exclude>
+ <exclude>jakarta.mail:jakarta.mail-api</exclude>
+ <exclude>net.java.dev.jna:jna</exclude>
+ <exclude>net.java.dev.jna:jna-platform</exclude>
+ <exclude>com.googlecode.json-simple:json-simple</exclude>
+ <exclude>org.apache.logging.log4j:*</exclude>
+ <exclude>org.slf4j:*</exclude>
+ <exclude>io.netty:netty-handler</exclude>
+ <exclude>io.netty:netty-common</exclude>
+ <exclude>io.netty:netty-buffer</exclude>
+ <exclude>io.netty:netty-transport</exclude>
+ <exclude>io.netty:netty-codec</exclude>
+ <exclude>io.netty:netty-resolver</exclude>
+ <exclude>xalan:serializer</exclude>
+ <exclude>org.apache.velocity:velocity-engine-core</exclude>
+ <exclude>xalan:xalan</exclude>
+ <exclude>xerces:xercesImpl</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ <exclude>org.apache.zookeeper:*</exclude>
+ <exclude>org.eclipse.angus:angus-activation</exclude>
+ <exclude>jakarta.activation:jakarta.activation-api</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git
a/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/AgentsDaemon.java
b/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/AgentsDaemon.java
index f63ee6016..199583874 100644
---
a/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/AgentsDaemon.java
+++
b/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/AgentsDaemon.java
@@ -143,8 +143,8 @@ public class AgentsDaemon
throws ManifoldCFException
{
// Create idle cleanup thread.
- idleCleanupThread = Thread.ofVirtual().name("Idle cleanup
thread").unstarted(new IdleCleanupThread(processID));
- agentsThread = Thread.ofVirtual().name("Agents thread").unstarted(new
AgentsThread());
+ idleCleanupThread = new IdleCleanupThread(processID);
+ agentsThread = new AgentsThread();
// Create and start agents thread.
idleCleanupThread.start();
agentsThread.start();
diff --git a/framework/api-service/pom.xml b/framework/api-service/pom.xml
index 2f042b192..ed2d15c70 100644
--- a/framework/api-service/pom.xml
+++ b/framework/api-service/pom.xml
@@ -60,13 +60,6 @@
</dependency>
<!-- runtime dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- database dependencies -->
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/framework/authority-service/pom.xml
b/framework/authority-service/pom.xml
index 03f9ddcb2..4c5d64d89 100644
--- a/framework/authority-service/pom.xml
+++ b/framework/authority-service/pom.xml
@@ -60,13 +60,6 @@
</dependency>
<!-- runtime dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- database dependencies -->
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/framework/combined-service/pom.xml
b/framework/combined-service/pom.xml
index ecba64bd3..9fc779662 100644
--- a/framework/combined-service/pom.xml
+++ b/framework/combined-service/pom.xml
@@ -1,156 +1,149 @@
-<?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
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.manifoldcf</groupId>
- <artifactId>mcf-framework</artifactId>
- <version>2.31-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>mcf-combined-service</artifactId>
- <name>ManifoldCF - Framework - Combined Service</name>
- <packaging>war</packaging>
-
- <dependencies>
- <!-- Internal dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-api-servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-authority-servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-agents</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-pull-agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-ui-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-crawler-ui</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <!-- web dependencies -->
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- runtime dependencies -->
- <dependency>
- <groupId>jakarta.servlet.jsp.jstl</groupId>
- <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>${jstl.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- database dependencies -->
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgresql.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- JDBC connector dependencies -->
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>${jtds.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${maven-war-plugin.version}</version>
- <configuration>
- <overlays>
- <overlay>
- <groupId>org.apache.manifoldcf</groupId>
- <artifactId>mcf-crawler-ui</artifactId>
- <type>war</type>
- <includes>
- <include>*.jsp</include>
- <include>*.css</include>
- <include>*.png</include>
- </includes>
- <targetPath>/</targetPath>
- </overlay>
- <overlay>
- <groupId>org.apache.manifoldcf</groupId>
- <artifactId>mcf-crawler-ui</artifactId>
- <type>war</type>
- <includes>
- <include>WEB-INF/jsp/*</include>
- </includes>
- <targetPath>/</targetPath>
- </overlay>
- </overlays>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?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
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-framework</artifactId>
+ <version>2.31-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mcf-combined-service</artifactId>
+ <name>ManifoldCF - Framework - Combined Service</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-agents</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-pull-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-ui-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <!-- web dependencies -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- runtime dependencies -->
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>${jstl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- database dependencies -->
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- JDBC connector dependencies -->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>${jtds.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <type>war</type>
+ <includes>
+ <include>*.jsp</include>
+ <include>*.css</include>
+ <include>*.png</include>
+ </includes>
+ <targetPath>/</targetPath>
+ </overlay>
+ <overlay>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <type>war</type>
+ <includes>
+ <include>WEB-INF/jsp/*</include>
+ </includes>
+ <targetPath>/</targetPath>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/framework/connector-common/pom.xml
b/framework/connector-common/pom.xml
index 8d90de0a0..869312aa7 100644
--- a/framework/connector-common/pom.xml
+++ b/framework/connector-common/pom.xml
@@ -182,12 +182,6 @@
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
<!-- JAXWS for Java 11 -->
<dependency>
diff --git
a/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
b/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
index 0f61ba7e5..e6aedbedb 100644
---
a/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
+++
b/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/common/CommonsHTTPSender.java
@@ -174,7 +174,8 @@ public class CommonsHTTPSender extends BasicHandler {
// HttpProtocolParams.setVersion(method.getParams(),new
ProtocolVersion("HTTP",1,0));
BackgroundHTTPThread methodThread = new
BackgroundHTTPThread(httpClient,method);
- Thread vThread = Thread.ofVirtual().name("HTTP
request").start(methodThread);
+ Thread vThread = new Thread(methodThread, "HTTP request");
+ vThread.start();
try
{
int returnCode = methodThread.getResponseCode();
diff --git a/framework/core/pom.xml b/framework/core/pom.xml
index 56b12947a..edc4999c7 100644
--- a/framework/core/pom.xml
+++ b/framework/core/pom.xml
@@ -228,9 +228,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/framework/crawler-ui/pom.xml b/framework/crawler-ui/pom.xml
index a66aa00cc..1fd7b7f61 100644
--- a/framework/crawler-ui/pom.xml
+++ b/framework/crawler-ui/pom.xml
@@ -122,9 +122,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/framework/pom.xml b/framework/pom.xml
index 61e7c4b1a..c0d2c0f2e 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -31,6 +31,51 @@
<name>ManifoldCF - Framework</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-no-conflicting-logging</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.slf4j:slf4j-reload4j</exclude>
+ <exclude>org.slf4j:slf4j-simple</exclude>
+ <exclude>org.apache.logging.log4j:log4j-to-slf4j</exclude>
+ <exclude>log4j:log4j</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>less-compiler</module>
<module>core</module>
diff --git
a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
index 4fb266c51..8d796e8d8 100644
---
a/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
+++
b/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
@@ -389,22 +389,22 @@ public class CrawlerAgent implements IAgent
docDeleteResetManager = new
DocDeleteResetManager(documentDeleteQueue,processID);
docCleanupResetManager = new
DocCleanupResetManager(documentCleanupQueue,processID);
- jobStartThread = Thread.ofVirtual().name("Job start thread").unstarted(new
JobStartThread(processID));
- startupThread = Thread.ofVirtual().name("Startup thread").unstarted(new
StartupThread(new StartupResetManager(processID),processID));
- startDeleteThread = Thread.ofVirtual().name("Start delete
thread").unstarted(new StartDeleteThread(new
DeleteStartupResetManager(processID),processID));
- finisherThread = Thread.ofVirtual().name("Finisher thread").unstarted(new
FinisherThread(processID));
- notificationThread = Thread.ofVirtual().name("Notification
thread").unstarted(new JobNotificationThread(new
NotificationResetManager(processID),processID));
- jobDeleteThread = Thread.ofVirtual().name("Job delete
thread").unstarted(new JobDeleteThread(processID));
- stufferThread = Thread.ofVirtual().name("Stuffer thread").unstarted(new
StufferThread(documentQueue,numWorkerThreads,workerResetManager,queueTracker,blockingDocuments,lowWaterFactor,stuffAmtFactor,processID));
- expireStufferThread = Thread.ofVirtual().name("Expire stuffer
thread").unstarted(new
ExpireStufferThread(expireQueue,numExpireThreads,workerResetManager,processID));
- setPriorityThread = Thread.ofVirtual().name("Set priority
thread").unstarted(new
SetPriorityThread(numWorkerThreads,blockingDocuments,processID));
- historyCleanupThread = Thread.ofVirtual().name("History cleanup
thread").unstarted(new HistoryCleanupThread(processID));
+ jobStartThread = new JobStartThread(processID);
+ startupThread = new StartupThread(new
StartupResetManager(processID),processID);
+ startDeleteThread = new StartDeleteThread(new
DeleteStartupResetManager(processID),processID);
+ finisherThread = new FinisherThread(processID);
+ notificationThread = new JobNotificationThread(new
NotificationResetManager(processID),processID);
+ jobDeleteThread = new JobDeleteThread(processID);
+ stufferThread = new
StufferThread(documentQueue,numWorkerThreads,workerResetManager,queueTracker,blockingDocuments,lowWaterFactor,stuffAmtFactor,processID);
+ expireStufferThread = new
ExpireStufferThread(expireQueue,numExpireThreads,workerResetManager,processID);
+ setPriorityThread = new
SetPriorityThread(numWorkerThreads,blockingDocuments,processID);
+ historyCleanupThread = new HistoryCleanupThread(processID);
workerThreads = new Thread[numWorkerThreads];
int i = 0;
while (i < numWorkerThreads)
{
- workerThreads[i] = Thread.ofVirtual().name("Worker thread
'"+i+"'").unstarted(new
WorkerThread(Integer.toString(i),documentQueue,workerResetManager,queueTracker,processID));
+ workerThreads[i] = new
WorkerThread(Integer.toString(i),documentQueue,workerResetManager,queueTracker,processID);
i++;
}
@@ -412,32 +412,32 @@ public class CrawlerAgent implements IAgent
i = 0;
while (i < numExpireThreads)
{
- expireThreads[i] = Thread.ofVirtual().name("Expire thread
'"+i+"'").unstarted(new
ExpireThread(Integer.toString(i),expireQueue,workerResetManager,processID));
+ expireThreads[i] = new
ExpireThread(Integer.toString(i),expireQueue,workerResetManager,processID);
i++;
}
- deleteStufferThread = Thread.ofVirtual().name("Delete stuffer
thread").unstarted(new
DocumentDeleteStufferThread(documentDeleteQueue,numDeleteThreads,docDeleteResetManager,processID));
+ deleteStufferThread = new
DocumentDeleteStufferThread(documentDeleteQueue,numDeleteThreads,docDeleteResetManager,processID);
deleteThreads = new Thread[numDeleteThreads];
i = 0;
while (i < numDeleteThreads)
{
- deleteThreads[i] = Thread.ofVirtual().name("Delete thread
'"+i+"'").unstarted(new
DocumentDeleteThread(Integer.toString(i),documentDeleteQueue,docDeleteResetManager,processID));
+ deleteThreads[i] = new
DocumentDeleteThread(Integer.toString(i),documentDeleteQueue,docDeleteResetManager,processID);
i++;
}
- cleanupStufferThread = Thread.ofVirtual().name("Cleanup stuffer
thread").unstarted(new
DocumentCleanupStufferThread(documentCleanupQueue,numCleanupThreads,docCleanupResetManager,processID));
+ cleanupStufferThread = new
DocumentCleanupStufferThread(documentCleanupQueue,numCleanupThreads,docCleanupResetManager,processID);
cleanupThreads = new Thread[numCleanupThreads];
i = 0;
while (i < numCleanupThreads)
{
- cleanupThreads[i] = Thread.ofVirtual().name("Cleanup thread
'"+i+"'").unstarted(new
DocumentCleanupThread(Integer.toString(i),documentCleanupQueue,docCleanupResetManager,processID));
+ cleanupThreads[i] = new
DocumentCleanupThread(Integer.toString(i),documentCleanupQueue,docCleanupResetManager,processID);
i++;
}
- jobResetThread = Thread.ofVirtual().name("Job reset thread").unstarted(new
JobResetThread(processID));
- seedingThread = Thread.ofVirtual().name("Seeding thread").unstarted(new
SeedingThread(new SeedingResetManager(processID),processID));
- idleCleanupThread = Thread.ofVirtual().name("Idle cleanup
thread").unstarted(new IdleCleanupThread(processID));
- assessmentThread = Thread.ofVirtual().name("Assessment
thread").unstarted(new AssessmentThread(processID));
+ jobResetThread = new JobResetThread(processID);
+ seedingThread = new SeedingThread(new
SeedingResetManager(processID),processID);
+ idleCleanupThread = new IdleCleanupThread(processID);
+ assessmentThread = new AssessmentThread(processID);
// Start all the threads
jobStartThread.start();
diff --git a/framework/scripts-combined/combined-options.env.unix
b/framework/scripts-combined/combined-options.env.unix
index 90e5dc2ca..04378c0d4 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/*:../lib-proprietary/*
+.:../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
[...]
diff --git a/framework/scripts-combined/combined-options.env.win
b/framework/scripts-combined/combined-options.env.win
index a53153f1e..387a449b1 100644
--- a/framework/scripts-combined/combined-options.env.win
+++ b/framework/scripts-combined/combined-options.env.win
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\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
[...]
diff --git a/framework/scripts-hsqldb/hsqldb-options.env.unix
b/framework/scripts-hsqldb/hsqldb-options.env.unix
index 3f165a5b1..3bea3d943 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/*:../lib-proprietary/*
+.:../lib/hsqldb-2.7.2.jar
diff --git a/framework/scripts-hsqldb/hsqldb-options.env.win
b/framework/scripts-hsqldb/hsqldb-options.env.win
index a7b9113ca..a6fba4184 100644
--- a/framework/scripts-hsqldb/hsqldb-options.env.win
+++ b/framework/scripts-hsqldb/hsqldb-options.env.win
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\lib\hsqldb-2.7.2.jar
diff --git a/framework/scripts-jetty/jetty-options.env.unix
b/framework/scripts-jetty/jetty-options.env.unix
index a994e29fd..47abcf3d6 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/*:../lib-proprietary/*
+.:../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
[...]
diff --git a/framework/scripts-jetty/jetty-options.env.win
b/framework/scripts-jetty/jetty-options.env.win
index 659fa866a..f94f0a1d4 100644
--- a/framework/scripts-jetty/jetty-options.env.win
+++ b/framework/scripts-jetty/jetty-options.env.win
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\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
[...]
diff --git a/framework/scripts-start/start-options.env.unix
b/framework/scripts-start/start-options.env.unix
index 90e5dc2ca..04378c0d4 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/*:../lib-proprietary/*
+.:../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
[...]
diff --git a/framework/scripts-start/start-options.env.win
b/framework/scripts-start/start-options.env.win
index a53153f1e..387a449b1 100644
--- a/framework/scripts-start/start-options.env.win
+++ b/framework/scripts-start/start-options.env.win
@@ -5,4 +5,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\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
[...]
diff --git a/framework/scripts-zookeeper/zk-options.env.unix
b/framework/scripts-zookeeper/zk-options.env.unix
index 3f165a5b1..d9d4c1dba 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/*:../lib-proprietary/*
+.:../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
diff --git a/framework/scripts-zookeeper/zk-options.env.win
b/framework/scripts-zookeeper/zk-options.env.win
index a7b9113ca..e2d1cc759 100644
--- a/framework/scripts-zookeeper/zk-options.env.win
+++ b/framework/scripts-zookeeper/zk-options.env.win
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\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
diff --git a/framework/scripts/options.env.unix
b/framework/scripts/options.env.unix
index 70cfdee2f..796f488a5 100644
--- a/framework/scripts/options.env.unix
+++ b/framework/scripts/options.env.unix
@@ -4,4 +4,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.:../lib/*:../lib-proprietary/*
+.:../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
[...]
diff --git a/framework/scripts/options.env.win
b/framework/scripts/options.env.win
index ec4660eff..b246e0b72 100644
--- a/framework/scripts/options.env.win
+++ b/framework/scripts/options.env.win
@@ -4,4 +4,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.;..\lib\*;..\lib-proprietary\*
+.;..\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
[...]
diff --git a/pom.xml b/pom.xml
index 2b68f0b9a..1e4f507ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,9 +81,9 @@
<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.17.2</log4j.version>
+ <log4j.version>2.23.1</log4j.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <slf4j.version>2.0.13</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
<zookeeper.version>3.9.1</zookeeper.version>
<xmlbeans.version>3.1.0</xmlbeans.version>
@@ -208,6 +208,88 @@
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.maoo.indexer</groupId>
+ <artifactId>alfresco-indexer-client</artifactId>
+ <version>0.8.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
