Merge develop into main in anticipation of 5.0.0 release (#5018)

assembly-descriptors/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-assembly-descriptors</artifactId>
 	<name>RDF4J: Assembly Descriptors</name>

assembly/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-assembly</artifactId>
 	<packaging>pom</packaging>

bom/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-bom</artifactId>
 	<packaging>pom</packaging>
@@ -309,11 +309,6 @@
 				<artifactId>rdf4j-common-transaction</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.rdf4j</groupId>
-				<artifactId>rdf4j-common-util</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.rdf4j</groupId>
 				<artifactId>rdf4j-common-xml</artifactId>

compliance/elasticsearch/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-elasticsearch-compliance</artifactId>
 	<name>RDF4J: Elasticsearch Sail Tests</name>

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

@@ -17,11 +17,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
-import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.ValueFactory;
 import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
@@ -307,9 +305,7 @@ public void testAddMultiple() throws Exception {
 		assertStatement(statement22, document);
 
 		// check if the text field stores all added string values
-		Set<String> texts = new HashSet<>();
-		texts.add("cats");
-		texts.add("dogs");
+		HashSet<String> texts = new HashSet<>(List.of("cats", "dogs"));
 		// FIXME
 		// assertTexts(texts, document);
 
@@ -377,7 +373,7 @@ public void testContexts() throws Exception {
 
 			// delete context 1
 			connection.begin();
-			connection.clear(new Resource[] { CONTEXT_1 });
+			connection.clear(CONTEXT_1);
 			connection.commit();
 			assertNoStatement(statementContext111);
 			assertNoStatement(statementContext121);
@@ -428,7 +424,7 @@ public void testContextsRemoveContext2() throws Exception {
 
 			// delete context 2
 			connection.begin();
-			connection.clear(new Resource[] { CONTEXT_2 });
+			connection.clear(CONTEXT_2);
 			connection.commit();
 			assertStatement(statementContext111);
 			assertStatement(statementContext121);
@@ -449,10 +445,10 @@ public void testRejectedDatatypes() {
 		Literal literal2 = vf.createLiteral("hi there, too", STRING);
 		Literal literal3 = vf.createLiteral("1.0");
 		Literal literal4 = vf.createLiteral("1.0", FLOAT);
-		assertEquals("Is the first literal accepted?", true, index.accept(literal1));
-		assertEquals("Is the second literal accepted?", true, index.accept(literal2));
-		assertEquals("Is the third literal accepted?", true, index.accept(literal3));
-		assertEquals("Is the fourth literal accepted?", false, index.accept(literal4));
+		assertTrue("Is the first literal accepted?", index.accept(literal1));
+		assertTrue("Is the second literal accepted?", index.accept(literal2));
+		assertTrue("Is the third literal accepted?", index.accept(literal3));
+		assertFalse("Is the fourth literal accepted?", index.accept(literal4));
 	}
 
 	private void assertStatement(Statement statement) throws Exception {
@@ -471,10 +467,6 @@ private void assertNoStatement(Statement statement) throws Exception {
 		assertNoStatement(statement, document);
 	}
 
-	/**
-	 * @param statement112
-	 * @param document
-	 */
 	private void assertStatement(Statement statement, SearchDocument document) {
 		List<String> fields = document.getProperty(SearchFields.getPropertyField(statement.getPredicate()));
 		assertNotNull("field " + statement.getPredicate() + " not found in document " + document, fields);
@@ -486,10 +478,6 @@ private void assertStatement(Statement statement, SearchDocument document) {
 		fail("Statement not found in document " + statement);
 	}
 
-	/**
-	 * @param statement112
-	 * @param document
-	 */
 	private void assertNoStatement(Statement statement, SearchDocument document) {
 		List<String> fields = document.getProperty(SearchFields.getPropertyField(statement.getPredicate()));
 		if (fields == null) {

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

@@ -75,7 +75,7 @@ public void tearDown() throws Exception {
 	}
 
 	@Test
-	public void testTriplesStored() throws Exception {
+	public void testTriplesStored() {
 		delegateTest.testTriplesStored();
 	}
 

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

@@ -74,7 +74,7 @@ public void tearDown() throws Exception {
 	}
 
 	@Test
-	public void testTriplesStored() throws Exception {
+	public void testTriplesStored() {
 		delegateTest.testTriplesStored();
 	}
 

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

@@ -74,7 +74,7 @@ public void tearDown() throws Exception {
 	}
 
 	@Test
-	public void testTriplesStored() throws Exception {
+	public void testTriplesStored() {
 		delegateTest.testTriplesStored();
 	}
 
@@ -133,17 +133,17 @@ public void testUnionQuery() throws RepositoryException, MalformedQueryException
 	}
 
 	@Test
-	public void testContextHandling() throws Exception {
+	public void testContextHandling() {
 		delegateTest.testContextHandling();
 	}
 
 	@Test
-	public void testConcurrentReadingAndWriting() throws Exception {
+	public void testConcurrentReadingAndWriting() {
 		delegateTest.testConcurrentReadingAndWriting();
 	}
 
 	@Test
-	public void testNullContextHandling() throws Exception {
+	public void testNullContextHandling() {
 		delegateTest.testNullContextHandling();
 	}
 
@@ -153,7 +153,7 @@ public void testFuzzyQuery() throws MalformedQueryException, RepositoryException
 	}
 
 	@Test
-	public void testReindexing() throws Exception {
+	public void testReindexing() {
 		delegateTest.testReindexing();
 	}
 

compliance/elasticsearch/src/test/java/org/elasticsearch/bootstrap/JarHell.java

@@ -24,10 +24,10 @@ public class JarHell {
 	private JarHell() {
 	}
 
-	public static void checkJarHell() throws Exception {
+	public static void checkJarHell() {
 	}
 
-	public static void checkJarHell(URL urls[]) throws Exception {
+	public static void checkJarHell(URL urls[]) {
 	}
 
 	public static void checkVersionFormat(String targetVersion) {

compliance/geosparql/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-geosparql-compliance</artifactId>
 	<name>RDF4J: GeoSPARQL compliance tests</name>

compliance/geosparql/src/test/java/org/eclipse/rdf4j/query/algebra/geosparql/MemoryGeoSPARQLQueryTest.java

@@ -10,21 +10,15 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.query.algebra.geosparql;
 
-import org.eclipse.rdf4j.query.Dataset;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
 import org.eclipse.rdf4j.testsuite.query.algebra.geosparql.GeoSPARQLManifestTest;
 
 public class MemoryGeoSPARQLQueryTest extends GeoSPARQLManifestTest {
 
-	public MemoryGeoSPARQLQueryTest(String displayName, String testURI, String name, String queryFileURL,
-			String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
-		super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
-	}
-
 	@Override
-	protected Repository newRepository() throws Exception {
+	protected Repository newRepository() {
 		return new SailRepository(new MemoryStore());
 	}
 }

compliance/lucene/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-lucene-compliance</artifactId>
 	<name>RDF4J: Lucene Sail Tests</name>

compliance/lucene/src/test/java/org/eclipse/rdf4j/sail/lucene/LuceneSailTest.java

@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,13 +35,13 @@ public class LuceneSailTest extends AbstractLuceneSailTest {
 	 * LuceneSail)
 	 */
 	@Override
-	protected void configure(LuceneSail sail) throws IOException {
+	protected void configure(LuceneSail sail) {
 		sail.setParameter(LuceneSail.INDEX_CLASS_KEY, LuceneIndex.class.getName());
 		sail.setParameter(LuceneSail.LUCENE_RAMDIR_KEY, "true");
 	}
 
 	@Test
-	public void testReindexing_SingleResource() throws Exception {
+	public void testReindexing_SingleResource() {
 
 		// wipe the Lucene index to allow specific test data
 		try (RepositoryConnection connection = repository.getConnection()) {

compliance/model/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>rdf4j-compliance</artifactId>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdf4j-model-compliance</artifactId>

compliance/model/src/test/java/org/eclipse/rdf4j/model/util/IsomorphicTest.java

@@ -182,7 +182,7 @@ public void bsbmNotIsomorphic() {
 	}
 
 	@Test
-	public void testValidationReport() throws IOException {
+	public void testValidationReport() {
 		Model m1 = getModel("shaclValidationReport.ttl");
 		Model m2 = getModel("shaclValidationReport.ttl");
 
@@ -191,7 +191,7 @@ public void testValidationReport() throws IOException {
 
 	@Test
 	@Timeout(2)
-	public void testValidationReport_LexicalOrdering() throws IOException {
+	public void testValidationReport_LexicalOrdering() {
 		Model m1 = getModel("shaclValidationReport.ttl");
 		Model m2 = getModel("shaclValidationReport.ttl");
 
@@ -205,7 +205,7 @@ public void testValidationReport_LexicalOrdering() throws IOException {
 	}
 
 	@Test
-	public void testValidationReport_Changed() throws IOException {
+	public void testValidationReport_Changed() {
 		Model m1 = getModel("shaclValidationReport.ttl");
 		Model m2 = getModel("shaclValidationReport-changed.ttl");
 

compliance/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-compliance</artifactId>
 	<packaging>pom</packaging>
@@ -13,7 +13,6 @@
 		<module>rio</module>
 		<module>model</module>
 		<module>sparql</module>
-		<module>shacl</module>
 		<module>lucene</module>
 		<module>solr</module>
 		<module>elasticsearch</module>
@@ -173,6 +172,13 @@
 					</includes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

compliance/repository/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>4.3.13-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-repository-compliance</artifactId>
 	<packaging>war</packaging>

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPRepositoryTest.java

@@ -59,7 +59,7 @@ protected Repository createRepository() {
 
 	@Test
 	@Timeout(value = 10)
-	public void testSubqueryDeadlock() throws Exception {
+	public void testSubqueryDeadlock() {
 		String mainQueryStr = "SELECT ?property WHERE { ?property a rdf:Property . }";
 		String subQueryStr = "SELECT ?range WHERE { ?property rdfs:range ?range . }";
 

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPStoreConnectionTest.java

@@ -73,7 +73,7 @@ public void testContextInTransactionAdd(IsolationLevel level) throws Exception {
 
 	@ParameterizedTest
 	@MethodSource("parameters")
-	public void testUpdateExecution(IsolationLevel level) throws Exception {
+	public void testUpdateExecution(IsolationLevel level) {
 		setupTest(level);
 
 		IRI foobar = vf.createIRI("foo:bar");
@@ -116,7 +116,7 @@ public void testAddMalformedLiteralsDefaultConfig(IsolationLevel level) throws E
 	@MethodSource("parameters")
 	@Override
 	@Disabled("See SES-1833")
-	public void testAddMalformedLiteralsStrictConfig(IsolationLevel level) throws Exception {
+	public void testAddMalformedLiteralsStrictConfig(IsolationLevel level) {
 		System.err.println("SES-1833: temporarily disabled testAddMalformedLiteralsStrictConfig() for HTTPRepository");
 	}