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

Author: hmottestad

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>