This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch CONNECTORS-1779
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1779 by this push:
new f44b0c80d Fixed tests for Alfresco WebScripts and Solr connectors
f44b0c80d is described below
commit f44b0c80da29347895a48228ce02b3bd29546a76
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon Mar 16 13:37:58 2026 +0100
Fixed tests for Alfresco WebScripts and Solr connectors
---
.../connectors/alfrescowebscript/tests/BaseITHSQLDB.java | 4 +++-
connectors/alfresco-webscript/pom.xml | 14 +++++++-------
connectors/solr/build.xml | 12 ++++++------
connectors/solr/pom.xml | 7 +++----
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git
a/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
b/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
index 070ae48f1..fb4168a7b 100644
---
a/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
+++
b/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
@@ -22,6 +22,8 @@ import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.ee10.webapp.WebAppContext;
+import org.eclipse.jetty.util.resource.ResourceFactory;
+import java.nio.file.Paths;
import org.junit.Before;
@@ -71,7 +73,7 @@ public class BaseITHSQLDB extends
org.apache.manifoldcf.crawler.tests.BaseITHSQL
WebAppContext alfrescoServerApi = new
WebAppContext(alfrescoServerWarPath,"/alfresco");
alfrescoServerApi.setParentLoaderPriority(false);
- HashLoginService dummyLoginService = new
HashLoginService("TEST-SECURITY-REALM", jettyConfigPath);
+ HashLoginService dummyLoginService = new
HashLoginService("TEST-SECURITY-REALM",
ResourceFactory.root().newResource(Paths.get(jettyConfigPath)));
alfrescoServerApi.getSecurityHandler().setLoginService(dummyLoginService);
contexts.addHandler(alfrescoServerApi);
diff --git a/connectors/alfresco-webscript/pom.xml
b/connectors/alfresco-webscript/pom.xml
index 9badb05eb..fabc1bb7d 100644
--- a/connectors/alfresco-webscript/pom.xml
+++ b/connectors/alfresco-webscript/pom.xml
@@ -411,32 +411,32 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <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-http</artifactId>
+ <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-io</artifactId>
+ <artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
+ <artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
+ <artifactId>jetty-security</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
diff --git a/connectors/solr/build.xml b/connectors/solr/build.xml
index 87857669d..64f54a22c 100644
--- a/connectors/solr/build.xml
+++ b/connectors/solr/build.xml
@@ -93,15 +93,15 @@
<antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="org/eclipse/jetty/http2"/>
- <param name="artifact-version" value="9.4.48.v20220622"/>
- <param name="artifact-name" value="http2-server"/>
+ <param name="artifact-version" value="${jetty.version}"/>
+ <param name="artifact-name" value="jetty-http2-server"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="target" value="test-materials"/>
<param name="project-path" value="org/eclipse/jetty/http2"/>
- <param name="artifact-version" value="9.4.48.v20220622"/>
- <param name="artifact-name" value="http2-common"/>
+ <param name="artifact-version" value="${jetty.version}"/>
+ <param name="artifact-name" value="jetty-http2-common"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
@@ -115,8 +115,8 @@
<path id="connector-test-classpath">
<path refid="mcf-connector-build.connector-test-classpath"/>
<fileset dir="test-materials">
- <include name="http2-server*.jar"/>
- <include name="http2-common*.jar"/>
+ <include name="jetty-http2-server*.jar"/>
+ <include name="jetty-http2-common*.jar"/>
</fileset>
</path>
diff --git a/connectors/solr/pom.xml b/connectors/solr/pom.xml
index 4455b200d..36e6cae90 100644
--- a/connectors/solr/pom.xml
+++ b/connectors/solr/pom.xml
@@ -400,15 +400,14 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-server</artifactId>
+ <artifactId>jetty-http2-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-common</artifactId>
+ <artifactId>jetty-http2-common</artifactId>
<version>${jetty.version}</version>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
