GH-0000 Merge develop into merge_main_into_develop_after_release_5.3.1, resolving solr module deletion conflicts

Co-authored-by: hmottestad <797185+hmottestad@users.noreply.github.com>

Author: Copilot

.github/workflows/build11.yml

@@ -0,0 +1,14 @@
+name: succed job 'build (11)'
+
+on: pull_request
+
+jobs:
+  build:
+    strategy:
+      fail-fast: true
+      matrix:
+        jdk: [ 11 ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Always Succeed
+        run: true

.github/workflows/copilot-setup-steps.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
 

.github/workflows/dash-license.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Clean install

.github/workflows/develop-status.yml

@@ -11,16 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [11, 17]
+        jdk: [ 25 ]
 
     steps:
     - uses: actions/checkout@v4
     - name: Register JVM thread dump on cancel
       uses: ./.github/actions/thread-dump-post
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
+        distribution: 'temurin'
     - name: Cache local Maven repository
       uses: actions/cache@v4
       with:

.github/workflows/main-status.yml

@@ -11,16 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [11, 17]
+        jdk: [ 25 ]
 
     steps:
     - uses: actions/checkout@v4
     - name: Register JVM thread dump on cancel
       uses: ./.github/actions/thread-dump-post
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
+        distribution: 'temurin'
     - name: Cache local Maven repository
       uses: actions/cache@v4
       with:

.github/workflows/pr-verify.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Check formatting
@@ -41,7 +41,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Compile (mvn clean install)
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        jdk: [ 11, 25 ]
+        jdk: [ 25 ]
     steps:
       - uses: actions/checkout@v4
       - name: Register JVM thread dump on cancel
@@ -86,7 +86,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Build
@@ -109,7 +109,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Build
@@ -132,7 +132,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Run install
@@ -151,7 +151,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 25
           distribution: 'temurin'
           cache: maven
       - name: Install dependencies

bom/pom.xml

@@ -233,11 +233,6 @@
 				<artifactId>rdf4j-sail-elasticsearch</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.rdf4j</groupId>
-				<artifactId>rdf4j-sail-solr</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.rdf4j</groupId>
 				<artifactId>rdf4j-sail-inferencer</artifactId>

compliance/elasticsearch/pom.xml

@@ -56,7 +56,6 @@
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -82,24 +81,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>transport</artifactId>
-			<version>${elasticsearch.version}</version>
+			<groupId>co.elastic.clients</groupId>
+			<artifactId>elasticsearch-java</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.vividsolutions</groupId>
-					<artifactId>jts</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.elasticsearch</groupId>
-					<artifactId>jna</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/AbstractElasticsearchTest.java

@@ -11,17 +11,9 @@
 // Some portions generated by Codex
 package org.eclipse.rdf4j.sail.elasticsearch;
 
-import java.net.InetAddress;
 import java.util.concurrent.TimeUnit;
 
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.TransportAddress;
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
+import org.apache.hc.core5.http.HttpHost;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
@@ -30,6 +22,14 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.HealthStatus;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
+
 @Testcontainers(disabledWithoutDocker = true)
 public abstract class AbstractElasticsearchTest {
 
@@ -39,6 +39,7 @@ public abstract class AbstractElasticsearchTest {
 	public static final GenericContainer<?> elasticsearch = new GenericContainer<>(dockerImageName())
 			.withEnv("discovery.type", "single-node")
 			.withEnv("cluster.name", CLUSTER_NAME)
+			.withEnv("xpack.security.enabled", "false")
 			.withEnv("ES_JAVA_OPTS",
 					"-Djdk.disableLastUsageTracking=true -XX:-UseContainerSupport -Xms512m -Xmx512m")
 			.withEnv("JDK_JAVA_OPTIONS",
@@ -47,7 +48,11 @@ public abstract class AbstractElasticsearchTest {
 					"-Djdk.disableLastUsageTracking=true -XX:-UseContainerSupport -Xms512m -Xmx512m")
 			.withExposedPorts(9200, 9300);
 
-	protected static TransportClient client;
+	protected static Rest5Client lowLevelClient;
+	protected static ElasticsearchTransport transport;
+	protected static ElasticsearchClient client;
+	protected static String host;
+	protected static int httpPort;
 
 	@BeforeAll
 	public static void setUpCluster() throws Exception {
@@ -59,37 +64,40 @@ public static void setUpCluster() throws Exception {
 		Assumptions.assumeTrue(elasticsearch.isRunning(),
 				"Elasticsearch test container failed to start:\n" + safeLogs());
 
-		Settings settings = Settings.builder().put("cluster.name", CLUSTER_NAME).build();
-
-		String host = elasticsearch.getHost();
-		int transportPort = elasticsearch.getMappedPort(9300);
+		host = elasticsearch.getHost();
+		httpPort = elasticsearch.getMappedPort(9200);
 
-		TransportClient transportClient = new PreBuiltTransportClient(settings)
-				.addTransportAddress(new TransportAddress(InetAddress.getByName(host), transportPort));
+		lowLevelClient = Rest5Client.builder(new HttpHost("http", host, httpPort)).build();
+		transport = new Rest5ClientTransport(lowLevelClient, new JacksonJsonpMapper());
+		client = new ElasticsearchClient(transport);
 
-		waitForClusterReady(transportClient);
-
-		client = transportClient;
+		waitForClusterReady(client);
 	}
 
 	@AfterAll
 	public static void tearDownCluster() {
 		if (client != null) {
-			client.close();
+			try {
+				lowLevelClient.close();
+			} catch (Exception e) {
+				// ignore during shutdown
+			}
 			client = null;
+			transport = null;
+			lowLevelClient = null;
 		}
 	}
 
 	private static DockerImageName dockerImageName() {
 		String esVersion = System.getProperty("elasticsearch.docker.version",
-				System.getProperty("elasticsearch.version", "7.15.2"));
+				System.getProperty("elasticsearch.version", "9.2.4"));
 
 		return DockerImageName
 				.parse("docker.elastic.co/elasticsearch/elasticsearch:" + esVersion)
 				.asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
 	}
 
-	private static void waitForClusterReady(Client client) {
+	private static void waitForClusterReady(ElasticsearchClient client) {
 		if (!elasticsearch.isRunning()) {
 			throw new IllegalStateException("Elasticsearch test container stopped before health check:\n" + safeLogs());
 		}
@@ -103,12 +111,9 @@ private static void waitForClusterReady(Client client) {
 						"Elasticsearch test container stopped during health check:\n" + safeLogs());
 			}
 			try {
-				ClusterHealthRequest request = new ClusterHealthRequest()
-						.waitForYellowStatus()
-						.timeout(TimeValue.timeValueSeconds(1));
-
-				ClusterHealthResponse response = client.admin().cluster().health(request).actionGet();
-				if (!response.isTimedOut()) {
+				HealthResponse response = client.cluster()
+						.health(h -> h.waitForStatus(HealthStatus.Yellow).timeout(t -> t.time("100ms")));
+				if (!response.timedOut()) {
 					return;
 				}
 				lastFailure = new IllegalStateException("Cluster health timed out waiting for YELLOW status");
@@ -117,7 +122,7 @@ private static void waitForClusterReady(Client client) {
 			}
 
 			try {
-				Thread.sleep(100);
+				Thread.sleep(10);
 			} catch (InterruptedException ie) {
 				Thread.currentThread().interrupt();
 				throw new IllegalStateException("Interrupted while waiting for Elasticsearch test cluster", ie);

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchIndexHttpTest.java

@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Eclipse RDF4J contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *******************************************************************************/
+// Some portions generated by Codex
+package org.eclipse.rdf4j.sail.elasticsearch;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import java.util.Properties;
+
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.junit.jupiter.api.Test;
+
+public class ElasticsearchIndexHttpTest extends AbstractElasticsearchTest {
+
+	private static final ValueFactory VF = SimpleValueFactory.getInstance();
+
+	@Test
+	public void initializeAndIndexOverHttpEndpoint() {
+		Properties props = new Properties();
+		props.put(ElasticsearchIndex.TRANSPORT_KEY,
+				elasticsearch.getHost() + ":" + elasticsearch.getMappedPort(9200));
+		props.put(ElasticsearchIndex.ELASTICSEARCH_KEY_PREFIX + "cluster.name", CLUSTER_NAME);
+		props.put(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
+		props.put(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
+
+		IRI subject = VF.createIRI("urn:subj-http");
+		IRI predicate = VF.createIRI("urn:pred-http");
+
+		ElasticsearchIndex index = new ElasticsearchIndex();
+
+		assertDoesNotThrow(() -> {
+			index.initialize(props);
+			try {
+				index.begin();
+				index.addStatement(VF.createStatement(subject, predicate, VF.createLiteral("value")));
+				index.commit();
+			} finally {
+				index.shutDown();
+			}
+		});
+	}
+}