Merge main into develop

.github/workflows/merge_main_to_develop.yml

@@ -17,4 +17,4 @@ jobs:
         destination_branch: "develop"         # If blank, default: main
         pr_title: "Merge main into develop"
         pr_body: "Automatically generated PR to keep develop in sync with main.\n\n **USE MERGE COMMIT TO MERGE THIS PR**.\n\nSee [merge_main_to_develop.yml](/eclipse/rdf4j/.github/workflows/merge_main_to_develop.yml)."  # Full markdown support, requires pr_title to be set
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ github.token }}

.gitignore

@@ -52,3 +52,4 @@ org.eclipse.dash.licenses-1.0.2.jar
 e2e/node_modules
 e2e/playwright-report
 e2e/test-results
+.aider*

assembly-descriptors/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-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>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-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>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-bom</artifactId>
 	<packaging>pom</packaging>

compliance/elasticsearch/pom.xml

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

compliance/geosparql/pom.xml

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

compliance/lucene/pom.xml

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

compliance/model/pom.xml

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

compliance/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-compliance</artifactId>
 	<packaging>pom</packaging>

compliance/repository/pom.xml

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

compliance/rio/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-rio-compliance</artifactId>
 	<name>RDF4J: Rio compliance tests</name>

compliance/solr/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-solr-compliance</artifactId>
 	<name>RDF4J: Solr Sail Tests</name>

compliance/sparql/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-sparql-compliance</artifactId>
 	<packaging>war</packaging>

core/client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-client</artifactId>
 	<name>RDF4J: Client Libraries</name>

core/collection-factory/api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-collection-factory</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-collection-factory-api</artifactId>
 	<name>RDF4J: Collection Factory - API</name>

core/collection-factory/mapdb/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-collection-factory</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-collection-factory-mapdb</artifactId>
 	<name>RDF4J: Collection Factory - Map DB backed</name>

core/collection-factory/mapdb3/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-collection-factory</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-collection-factory-mapdb3</artifactId>
 	<name>RDF4J: Collection Factory - Map DB v3 backed</name>

core/collection-factory/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-collection-factory</artifactId>
 	<packaging>pom</packaging>

core/common/annotation/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-annotation</artifactId>
 	<name>RDF4J: common annotation</name>

core/common/exception/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-exception</artifactId>
 	<name>RDF4J: common exception</name>

core/common/io/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-io</artifactId>
 	<name>RDF4J: common IO</name>

core/common/iterator/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-iterator</artifactId>
 	<name>RDF4J: common iterators</name>

core/common/order/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-order</artifactId>
 	<name>RDF4J: common order</name>

core/common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common</artifactId>
 	<packaging>pom</packaging>

core/common/text/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-text</artifactId>
 	<name>RDF4J: common text</name>

core/common/transaction/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-transaction</artifactId>
 	<name>RDF4J: common transaction</name>

core/common/xml/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-common</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-common-xml</artifactId>
 	<name>RDF4J: common XML</name>

core/http/client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-http</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-http-client</artifactId>
 	<name>RDF4J: HTTP client</name>

core/http/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-http</artifactId>
 	<packaging>pom</packaging>

core/http/protocol/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-http</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-http-protocol</artifactId>
 	<name>RDF4J: HTTP protocol</name>

core/model-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-model-api</artifactId>
 	<name>RDF4J: Model API</name>

core/model-vocabulary/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-model-vocabulary</artifactId>
 	<name>RDF4J: RDF Vocabularies</name>

core/model/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-core</artifactId>
-		<version>5.0.1-SNAPSHOT</version>
+		<version>5.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-model</artifactId>
 	<name>RDF4J: Model</name>

core/model/src/main/java/org/eclipse/rdf4j/model/util/Configurations.java

@@ -165,7 +165,13 @@ public static Set<Value> getPropertyValues(Model model, Resource subject, IRI pr
 		var fallbackObjects = model.filter(subject, fallbackProperty, null).objects();
 
 		if (!fallbackObjects.isEmpty() && !preferredObjects.equals(fallbackObjects)) {
-			logger.warn("Discrepancy between use of the old and new config vocabulary.");
+			var msg = "Discrepancy between use of the old and new config vocabulary.";
+			// depending on whether preferred is set, we log on warn or debug
+			if (preferredObjects.isEmpty()) {
+				logger.debug(msg);
+			} else {
+				logger.warn(msg);
+			}
 
 			if (preferredObjects.containsAll(fallbackObjects)) {
 				return preferredObjects;
@@ -235,7 +241,13 @@ public static Optional<Resource> getSubjectByType(Model model, IRI type, IRI leg
 	private static void logDiscrepancyWarning(Optional<? extends Value> preferred,
 			Optional<? extends Value> fallback) {
 		if (!fallback.isEmpty() && !preferred.equals(fallback)) {
-			logger.warn("Discrepancy between use of the old and new config vocabulary.");
+			var msg = "Discrepancy between use of the old and new config vocabulary.";
+			// depending on whether preferred is set, we log on warn or debug
+			if (preferred.isEmpty()) {
+				logger.debug(msg);
+			} else {
+				logger.warn(msg);
+			}
 		}
 	}
 }

core/model/src/test/java/org/eclipse/rdf4j/model/util/ConfigurationsTest.java

@@ -101,6 +101,7 @@ public void testGetLiteralValue_no_discrepancy() {
 		var result = Configurations.getLiteralValue(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).contains(literal("label"));
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -116,7 +117,21 @@ public void testGetLiteralValue_useLegacy_onlyNew() {
 		System.setProperty("org.eclipse.rdf4j.model.vocabulary.useLegacyConfig", "");
 
 		assertThat(result).contains(literal("label"));
-		assertLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
+	}
+
+	@Test
+	public void testGetLiteralValue_onlyLegacy() {
+
+		var subject = bnode();
+		var m = new ModelBuilder().subject(subject)
+				.add(RDFS.COMMENT, "comment")
+				.build();
+
+		var result = Configurations.getLiteralValue(m, subject, RDFS.LABEL, RDFS.COMMENT);
+
+		assertThat(result).contains(literal("comment"));
+		assertLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -158,6 +173,7 @@ public void testGetResourceValue_no_discrepancy() {
 		var result = Configurations.getResourceValue(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).contains(iri("urn:label"));
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -183,6 +199,7 @@ public void testGetIRIValue_no_discrepancy() {
 		var result = Configurations.getIRIValue(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).contains(iri("urn:label"));
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -197,6 +214,7 @@ public void testGetPropertyValues_no_legacy() {
 		var result = Configurations.getPropertyValues(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).hasSize(2);
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -213,6 +231,7 @@ public void testGetPropertyValues_no_discrepancy() {
 		var result = Configurations.getPropertyValues(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).hasSize(2);
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test
@@ -229,6 +248,7 @@ public void testGetPropertyValues_useLegacy_no_discrepancy() {
 		var result = Configurations.getPropertyValues(m, subject, RDFS.LABEL, RDFS.COMMENT);
 		assertThat(result).hasSize(2);
 		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.WARN);
+		assertNotLogged("Discrepancy between use of the old and new config vocabulary.", Level.DEBUG);
 	}
 
 	@Test