From 00daf57a26eff185507e2c7dcef537a9f48606e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Wed, 5 Jun 2024 19:51:24 +0200 Subject: [PATCH 01/37] next minor version --- assembly-descriptors/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 2 +- compliance/elasticsearch/pom.xml | 2 +- compliance/geosparql/pom.xml | 2 +- compliance/lucene/pom.xml | 2 +- compliance/model/pom.xml | 2 +- compliance/pom.xml | 2 +- compliance/repository/pom.xml | 2 +- compliance/rio/pom.xml | 2 +- compliance/solr/pom.xml | 2 +- compliance/sparql/pom.xml | 2 +- core/client/pom.xml | 2 +- core/collection-factory/api/pom.xml | 2 +- core/collection-factory/mapdb/pom.xml | 2 +- core/collection-factory/mapdb3/pom.xml | 2 +- core/collection-factory/pom.xml | 2 +- core/common/annotation/pom.xml | 2 +- core/common/exception/pom.xml | 2 +- core/common/io/pom.xml | 2 +- core/common/iterator/pom.xml | 2 +- core/common/order/pom.xml | 2 +- core/common/pom.xml | 2 +- core/common/text/pom.xml | 2 +- core/common/transaction/pom.xml | 2 +- core/common/xml/pom.xml | 2 +- core/http/client/pom.xml | 2 +- core/http/pom.xml | 2 +- core/http/protocol/pom.xml | 2 +- core/model-api/pom.xml | 2 +- core/model-vocabulary/pom.xml | 2 +- core/model/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/queryalgebra/evaluation/pom.xml | 2 +- core/queryalgebra/geosparql/pom.xml | 2 +- core/queryalgebra/model/pom.xml | 2 +- core/queryalgebra/pom.xml | 2 +- core/queryparser/api/pom.xml | 2 +- core/queryparser/pom.xml | 2 +- core/queryparser/sparql/pom.xml | 2 +- core/queryrender/pom.xml | 2 +- core/queryresultio/api/pom.xml | 2 +- core/queryresultio/binary/pom.xml | 2 +- core/queryresultio/pom.xml | 2 +- core/queryresultio/sparqljson/pom.xml | 2 +- core/queryresultio/sparqlxml/pom.xml | 2 +- core/queryresultio/text/pom.xml | 2 +- core/repository/api/pom.xml | 2 +- core/repository/contextaware/pom.xml | 2 +- core/repository/dataset/pom.xml | 2 +- core/repository/event/pom.xml | 2 +- core/repository/http/pom.xml | 2 +- core/repository/manager/pom.xml | 2 +- core/repository/pom.xml | 2 +- core/repository/sail/pom.xml | 2 +- core/repository/sparql/pom.xml | 2 +- core/rio/api/pom.xml | 2 +- core/rio/binary/pom.xml | 2 +- core/rio/datatypes/pom.xml | 2 +- core/rio/hdt/pom.xml | 2 +- core/rio/jsonld-legacy/pom.xml | 2 +- core/rio/jsonld/pom.xml | 2 +- core/rio/languages/pom.xml | 2 +- core/rio/n3/pom.xml | 2 +- core/rio/nquads/pom.xml | 2 +- core/rio/ntriples/pom.xml | 2 +- core/rio/pom.xml | 2 +- core/rio/rdfjson/pom.xml | 2 +- core/rio/rdfxml/pom.xml | 2 +- core/rio/trig/pom.xml | 2 +- core/rio/trix/pom.xml | 2 +- core/rio/turtle/pom.xml | 2 +- core/sail/api/pom.xml | 2 +- core/sail/base/pom.xml | 2 +- core/sail/elasticsearch-store/pom.xml | 2 +- core/sail/elasticsearch/pom.xml | 2 +- core/sail/extensible-store/pom.xml | 2 +- core/sail/inferencer/pom.xml | 2 +- core/sail/lmdb/pom.xml | 2 +- core/sail/lucene-api/pom.xml | 2 +- core/sail/lucene/pom.xml | 2 +- core/sail/memory/pom.xml | 2 +- core/sail/model/pom.xml | 2 +- core/sail/nativerdf/pom.xml | 2 +- core/sail/pom.xml | 2 +- core/sail/shacl/pom.xml | 2 +- core/sail/solr/pom.xml | 2 +- core/sparqlbuilder/pom.xml | 2 +- core/spin/pom.xml | 2 +- core/storage/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- spring-components/pom.xml | 2 +- spring-components/rdf4j-spring-demo/pom.xml | 2 +- spring-components/rdf4j-spring/pom.xml | 2 +- spring-components/spring-boot-sparql-web/pom.xml | 2 +- testsuites/benchmark/pom.xml | 2 +- testsuites/geosparql/pom.xml | 2 +- testsuites/lucene/pom.xml | 2 +- testsuites/model/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/queryresultio/pom.xml | 2 +- testsuites/repository/pom.xml | 2 +- testsuites/rio/pom.xml | 2 +- testsuites/sail/pom.xml | 2 +- testsuites/sparql/pom.xml | 2 +- tools/config/pom.xml | 2 +- tools/console/pom.xml | 2 +- tools/federation/pom.xml | 2 +- tools/pom.xml | 2 +- tools/runtime-osgi/pom.xml | 2 +- tools/runtime/pom.xml | 2 +- tools/server-spring/pom.xml | 2 +- tools/server/pom.xml | 2 +- tools/workbench/pom.xml | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/assembly-descriptors/pom.xml b/assembly-descriptors/pom.xml index b67c7891f49..adb16157dc8 100644 --- a/assembly-descriptors/pom.xml +++ b/assembly-descriptors/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly-descriptors RDF4J: Assembly Descriptors diff --git a/assembly/pom.xml b/assembly/pom.xml index 40c68a1484a..a88d567f0e5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly pom diff --git a/bom/pom.xml b/bom/pom.xml index eb75ce9afa0..f9a2a634d30 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-bom pom diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml index e95dad466a9..794dacb7bd7 100644 --- a/compliance/elasticsearch/pom.xml +++ b/compliance/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-elasticsearch-compliance RDF4J: Elasticsearch Sail Tests diff --git a/compliance/geosparql/pom.xml b/compliance/geosparql/pom.xml index ce9d14ce321..41e8785595b 100644 --- a/compliance/geosparql/pom.xml +++ b/compliance/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-compliance RDF4J: GeoSPARQL compliance tests diff --git a/compliance/lucene/pom.xml b/compliance/lucene/pom.xml index 4e143a7eafa..dcf84054c6d 100644 --- a/compliance/lucene/pom.xml +++ b/compliance/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-compliance RDF4J: Lucene Sail Tests diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml index ffc741bf75a..3d3ac105fa9 100644 --- a/compliance/model/pom.xml +++ b/compliance/model/pom.xml @@ -3,7 +3,7 @@ rdf4j-compliance org.eclipse.rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT 4.0.0 rdf4j-model-compliance diff --git a/compliance/pom.xml b/compliance/pom.xml index 103007f58ae..7a3f7a3e7ff 100644 --- a/compliance/pom.xml +++ b/compliance/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-compliance pom diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml index d98fcc9ee25..069ade53eec 100644 --- a/compliance/repository/pom.xml +++ b/compliance/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-compliance war diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml index 5cbeeca7d75..850062bf2f4 100644 --- a/compliance/rio/pom.xml +++ b/compliance/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-compliance RDF4J: Rio compliance tests diff --git a/compliance/solr/pom.xml b/compliance/solr/pom.xml index 2abe270f6ea..454f5295ca6 100644 --- a/compliance/solr/pom.xml +++ b/compliance/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-solr-compliance RDF4J: Solr Sail Tests diff --git a/compliance/sparql/pom.xml b/compliance/sparql/pom.xml index 1de0e1073c2..3340661c18d 100644 --- a/compliance/sparql/pom.xml +++ b/compliance/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-compliance war diff --git a/core/client/pom.xml b/core/client/pom.xml index dcc6771feb5..845360a26cc 100644 --- a/core/client/pom.xml +++ b/core/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-client RDF4J: Client Libraries diff --git a/core/collection-factory/api/pom.xml b/core/collection-factory/api/pom.xml index e39337fb961..5ba6df646b7 100644 --- a/core/collection-factory/api/pom.xml +++ b/core/collection-factory/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-api RDF4J: Collection Factory - API diff --git a/core/collection-factory/mapdb/pom.xml b/core/collection-factory/mapdb/pom.xml index 3fb7f2728de..c8e843b984e 100644 --- a/core/collection-factory/mapdb/pom.xml +++ b/core/collection-factory/mapdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb RDF4J: Collection Factory - Map DB backed diff --git a/core/collection-factory/mapdb3/pom.xml b/core/collection-factory/mapdb3/pom.xml index 32c16f6cf6d..7a5b287eb23 100644 --- a/core/collection-factory/mapdb3/pom.xml +++ b/core/collection-factory/mapdb3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb3 RDF4J: Collection Factory - Map DB v3 backed diff --git a/core/collection-factory/pom.xml b/core/collection-factory/pom.xml index 2309b0ce29b..bb1df7bb226 100644 --- a/core/collection-factory/pom.xml +++ b/core/collection-factory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory pom diff --git a/core/common/annotation/pom.xml b/core/common/annotation/pom.xml index b3c8df98930..f5f53a65e21 100644 --- a/core/common/annotation/pom.xml +++ b/core/common/annotation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-annotation RDF4J: common annotation diff --git a/core/common/exception/pom.xml b/core/common/exception/pom.xml index 9b6dd2b2976..bbd533f1adf 100644 --- a/core/common/exception/pom.xml +++ b/core/common/exception/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-exception RDF4J: common exception diff --git a/core/common/io/pom.xml b/core/common/io/pom.xml index 4bbf5246908..f99f7f2af4e 100644 --- a/core/common/io/pom.xml +++ b/core/common/io/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-io RDF4J: common IO diff --git a/core/common/iterator/pom.xml b/core/common/iterator/pom.xml index 6ca8cd53723..c8b62012574 100644 --- a/core/common/iterator/pom.xml +++ b/core/common/iterator/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-iterator RDF4J: common iterators diff --git a/core/common/order/pom.xml b/core/common/order/pom.xml index 2dbdf43fe3e..5228081fc0e 100644 --- a/core/common/order/pom.xml +++ b/core/common/order/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-order RDF4J: common order diff --git a/core/common/pom.xml b/core/common/pom.xml index 777dc9af104..fc821867500 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common pom diff --git a/core/common/text/pom.xml b/core/common/text/pom.xml index 3a1f7c034c1..f26391a3d11 100644 --- a/core/common/text/pom.xml +++ b/core/common/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-text RDF4J: common text diff --git a/core/common/transaction/pom.xml b/core/common/transaction/pom.xml index 14c85825dca..2a327eba54c 100644 --- a/core/common/transaction/pom.xml +++ b/core/common/transaction/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-transaction RDF4J: common transaction diff --git a/core/common/xml/pom.xml b/core/common/xml/pom.xml index 46160b4db67..76184d6e127 100644 --- a/core/common/xml/pom.xml +++ b/core/common/xml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-xml RDF4J: common XML diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml index fb4d826a565..8e26e6c8d3f 100644 --- a/core/http/client/pom.xml +++ b/core/http/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-client RDF4J: HTTP client diff --git a/core/http/pom.xml b/core/http/pom.xml index 1da8c205c90..ee3e0261ad0 100644 --- a/core/http/pom.xml +++ b/core/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http pom diff --git a/core/http/protocol/pom.xml b/core/http/protocol/pom.xml index e7bce8e2473..a5d66a693e0 100644 --- a/core/http/protocol/pom.xml +++ b/core/http/protocol/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-protocol RDF4J: HTTP protocol diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml index 75f807bf88b..cf07e38798c 100644 --- a/core/model-api/pom.xml +++ b/core/model-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-api RDF4J: Model API diff --git a/core/model-vocabulary/pom.xml b/core/model-vocabulary/pom.xml index cd1a34790ac..bd27791c1d8 100644 --- a/core/model-vocabulary/pom.xml +++ b/core/model-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-vocabulary RDF4J: RDF Vocabularies diff --git a/core/model/pom.xml b/core/model/pom.xml index 4323289da0f..17a4deb868b 100644 --- a/core/model/pom.xml +++ b/core/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model RDF4J: Model diff --git a/core/pom.xml b/core/pom.xml index dfdb2f84966..ed94faedcde 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-core pom diff --git a/core/query/pom.xml b/core/query/pom.xml index 8b1f374544e..6600bd51a4e 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-query RDF4J: Query diff --git a/core/queryalgebra/evaluation/pom.xml b/core/queryalgebra/evaluation/pom.xml index 558421515d8..a29c5f1ab29 100644 --- a/core/queryalgebra/evaluation/pom.xml +++ b/core/queryalgebra/evaluation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-evaluation RDF4J: Query algebra - evaluation diff --git a/core/queryalgebra/geosparql/pom.xml b/core/queryalgebra/geosparql/pom.xml index 464d27ce157..10fcbc837ce 100644 --- a/core/queryalgebra/geosparql/pom.xml +++ b/core/queryalgebra/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-geosparql RDF4J: Query algebra - GeoSPARQL diff --git a/core/queryalgebra/model/pom.xml b/core/queryalgebra/model/pom.xml index ce8d3ac617f..c561441a066 100644 --- a/core/queryalgebra/model/pom.xml +++ b/core/queryalgebra/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-model RDF4J: Query algebra - model diff --git a/core/queryalgebra/pom.xml b/core/queryalgebra/pom.xml index 0f7bead1a49..fb04d8339cd 100644 --- a/core/queryalgebra/pom.xml +++ b/core/queryalgebra/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra pom diff --git a/core/queryparser/api/pom.xml b/core/queryparser/api/pom.xml index 4b9a1cbacb9..6450c375f42 100644 --- a/core/queryparser/api/pom.xml +++ b/core/queryparser/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-api RDF4J: Query parser - API diff --git a/core/queryparser/pom.xml b/core/queryparser/pom.xml index 57934177bd0..0dfcb8573d3 100644 --- a/core/queryparser/pom.xml +++ b/core/queryparser/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser pom diff --git a/core/queryparser/sparql/pom.xml b/core/queryparser/sparql/pom.xml index 7faa7333166..d21ecf2b1b2 100644 --- a/core/queryparser/sparql/pom.xml +++ b/core/queryparser/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-sparql RDF4J: Query parser - SPARQL diff --git a/core/queryrender/pom.xml b/core/queryrender/pom.xml index ce5bc768435..8db12169a80 100644 --- a/core/queryrender/pom.xml +++ b/core/queryrender/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryrender RDF4J: Query Rendering diff --git a/core/queryresultio/api/pom.xml b/core/queryresultio/api/pom.xml index 523f4037078..273fe3b9801 100644 --- a/core/queryresultio/api/pom.xml +++ b/core/queryresultio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-api RDF4J: Query result IO - API diff --git a/core/queryresultio/binary/pom.xml b/core/queryresultio/binary/pom.xml index 0c8de380987..34df6c0b64f 100644 --- a/core/queryresultio/binary/pom.xml +++ b/core/queryresultio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-binary RDF4J: Query result IO - binary diff --git a/core/queryresultio/pom.xml b/core/queryresultio/pom.xml index 10f949b5493..c1ba95a8c53 100644 --- a/core/queryresultio/pom.xml +++ b/core/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio pom diff --git a/core/queryresultio/sparqljson/pom.xml b/core/queryresultio/sparqljson/pom.xml index 1fe82dc1aaa..c5f589b6457 100644 --- a/core/queryresultio/sparqljson/pom.xml +++ b/core/queryresultio/sparqljson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqljson RDF4J: Query result IO - SPARQL/JSON diff --git a/core/queryresultio/sparqlxml/pom.xml b/core/queryresultio/sparqlxml/pom.xml index 19aeb0ef536..8d7bee2745b 100644 --- a/core/queryresultio/sparqlxml/pom.xml +++ b/core/queryresultio/sparqlxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqlxml RDF4J: Query result IO - SPARQL/XML diff --git a/core/queryresultio/text/pom.xml b/core/queryresultio/text/pom.xml index f464cddf491..e5f67e0b32e 100644 --- a/core/queryresultio/text/pom.xml +++ b/core/queryresultio/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-text RDF4J: Query result IO - plain text booleans diff --git a/core/repository/api/pom.xml b/core/repository/api/pom.xml index 6f5e94a505f..48fdeecfad7 100644 --- a/core/repository/api/pom.xml +++ b/core/repository/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-api RDF4J: Repository - API diff --git a/core/repository/contextaware/pom.xml b/core/repository/contextaware/pom.xml index dee3dbfeea9..39bcbf0668c 100644 --- a/core/repository/contextaware/pom.xml +++ b/core/repository/contextaware/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-contextaware RDF4J: Repository - context aware (wrapper) diff --git a/core/repository/dataset/pom.xml b/core/repository/dataset/pom.xml index d5bf8ba4979..c843dccda42 100644 --- a/core/repository/dataset/pom.xml +++ b/core/repository/dataset/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-dataset RDF4J: DatasetRepository (wrapper) diff --git a/core/repository/event/pom.xml b/core/repository/event/pom.xml index ec719dad3f5..3a3109cf967 100644 --- a/core/repository/event/pom.xml +++ b/core/repository/event/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-event RDF4J: Repository - event (wrapper) diff --git a/core/repository/http/pom.xml b/core/repository/http/pom.xml index 526becc1b17..4fc07dc06e9 100644 --- a/core/repository/http/pom.xml +++ b/core/repository/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-http RDF4J: HTTPRepository diff --git a/core/repository/manager/pom.xml b/core/repository/manager/pom.xml index 4f81638f7a3..bad53d7101e 100644 --- a/core/repository/manager/pom.xml +++ b/core/repository/manager/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-manager RDF4J: Repository manager diff --git a/core/repository/pom.xml b/core/repository/pom.xml index fa011b16913..873757a9580 100644 --- a/core/repository/pom.xml +++ b/core/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository pom diff --git a/core/repository/sail/pom.xml b/core/repository/sail/pom.xml index a5137e09479..fb8fc483b2b 100644 --- a/core/repository/sail/pom.xml +++ b/core/repository/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sail RDF4J: SailRepository diff --git a/core/repository/sparql/pom.xml b/core/repository/sparql/pom.xml index 47b218d83c2..66d5ee263ce 100644 --- a/core/repository/sparql/pom.xml +++ b/core/repository/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sparql RDF4J: SPARQL Repository diff --git a/core/rio/api/pom.xml b/core/rio/api/pom.xml index 7350f046f8b..4e5df955433 100644 --- a/core/rio/api/pom.xml +++ b/core/rio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-api RDF4J: Rio - API diff --git a/core/rio/binary/pom.xml b/core/rio/binary/pom.xml index 4f0a0a2e72c..4ff5469eddf 100644 --- a/core/rio/binary/pom.xml +++ b/core/rio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-binary RDF4J: Rio - Binary diff --git a/core/rio/datatypes/pom.xml b/core/rio/datatypes/pom.xml index edaeab114c5..b9d9dcadcfb 100644 --- a/core/rio/datatypes/pom.xml +++ b/core/rio/datatypes/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-datatypes RDF4J: Rio - Datatypes diff --git a/core/rio/hdt/pom.xml b/core/rio/hdt/pom.xml index 45ed4643013..f3647663a65 100644 --- a/core/rio/hdt/pom.xml +++ b/core/rio/hdt/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-hdt jar diff --git a/core/rio/jsonld-legacy/pom.xml b/core/rio/jsonld-legacy/pom.xml index f124d9d565a..7509ef4b834 100644 --- a/core/rio/jsonld-legacy/pom.xml +++ b/core/rio/jsonld-legacy/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld-legacy RDF4J: Rio - JSON-LD 1.0 (legacy) diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml index 307928c78a8..c817e4db0af 100644 --- a/core/rio/jsonld/pom.xml +++ b/core/rio/jsonld/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld RDF4J: Rio - JSON-LD diff --git a/core/rio/languages/pom.xml b/core/rio/languages/pom.xml index 5d9fbbc82cf..b35931702bb 100644 --- a/core/rio/languages/pom.xml +++ b/core/rio/languages/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-languages RDF4J: Rio - Languages diff --git a/core/rio/n3/pom.xml b/core/rio/n3/pom.xml index 086faa4a881..54ae5fe573c 100644 --- a/core/rio/n3/pom.xml +++ b/core/rio/n3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-n3 RDF4J: Rio - N3 (writer-only) diff --git a/core/rio/nquads/pom.xml b/core/rio/nquads/pom.xml index 3f1c815ea1f..044216524fb 100644 --- a/core/rio/nquads/pom.xml +++ b/core/rio/nquads/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-nquads RDF4J: Rio - N-Quads diff --git a/core/rio/ntriples/pom.xml b/core/rio/ntriples/pom.xml index bdfa2c5c34d..37553504ed5 100644 --- a/core/rio/ntriples/pom.xml +++ b/core/rio/ntriples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-ntriples RDF4J: Rio - N-Triples diff --git a/core/rio/pom.xml b/core/rio/pom.xml index 20f4a146db8..77fc1cee292 100644 --- a/core/rio/pom.xml +++ b/core/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio pom diff --git a/core/rio/rdfjson/pom.xml b/core/rio/rdfjson/pom.xml index b3c99b526c0..55a3e3ad374 100644 --- a/core/rio/rdfjson/pom.xml +++ b/core/rio/rdfjson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfjson RDF4J: Rio - RDF/JSON diff --git a/core/rio/rdfxml/pom.xml b/core/rio/rdfxml/pom.xml index 4ee3855e9eb..08a1e0f6eb3 100644 --- a/core/rio/rdfxml/pom.xml +++ b/core/rio/rdfxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfxml RDF4J: Rio - RDF/XML diff --git a/core/rio/trig/pom.xml b/core/rio/trig/pom.xml index fb896d2a4c7..2736b12a916 100644 --- a/core/rio/trig/pom.xml +++ b/core/rio/trig/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trig RDF4J: Rio - TriG diff --git a/core/rio/trix/pom.xml b/core/rio/trix/pom.xml index bfe2cecbb9e..a8b99df7634 100644 --- a/core/rio/trix/pom.xml +++ b/core/rio/trix/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trix RDF4J: Rio - TriX diff --git a/core/rio/turtle/pom.xml b/core/rio/turtle/pom.xml index cbca8b7e028..087f4221601 100644 --- a/core/rio/turtle/pom.xml +++ b/core/rio/turtle/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-turtle RDF4J: Rio - Turtle diff --git a/core/sail/api/pom.xml b/core/sail/api/pom.xml index d8f587ff031..94ba13deba0 100644 --- a/core/sail/api/pom.xml +++ b/core/sail/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-api RDF4J: Sail API diff --git a/core/sail/base/pom.xml b/core/sail/base/pom.xml index 6a5ce26a073..37f440d24a5 100644 --- a/core/sail/base/pom.xml +++ b/core/sail/base/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-base RDF4J: Sail base implementations diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml index f70f57eac39..8542f4a1aaa 100644 --- a/core/sail/elasticsearch-store/pom.xml +++ b/core/sail/elasticsearch-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch-store RDF4J: Elasticsearch Store diff --git a/core/sail/elasticsearch/pom.xml b/core/sail/elasticsearch/pom.xml index b8c924bcf9f..022319c4697 100644 --- a/core/sail/elasticsearch/pom.xml +++ b/core/sail/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch RDF4J: Elastic Search Sail Index diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml index 2d3dfb48f26..e8d6a1af491 100644 --- a/core/sail/extensible-store/pom.xml +++ b/core/sail/extensible-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-extensible-store RDF4J: Extensible Store diff --git a/core/sail/inferencer/pom.xml b/core/sail/inferencer/pom.xml index 65e703e294b..45babf4a3e2 100644 --- a/core/sail/inferencer/pom.xml +++ b/core/sail/inferencer/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-inferencer RDF4J: Inferencer Sails diff --git a/core/sail/lmdb/pom.xml b/core/sail/lmdb/pom.xml index d7a390cf398..9a494fe3521 100644 --- a/core/sail/lmdb/pom.xml +++ b/core/sail/lmdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lmdb RDF4J: LmdbStore diff --git a/core/sail/lucene-api/pom.xml b/core/sail/lucene-api/pom.xml index 6ad91c3466b..a52d440fc00 100644 --- a/core/sail/lucene-api/pom.xml +++ b/core/sail/lucene-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene-api RDF4J: Lucene Sail API diff --git a/core/sail/lucene/pom.xml b/core/sail/lucene/pom.xml index cca97cf1670..530c6ac3c5d 100644 --- a/core/sail/lucene/pom.xml +++ b/core/sail/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene RDF4J: Lucene Sail Index diff --git a/core/sail/memory/pom.xml b/core/sail/memory/pom.xml index 40795682b14..ae81a8c5531 100644 --- a/core/sail/memory/pom.xml +++ b/core/sail/memory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-memory RDF4J: MemoryStore diff --git a/core/sail/model/pom.xml b/core/sail/model/pom.xml index 1b6705b9a54..531c473d10a 100644 --- a/core/sail/model/pom.xml +++ b/core/sail/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-model RDF4J: Sail Model diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml index 2d6cf29e4f6..17dbcc1c962 100644 --- a/core/sail/nativerdf/pom.xml +++ b/core/sail/nativerdf/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-nativerdf RDF4J: NativeStore diff --git a/core/sail/pom.xml b/core/sail/pom.xml index aaaab64c8df..cbce9f38bc7 100644 --- a/core/sail/pom.xml +++ b/core/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail pom diff --git a/core/sail/shacl/pom.xml b/core/sail/shacl/pom.xml index db99b43fde0..9cae94fe046 100644 --- a/core/sail/shacl/pom.xml +++ b/core/sail/shacl/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-shacl RDF4J: SHACL diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml index 388516095cc..831a688cf4a 100644 --- a/core/sail/solr/pom.xml +++ b/core/sail/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-solr RDF4J: Solr Sail Index diff --git a/core/sparqlbuilder/pom.xml b/core/sparqlbuilder/pom.xml index 236fbed5692..2e589196e67 100644 --- a/core/sparqlbuilder/pom.xml +++ b/core/sparqlbuilder/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparqlbuilder RDF4J: SparqlBuilder diff --git a/core/spin/pom.xml b/core/spin/pom.xml index b2bdb3eacd2..b80e9d40e04 100644 --- a/core/spin/pom.xml +++ b/core/spin/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spin RDF4J: SPIN diff --git a/core/storage/pom.xml b/core/storage/pom.xml index b054e9cd3d9..6775e4bf837 100644 --- a/core/storage/pom.xml +++ b/core/storage/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-storage RDF4J: Storage Libraries diff --git a/examples/pom.xml b/examples/pom.xml index 5dea31006fc..5610e589454 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1eb77883fc4..ef4f7819836 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT pom Eclipse RDF4J An extensible Java framework for RDF and SPARQL diff --git a/spring-components/pom.xml b/spring-components/pom.xml index 31041304a02..571eebb5bce 100644 --- a/spring-components/pom.xml +++ b/spring-components/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT pom diff --git a/spring-components/rdf4j-spring-demo/pom.xml b/spring-components/rdf4j-spring-demo/pom.xml index b20cb1a8a6f..e3376a0dd51 100644 --- a/spring-components/rdf4j-spring-demo/pom.xml +++ b/spring-components/rdf4j-spring-demo/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/spring-components/rdf4j-spring/pom.xml b/spring-components/rdf4j-spring/pom.xml index e31751c4000..b3616e04951 100644 --- a/spring-components/rdf4j-spring/pom.xml +++ b/spring-components/rdf4j-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring RDF4J: Spring diff --git a/spring-components/spring-boot-sparql-web/pom.xml b/spring-components/spring-boot-sparql-web/pom.xml index 9dc6077ce9b..222e9020799 100644 --- a/spring-components/spring-boot-sparql-web/pom.xml +++ b/spring-components/spring-boot-sparql-web/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring-boot-sparql-web RDF4J: Spring boot component for a HTTP sparql server diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml index dde06f998ef..d2d51f0daa4 100644 --- a/testsuites/benchmark/pom.xml +++ b/testsuites/benchmark/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-benchmark RDF4J: benchmarks diff --git a/testsuites/geosparql/pom.xml b/testsuites/geosparql/pom.xml index 0de310cbff7..3ebb0735c3e 100644 --- a/testsuites/geosparql/pom.xml +++ b/testsuites/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-testsuite RDF4J: GeoSPARQL compliance test suite diff --git a/testsuites/lucene/pom.xml b/testsuites/lucene/pom.xml index 54ca053cb42..cf0c02226d8 100644 --- a/testsuites/lucene/pom.xml +++ b/testsuites/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-testsuite RDF4J: Lucene Sail Tests diff --git a/testsuites/model/pom.xml b/testsuites/model/pom.xml index 10c80a03c58..cc4dc7ab767 100644 --- a/testsuites/model/pom.xml +++ b/testsuites/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-testsuite RDF4J: Model API testsuite diff --git a/testsuites/pom.xml b/testsuites/pom.xml index ceb1534de51..42088f21a4d 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-testsuites pom diff --git a/testsuites/queryresultio/pom.xml b/testsuites/queryresultio/pom.xml index 586d2ffe869..feaf586b953 100644 --- a/testsuites/queryresultio/pom.xml +++ b/testsuites/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-testsuite RDF4J: QueryResultIO testsuite diff --git a/testsuites/repository/pom.xml b/testsuites/repository/pom.xml index 9ebe1e664c8..d58184a0a20 100644 --- a/testsuites/repository/pom.xml +++ b/testsuites/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-testsuite RDF4J: Repository API testsuite diff --git a/testsuites/rio/pom.xml b/testsuites/rio/pom.xml index 5f9b33a5dbe..8bab2f967d5 100644 --- a/testsuites/rio/pom.xml +++ b/testsuites/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-testsuite RDF4J: Rio compliance test suite diff --git a/testsuites/sail/pom.xml b/testsuites/sail/pom.xml index a906f013566..4b9b7d6c2d1 100644 --- a/testsuites/sail/pom.xml +++ b/testsuites/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-testsuite RDF4J: Sail API testsuite diff --git a/testsuites/sparql/pom.xml b/testsuites/sparql/pom.xml index 2eadfeb06d7..6d81c721943 100644 --- a/testsuites/sparql/pom.xml +++ b/testsuites/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-testsuite RDF4J: SPARQL compliance test suite diff --git a/tools/config/pom.xml b/tools/config/pom.xml index 61ef3408b09..c6e819ebcc0 100644 --- a/tools/config/pom.xml +++ b/tools/config/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-config RDF4J: application configuration diff --git a/tools/console/pom.xml b/tools/console/pom.xml index 1d05b2bc660..a342f03ad96 100644 --- a/tools/console/pom.xml +++ b/tools/console/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-console RDF4J: Console diff --git a/tools/federation/pom.xml b/tools/federation/pom.xml index d31678113c1..7a8daf55286 100644 --- a/tools/federation/pom.xml +++ b/tools/federation/pom.xml @@ -8,7 +8,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index e5b8cae42e0..08778066c03 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-tools pom diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml index 8c5e906fae2..642959844af 100644 --- a/tools/runtime-osgi/pom.xml +++ b/tools/runtime-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime-osgi bundle diff --git a/tools/runtime/pom.xml b/tools/runtime/pom.xml index 6900e951f03..ccb07aa2992 100644 --- a/tools/runtime/pom.xml +++ b/tools/runtime/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime RDF4J: Runtime diff --git a/tools/server-spring/pom.xml b/tools/server-spring/pom.xml index d2ee6ff0d1c..a3cba434f29 100644 --- a/tools/server-spring/pom.xml +++ b/tools/server-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server-spring RDF4J: HTTP server - core diff --git a/tools/server/pom.xml b/tools/server/pom.xml index 9d21d2969d2..5e6fc517570 100644 --- a/tools/server/pom.xml +++ b/tools/server/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server war diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml index 4276baac5b7..cabca3a9a48 100644 --- a/tools/workbench/pom.xml +++ b/tools/workbench/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-workbench war From a900175117fd6d0f6a112eb0b5946f9bebfd1747 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Sat, 1 Jun 2024 15:10:02 +0200 Subject: [PATCH 02/37] GH-4997: Enable SparqlBuilder to create VALUES clauses --- .../sparqlbuilder/constraint/Values.java | 217 ++++++++++++++++++ .../rdf4j/sparqlbuilder/core/query/Query.java | 12 +- .../graphpattern/GraphPattern.java | 9 + .../sparqlbuilder/examples/BaseExamples.java | 5 +- .../examples/sparql11spec/Section10Test.java | 153 ++++++++++++ site/themes/hugo-solstice-theme | 2 +- 6 files changed, 392 insertions(+), 6 deletions(-) create mode 100644 core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/Values.java create mode 100644 core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/sparql11spec/Section10Test.java diff --git a/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/Values.java b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/Values.java new file mode 100644 index 00000000000..e994c0ca8b8 --- /dev/null +++ b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/Values.java @@ -0,0 +1,217 @@ +/******************************************************************************* + * Copyright (c) 2024 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 + *******************************************************************************/ +package org.eclipse.rdf4j.sparqlbuilder.constraint; + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.sparqlbuilder.core.Variable; +import org.eclipse.rdf4j.sparqlbuilder.graphpattern.GraphPattern; +import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf; +import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfValue; + +public class Values implements GraphPattern { + Variable[] variables; + RdfValue[][] solutionSequence; + + private static final RdfValue UNDEF = new RdfValue() { + @Override + public String getQueryString() { + return "UNDEF"; + } + }; + + public Values(Variable[] variables, RdfValue[][] solutionSequence) { + Objects.requireNonNull(solutionSequence); + Objects.requireNonNull(solutionSequence); + if (variables.length == 0) { + throw new IllegalArgumentException("no variables provided for VALUES clause"); + } + if (solutionSequence.length == 0 + || solutionSequence[0] == null + || solutionSequence[0].length == 0) { + throw new IllegalArgumentException("no values provided for VALUES clause"); + } + if (solutionSequence[0].length != variables.length) { + throw new IllegalArgumentException( + solutionSequence[0].length + + " values provided for " + + variables.length + + variables); + } + this.solutionSequence = solutionSequence; + this.variables = variables; + } + + @Override + public String getQueryString() { + StringBuilder sb = new StringBuilder(); + String parOpen = this.variables.length > 1 ? "( " : ""; + String parClose = this.variables.length > 1 ? ") " : ""; + sb.append("VALUES ").append(parOpen); + for (int i = 0; i < variables.length; i++) { + sb.append(variables[i].getQueryString()).append(" "); + } + sb.append(parClose).append("{").append(System.lineSeparator()); + for (int i = 0; i < solutionSequence.length; i++) { + sb.append(" ").append(parOpen); + for (int j = 0; j < solutionSequence[i].length; j++) { + sb.append(solutionSequence[i][j].getQueryString()).append(" "); + } + sb.append(parClose).append(System.lineSeparator()); + } + sb.append("}").append(System.lineSeparator()); + return sb.toString(); + } + + public static VariablesBuilder builder() { + return new Builder(); + } + + public static class Builder implements VariablesBuilder, ValuesBuilder { + public Builder() { + } + + private List variables = new ArrayList<>(); + + private List> values = new ArrayList<>(); + + private List currentValues = new ArrayList<>(); + + @Override + public VariablesBuilder variables(Variable... variable) { + Arrays.stream(variable).forEach(this.variables::add); + return this; + } + + /** + * Provide another value. This will fill up the current solution sequence. If this value is the last one (i.e. + * the solution sequence now is of the same length as the list of variables), the current solution sequence is + * recorded and a new solution sequence begins. + * + * @param value + * @return + */ + @Override + public ValuesBuilder value(RdfValue value) { + this.currentValues.add(valueOrUndef(value)); + if (currentValues.size() >= variables.size()) { + this.values.add(currentValues); + currentValues = new ArrayList<>(); + } + return this; + } + + @Override + public ValuesBuilder values(RdfValue... values) { + if (this.variables.size() == 1) { + for (int i = 0; i < values.length; i++) { + this.values.add(List.of(valueOrUndef(values[i]))); + } + } else if (this.variables.size() == values.length) { + this.values.add(Stream.of(values).map(Values::valueOrUndef).collect(Collectors.toList())); + } else { + throw new IllegalArgumentException( + "Provided list of values must match length of variables, or there must be only one variable."); + } + return this; + } + + @Override + public ValuesBuilder values(Collection values) { + return values(values.toArray(i -> new RdfValue[i])); + } + + @Override + public ValuesBuilder iriValue(IRI value) { + return value(Rdf.iri(value)); + } + + @Override + public ValuesBuilder iriValues(IRI... values) { + return values(Stream.of(values).map(Rdf::iri).toArray(i -> new RdfValue[i])); + } + + @Override + public ValuesBuilder iriValues(Collection values) { + return iriValues(values.toArray(i -> new IRI[i])); + } + + @Override + public Values build() { + if (this.values.isEmpty()) { + throw new IllegalArgumentException("No values provided"); + } + if (!this.currentValues.isEmpty()) { + throw new IllegalArgumentException( + "Current solution sequence is not finished - you added too few or too many values."); + } + RdfValue[][] values = new RdfValue[this.values.size()][this.variables.size()]; + for (int i = 0; i < this.values.size(); i++) { + List current = this.values.get(i); + if (current.size() != this.variables.size()) { + throw new IllegalArgumentException( + String.format( + "You provided $d values for $d variables", + current.size(), + this.variables.size())); + } + for (int j = 0; j < current.size(); j++) { + values[i][j] = current.get(j); + } + } + return new Values(this.variables.toArray(size -> new Variable[size]), values); + } + } + + public interface VariablesBuilder { + + public VariablesBuilder variables(Variable... variable); + + public ValuesBuilder value(RdfValue value); + + public ValuesBuilder values(RdfValue... values); + + public ValuesBuilder values(Collection values); + + public ValuesBuilder iriValue(IRI value); + + public ValuesBuilder iriValues(IRI... values); + + public ValuesBuilder iriValues(Collection values); + } + + public interface ValuesBuilder { + public ValuesBuilder value(RdfValue value); + + public ValuesBuilder values(RdfValue... values); + + public ValuesBuilder values(Collection values); + + public ValuesBuilder iriValue(IRI value); + + public ValuesBuilder iriValues(IRI... values); + + public ValuesBuilder iriValues(Collection values); + + public Values build(); + } + + private static RdfValue valueOrUndef(RdfValue value) { + if (value == null) { + return UNDEF; + } + return value; + } + +} diff --git a/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/core/query/Query.java b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/core/query/Query.java index 88992a7e152..ff56465530f 100644 --- a/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/core/query/Query.java +++ b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/core/query/Query.java @@ -12,8 +12,10 @@ package org.eclipse.rdf4j.sparqlbuilder.core.query; import java.util.Optional; +import java.util.function.Consumer; import org.eclipse.rdf4j.sparqlbuilder.constraint.Expression; +import org.eclipse.rdf4j.sparqlbuilder.constraint.Values; import org.eclipse.rdf4j.sparqlbuilder.core.Dataset; import org.eclipse.rdf4j.sparqlbuilder.core.From; import org.eclipse.rdf4j.sparqlbuilder.core.GroupBy; @@ -45,6 +47,7 @@ public abstract class Query> implements QueryElement { protected Optional groupBy = Optional.empty(); protected Optional orderBy = Optional.empty(); protected Optional having = Optional.empty(); + protected Optional values = Optional.empty(); protected int limit = -1, offset = -1, varCount = -1, bnodeCount = -1; /** @@ -201,6 +204,13 @@ public T offset(int offset) { return (T) this; } + public T values(Consumer valuesConfigurer) { + Values.Builder builder = (Values.Builder) Values.builder(); + valuesConfigurer.accept(builder); + this.values = Optional.of(builder.build()); + return (T) this; + } + /** * A shortcut. Each call to this method returns a new {@link Variable} that is unique (i.e., has a unique alias) to * this query instance. @@ -246,7 +256,7 @@ public String getQueryString() { if (offset >= 0) { query.append(OFFSET + " ").append(offset).append("\n"); } - + SparqlBuilderUtils.appendAndNewlineIfPresent(values, query); return query.toString(); } } diff --git a/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/graphpattern/GraphPattern.java b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/graphpattern/GraphPattern.java index 2dc8c7d680c..8be610acf3e 100644 --- a/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/graphpattern/GraphPattern.java +++ b/core/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/graphpattern/GraphPattern.java @@ -11,7 +11,10 @@ package org.eclipse.rdf4j.sparqlbuilder.graphpattern; +import java.util.function.Consumer; + import org.eclipse.rdf4j.sparqlbuilder.constraint.Expression; +import org.eclipse.rdf4j.sparqlbuilder.constraint.Values; import org.eclipse.rdf4j.sparqlbuilder.core.QueryElement; /** @@ -42,6 +45,12 @@ default GraphPattern and(GraphPattern... patterns) { return GraphPatterns.and(this).and(patterns); } + default GraphPattern values(Consumer valuesConfigurer) { + Values.Builder valuesBuilder = (Values.Builder) Values.builder(); + valuesConfigurer.accept(valuesBuilder); + return GraphPatterns.and(this).and(valuesBuilder.build()); + } + /** * Convert this graph pattern into an alternative graph pattern, combining this graph pattern with the given * patterns:
diff --git a/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/BaseExamples.java b/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/BaseExamples.java index 69c22345e30..6b7ad53aeaf 100644 --- a/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/BaseExamples.java +++ b/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/BaseExamples.java @@ -90,10 +90,7 @@ public boolean matches(Object item) { @Override public void describeTo(Description description) { description.appendText( - "To match the following String after lowercasing, removal of newlines and whitespaces.\n"); - description.appendText("\nHint: first difference: " + aroundString + "\n"); - description.appendText( - "Expected: was \"" + expected.replaceAll("\n", "\\\\n").replaceAll("\\s+", " ") + "\""); + "\"" + expected + "\" (ignoring case, whitespace and newlines)"); } }); } diff --git a/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/sparql11spec/Section10Test.java b/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/sparql11spec/Section10Test.java new file mode 100644 index 00000000000..ed429c169d5 --- /dev/null +++ b/core/sparqlbuilder/src/test/java/org/eclipse/rdf4j/sparqlbuilder/examples/sparql11spec/Section10Test.java @@ -0,0 +1,153 @@ +/******************************************************************************* + * Copyright (c) 2024 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 + *******************************************************************************/ +package org.eclipse.rdf4j.sparqlbuilder.examples.sparql11spec; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.eclipse.rdf4j.sparqlbuilder.constraint.Expressions.notEquals; +import static org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.prefix; +import static org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder.var; +import static org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf.iri; + +import org.eclipse.rdf4j.model.vocabulary.DC; +import org.eclipse.rdf4j.model.vocabulary.FOAF; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.sparqlbuilder.constraint.Expressions; +import org.eclipse.rdf4j.sparqlbuilder.constraint.Values; +import org.eclipse.rdf4j.sparqlbuilder.core.Prefix; +import org.eclipse.rdf4j.sparqlbuilder.core.SparqlBuilder; +import org.eclipse.rdf4j.sparqlbuilder.core.Variable; +import org.eclipse.rdf4j.sparqlbuilder.core.query.Queries; +import org.eclipse.rdf4j.sparqlbuilder.examples.BaseExamples; +import org.eclipse.rdf4j.sparqlbuilder.graphpattern.GraphPattern; +import org.eclipse.rdf4j.sparqlbuilder.graphpattern.TriplePattern; +import org.eclipse.rdf4j.sparqlbuilder.rdf.Iri; +import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf; +import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfObject; +import org.junit.jupiter.api.Test; + +public class Section10Test extends BaseExamples { + private final Prefix rdfs = SparqlBuilder.prefix("rdfs", iri(RDFS.NS.getName())); + private final Prefix dc = SparqlBuilder.prefix("dc", iri(DC_NS)); + private final Prefix foaf = SparqlBuilder.prefix("foaf", iri(FOAF_NS)); + private final Prefix base = SparqlBuilder.prefix("", iri("http://example/")); + private final Prefix ex = prefix("ex", iri("http://example/")); + private final Prefix rdf = prefix("rdf", iri(RDF.NAMESPACE)); + + private final Prefix prefixBook = prefix("", iri("http://example.org/book/")); + private final Prefix ns = prefix("ns", iri("http://example.org/ns#")); + private final Variable displayString = var("displayString"); + private final Variable x = var("x"); + + private final Variable book = var("book"); + private final Variable title = var("title"); + private final Variable price = var("price"); + + private final Variable name = var("name"); + private final Variable y = var("y"); + private final Variable z = var("z"); + private final Variable ancestor = var("ancestor"); + private final Variable type = var("type"); + private final Variable p = var("p"); + private final Variable v = var("v"); + private final Variable element = var("element"); + private final Variable s = var("s"); + private final Variable total = var("total"); + private final Variable person = var("person"); + private final Iri property = base.iri("property"); + private final Iri me = iri("#me"); + private final Iri thing = iri("http://example/thing"); + private final Iri book1 = base.iri("book1"); + private final Iri book3 = base.iri("book3"); + private final Iri order = base.iri("order"); + private final Iri mailto = iri("mailto:alice@example"); + private final Iri list = base.iri("list"); + + @Test + public void example_10_2_1__two_vars_two_solutions_one_undef() { + Values values = Values.builder() + .variables(x, y) + .values(base.iri("uri1"), Rdf.literalOf(1)) + .values(base.iri("uri2"), null) + .build(); + String str = values.getQueryString(); + assertThat(str).is(stringEqualsIgnoreCaseAndWhitespace( + "VALUES (?x ?y) {\n" + + " (:uri1 1)\n" + + " (:uri2 UNDEF)\n" + + "}" + )); + } + + @Test + public void example_10_2_1__one_var_two_solutions() { + Values values = Values.builder().variables(z).value(Rdf.literalOf("abc")).value(Rdf.literalOf("def")).build(); + String str = values.getQueryString(); + assertThat(str).is(stringEqualsIgnoreCaseAndWhitespace( + "VALUES ?z { \"abc\" \"def\" }" + )); + } + + @Test + public void example_10_2_2__values__in__graphpattern() { + String str = Queries.SELECT(book, title, price) + .prefix(dc, prefixBook, ns) + .where(Values.builder() + .variables(book) + .values(book1, book3) + .build() + .and(book.has(dc.iri("title"), title) + .andHas(ns.iri("price"), price))) + .getQueryString(); + assertThat(str).is(stringEqualsIgnoreCaseAndWhitespace( + "PREFIX dc: \n" + + "\tPREFIX : \n" + + "\tPREFIX ns: \n" + + "\n" + + "\tSELECT ?book ?title ?price\n" + + "WHERE {\n" + + "\t\tVALUES ?book { :book1 :book3 }\n" + + " ?book dc:title ?title ;\n" + + "\t\tns:price ?price .\n" + + "\t}" + )); + } + + @Test + public void example_10_2_2__values__at__end() { + String str = Queries.SELECT(book, title, price) + .prefix(dc, prefixBook, ns) + .where(book.has(dc.iri("title"), title) + .andHas(ns.iri("price"), price)) + .values(v -> v + .variables(book, title) + .values(null, Rdf.literalOf("SPARQL Tutorial")) + .values(prefixBook.iri("book2"), null)) + .getQueryString(); + assertThat(str).is(stringEqualsIgnoreCaseAndWhitespace( + "PREFIX dc: \n" + + "PREFIX : \n" + + "PREFIX ns: \n" + + "\n" + + "SELECT ?book ?title ?price\n" + + "WHERE {\n" + + " ?book dc:title ?title ;\n" + + " ns:price ?price .\n" + + "}\n" + + "VALUES (?book ?title)\n" + + "{ (UNDEF \"SPARQL Tutorial\")\n" + + " (:book2 UNDEF)\n" + + "}" + )); + + } + +} diff --git a/site/themes/hugo-solstice-theme b/site/themes/hugo-solstice-theme index 4685672c230..2b762a0ed31 160000 --- a/site/themes/hugo-solstice-theme +++ b/site/themes/hugo-solstice-theme @@ -1 +1 @@ -Subproject commit 4685672c23094cdaffcbf05ca7b0b1d00c6028c8 +Subproject commit 2b762a0ed3195eb59cf56dd8160a8d8b00e24f36 From 70703fc9f0fc92796a66a48cf5d742af3504653a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Thu, 20 Jun 2024 17:59:57 +0200 Subject: [PATCH 03/37] set correct version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håvard Ottestad --- assembly-descriptors/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 2 +- compliance/elasticsearch/pom.xml | 2 +- compliance/geosparql/pom.xml | 2 +- compliance/lucene/pom.xml | 2 +- compliance/model/pom.xml | 2 +- compliance/pom.xml | 2 +- compliance/repository/pom.xml | 2 +- compliance/rio/pom.xml | 2 +- compliance/solr/pom.xml | 2 +- compliance/sparql/pom.xml | 2 +- core/client/pom.xml | 2 +- core/collection-factory/api/pom.xml | 2 +- core/collection-factory/mapdb/pom.xml | 2 +- core/collection-factory/mapdb3/pom.xml | 2 +- core/collection-factory/pom.xml | 2 +- core/common/annotation/pom.xml | 2 +- core/common/exception/pom.xml | 2 +- core/common/io/pom.xml | 2 +- core/common/iterator/pom.xml | 2 +- core/common/order/pom.xml | 2 +- core/common/pom.xml | 2 +- core/common/text/pom.xml | 2 +- core/common/transaction/pom.xml | 2 +- core/common/xml/pom.xml | 2 +- core/http/client/pom.xml | 2 +- core/http/pom.xml | 2 +- core/http/protocol/pom.xml | 2 +- core/model-api/pom.xml | 2 +- core/model-vocabulary/pom.xml | 2 +- core/model/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/queryalgebra/evaluation/pom.xml | 2 +- core/queryalgebra/geosparql/pom.xml | 2 +- core/queryalgebra/model/pom.xml | 2 +- core/queryalgebra/pom.xml | 2 +- core/queryparser/api/pom.xml | 2 +- core/queryparser/pom.xml | 2 +- core/queryparser/sparql/pom.xml | 2 +- core/queryrender/pom.xml | 2 +- core/queryresultio/api/pom.xml | 2 +- core/queryresultio/binary/pom.xml | 2 +- core/queryresultio/pom.xml | 2 +- core/queryresultio/sparqljson/pom.xml | 2 +- core/queryresultio/sparqlxml/pom.xml | 2 +- core/queryresultio/text/pom.xml | 2 +- core/repository/api/pom.xml | 2 +- core/repository/contextaware/pom.xml | 2 +- core/repository/dataset/pom.xml | 2 +- core/repository/event/pom.xml | 2 +- core/repository/http/pom.xml | 2 +- core/repository/manager/pom.xml | 2 +- core/repository/pom.xml | 2 +- core/repository/sail/pom.xml | 2 +- core/repository/sparql/pom.xml | 2 +- core/rio/api/pom.xml | 2 +- core/rio/binary/pom.xml | 2 +- core/rio/datatypes/pom.xml | 2 +- core/rio/hdt/pom.xml | 2 +- core/rio/jsonld-legacy/pom.xml | 2 +- core/rio/jsonld/pom.xml | 2 +- core/rio/languages/pom.xml | 2 +- core/rio/n3/pom.xml | 2 +- core/rio/nquads/pom.xml | 2 +- core/rio/ntriples/pom.xml | 2 +- core/rio/pom.xml | 2 +- core/rio/rdfjson/pom.xml | 2 +- core/rio/rdfxml/pom.xml | 2 +- core/rio/trig/pom.xml | 2 +- core/rio/trix/pom.xml | 2 +- core/rio/turtle/pom.xml | 2 +- core/sail/api/pom.xml | 2 +- core/sail/base/pom.xml | 2 +- core/sail/elasticsearch-store/pom.xml | 2 +- core/sail/elasticsearch/pom.xml | 2 +- core/sail/extensible-store/pom.xml | 2 +- core/sail/inferencer/pom.xml | 2 +- core/sail/lmdb/pom.xml | 2 +- core/sail/lucene-api/pom.xml | 2 +- core/sail/lucene/pom.xml | 2 +- core/sail/memory/pom.xml | 2 +- core/sail/model/pom.xml | 2 +- core/sail/nativerdf/pom.xml | 2 +- core/sail/pom.xml | 2 +- core/sail/shacl/pom.xml | 2 +- core/sail/solr/pom.xml | 2 +- core/sparqlbuilder/pom.xml | 2 +- core/spin/pom.xml | 2 +- core/storage/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- spring-components/pom.xml | 2 +- spring-components/rdf4j-spring-demo/pom.xml | 2 +- spring-components/rdf4j-spring/pom.xml | 2 +- spring-components/spring-boot-sparql-web/pom.xml | 2 +- testsuites/benchmark/pom.xml | 2 +- testsuites/geosparql/pom.xml | 2 +- testsuites/lucene/pom.xml | 2 +- testsuites/model/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/queryresultio/pom.xml | 2 +- testsuites/repository/pom.xml | 2 +- testsuites/rio/pom.xml | 2 +- testsuites/sail/pom.xml | 2 +- testsuites/sparql/pom.xml | 2 +- tools/config/pom.xml | 2 +- tools/console/pom.xml | 2 +- tools/federation/pom.xml | 2 +- tools/pom.xml | 2 +- tools/runtime-osgi/pom.xml | 2 +- tools/runtime/pom.xml | 2 +- tools/server-spring/pom.xml | 2 +- tools/server/pom.xml | 2 +- tools/workbench/pom.xml | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/assembly-descriptors/pom.xml b/assembly-descriptors/pom.xml index 82b0cf3d235..adb16157dc8 100644 --- a/assembly-descriptors/pom.xml +++ b/assembly-descriptors/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly-descriptors RDF4J: Assembly Descriptors diff --git a/assembly/pom.xml b/assembly/pom.xml index 07f9979c812..a88d567f0e5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly pom diff --git a/bom/pom.xml b/bom/pom.xml index 79916ecc533..f9a2a634d30 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-bom pom diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml index a0098c62770..794dacb7bd7 100644 --- a/compliance/elasticsearch/pom.xml +++ b/compliance/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-elasticsearch-compliance RDF4J: Elasticsearch Sail Tests diff --git a/compliance/geosparql/pom.xml b/compliance/geosparql/pom.xml index 98a482a35da..41e8785595b 100644 --- a/compliance/geosparql/pom.xml +++ b/compliance/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-compliance RDF4J: GeoSPARQL compliance tests diff --git a/compliance/lucene/pom.xml b/compliance/lucene/pom.xml index 68d0024e68a..dcf84054c6d 100644 --- a/compliance/lucene/pom.xml +++ b/compliance/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-compliance RDF4J: Lucene Sail Tests diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml index 775a32482ab..3d3ac105fa9 100644 --- a/compliance/model/pom.xml +++ b/compliance/model/pom.xml @@ -3,7 +3,7 @@ rdf4j-compliance org.eclipse.rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT 4.0.0 rdf4j-model-compliance diff --git a/compliance/pom.xml b/compliance/pom.xml index 67fbedd4230..7a3f7a3e7ff 100644 --- a/compliance/pom.xml +++ b/compliance/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-compliance pom diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml index 2086d25b124..069ade53eec 100644 --- a/compliance/repository/pom.xml +++ b/compliance/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-compliance war diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml index a0decc202a2..850062bf2f4 100644 --- a/compliance/rio/pom.xml +++ b/compliance/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-compliance RDF4J: Rio compliance tests diff --git a/compliance/solr/pom.xml b/compliance/solr/pom.xml index 2d8a77d73e2..454f5295ca6 100644 --- a/compliance/solr/pom.xml +++ b/compliance/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-solr-compliance RDF4J: Solr Sail Tests diff --git a/compliance/sparql/pom.xml b/compliance/sparql/pom.xml index 42008ecfdf3..3340661c18d 100644 --- a/compliance/sparql/pom.xml +++ b/compliance/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-compliance war diff --git a/core/client/pom.xml b/core/client/pom.xml index 83b3c43ec32..845360a26cc 100644 --- a/core/client/pom.xml +++ b/core/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-client RDF4J: Client Libraries diff --git a/core/collection-factory/api/pom.xml b/core/collection-factory/api/pom.xml index 6f810989f5c..5ba6df646b7 100644 --- a/core/collection-factory/api/pom.xml +++ b/core/collection-factory/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-api RDF4J: Collection Factory - API diff --git a/core/collection-factory/mapdb/pom.xml b/core/collection-factory/mapdb/pom.xml index 5553d014aef..c8e843b984e 100644 --- a/core/collection-factory/mapdb/pom.xml +++ b/core/collection-factory/mapdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb RDF4J: Collection Factory - Map DB backed diff --git a/core/collection-factory/mapdb3/pom.xml b/core/collection-factory/mapdb3/pom.xml index 0a463015a33..a00d4c8e811 100644 --- a/core/collection-factory/mapdb3/pom.xml +++ b/core/collection-factory/mapdb3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb3 RDF4J: Collection Factory - Map DB v3 backed diff --git a/core/collection-factory/pom.xml b/core/collection-factory/pom.xml index 2a8a5e59a07..bb1df7bb226 100644 --- a/core/collection-factory/pom.xml +++ b/core/collection-factory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory pom diff --git a/core/common/annotation/pom.xml b/core/common/annotation/pom.xml index 767c5eb176f..f5f53a65e21 100644 --- a/core/common/annotation/pom.xml +++ b/core/common/annotation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-annotation RDF4J: common annotation diff --git a/core/common/exception/pom.xml b/core/common/exception/pom.xml index 65db79b1eae..bbd533f1adf 100644 --- a/core/common/exception/pom.xml +++ b/core/common/exception/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-exception RDF4J: common exception diff --git a/core/common/io/pom.xml b/core/common/io/pom.xml index 0e8be0a7d68..f99f7f2af4e 100644 --- a/core/common/io/pom.xml +++ b/core/common/io/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-io RDF4J: common IO diff --git a/core/common/iterator/pom.xml b/core/common/iterator/pom.xml index 885a0e57294..c8b62012574 100644 --- a/core/common/iterator/pom.xml +++ b/core/common/iterator/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-iterator RDF4J: common iterators diff --git a/core/common/order/pom.xml b/core/common/order/pom.xml index fcb5c3c5b2a..5228081fc0e 100644 --- a/core/common/order/pom.xml +++ b/core/common/order/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-order RDF4J: common order diff --git a/core/common/pom.xml b/core/common/pom.xml index 3e7f726d0c4..fc821867500 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common pom diff --git a/core/common/text/pom.xml b/core/common/text/pom.xml index bb7ec77bd87..f26391a3d11 100644 --- a/core/common/text/pom.xml +++ b/core/common/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-text RDF4J: common text diff --git a/core/common/transaction/pom.xml b/core/common/transaction/pom.xml index 9d3f9c3aadb..2a327eba54c 100644 --- a/core/common/transaction/pom.xml +++ b/core/common/transaction/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-transaction RDF4J: common transaction diff --git a/core/common/xml/pom.xml b/core/common/xml/pom.xml index 9deab59516e..76184d6e127 100644 --- a/core/common/xml/pom.xml +++ b/core/common/xml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-xml RDF4J: common XML diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml index 5823b5a2c25..8e26e6c8d3f 100644 --- a/core/http/client/pom.xml +++ b/core/http/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-client RDF4J: HTTP client diff --git a/core/http/pom.xml b/core/http/pom.xml index 39ced0c2c00..ee3e0261ad0 100644 --- a/core/http/pom.xml +++ b/core/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http pom diff --git a/core/http/protocol/pom.xml b/core/http/protocol/pom.xml index 56d2ef2d7df..a5d66a693e0 100644 --- a/core/http/protocol/pom.xml +++ b/core/http/protocol/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-protocol RDF4J: HTTP protocol diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml index 58aab5e4744..cf07e38798c 100644 --- a/core/model-api/pom.xml +++ b/core/model-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-api RDF4J: Model API diff --git a/core/model-vocabulary/pom.xml b/core/model-vocabulary/pom.xml index 2d13366a736..bd27791c1d8 100644 --- a/core/model-vocabulary/pom.xml +++ b/core/model-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-vocabulary RDF4J: RDF Vocabularies diff --git a/core/model/pom.xml b/core/model/pom.xml index 005024521c6..17a4deb868b 100644 --- a/core/model/pom.xml +++ b/core/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model RDF4J: Model diff --git a/core/pom.xml b/core/pom.xml index 6d214c405c3..ed94faedcde 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-core pom diff --git a/core/query/pom.xml b/core/query/pom.xml index d8c876415f0..6600bd51a4e 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-query RDF4J: Query diff --git a/core/queryalgebra/evaluation/pom.xml b/core/queryalgebra/evaluation/pom.xml index 5b8f2d70f69..a29c5f1ab29 100644 --- a/core/queryalgebra/evaluation/pom.xml +++ b/core/queryalgebra/evaluation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-evaluation RDF4J: Query algebra - evaluation diff --git a/core/queryalgebra/geosparql/pom.xml b/core/queryalgebra/geosparql/pom.xml index 279a38d01f3..10fcbc837ce 100644 --- a/core/queryalgebra/geosparql/pom.xml +++ b/core/queryalgebra/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-geosparql RDF4J: Query algebra - GeoSPARQL diff --git a/core/queryalgebra/model/pom.xml b/core/queryalgebra/model/pom.xml index b14f3503292..c561441a066 100644 --- a/core/queryalgebra/model/pom.xml +++ b/core/queryalgebra/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-model RDF4J: Query algebra - model diff --git a/core/queryalgebra/pom.xml b/core/queryalgebra/pom.xml index b043f6104c7..fb04d8339cd 100644 --- a/core/queryalgebra/pom.xml +++ b/core/queryalgebra/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra pom diff --git a/core/queryparser/api/pom.xml b/core/queryparser/api/pom.xml index a57df203f24..6450c375f42 100644 --- a/core/queryparser/api/pom.xml +++ b/core/queryparser/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-api RDF4J: Query parser - API diff --git a/core/queryparser/pom.xml b/core/queryparser/pom.xml index fed26862f3b..0dfcb8573d3 100644 --- a/core/queryparser/pom.xml +++ b/core/queryparser/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser pom diff --git a/core/queryparser/sparql/pom.xml b/core/queryparser/sparql/pom.xml index 3356aeadcd2..d21ecf2b1b2 100644 --- a/core/queryparser/sparql/pom.xml +++ b/core/queryparser/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-sparql RDF4J: Query parser - SPARQL diff --git a/core/queryrender/pom.xml b/core/queryrender/pom.xml index 22c86d521dd..8db12169a80 100644 --- a/core/queryrender/pom.xml +++ b/core/queryrender/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryrender RDF4J: Query Rendering diff --git a/core/queryresultio/api/pom.xml b/core/queryresultio/api/pom.xml index f1ebf98ff71..273fe3b9801 100644 --- a/core/queryresultio/api/pom.xml +++ b/core/queryresultio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-api RDF4J: Query result IO - API diff --git a/core/queryresultio/binary/pom.xml b/core/queryresultio/binary/pom.xml index 8f295cfb4c1..34df6c0b64f 100644 --- a/core/queryresultio/binary/pom.xml +++ b/core/queryresultio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-binary RDF4J: Query result IO - binary diff --git a/core/queryresultio/pom.xml b/core/queryresultio/pom.xml index ce42ffe6eba..c1ba95a8c53 100644 --- a/core/queryresultio/pom.xml +++ b/core/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio pom diff --git a/core/queryresultio/sparqljson/pom.xml b/core/queryresultio/sparqljson/pom.xml index f6f610256d8..c5f589b6457 100644 --- a/core/queryresultio/sparqljson/pom.xml +++ b/core/queryresultio/sparqljson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqljson RDF4J: Query result IO - SPARQL/JSON diff --git a/core/queryresultio/sparqlxml/pom.xml b/core/queryresultio/sparqlxml/pom.xml index e9611ee8acb..8d7bee2745b 100644 --- a/core/queryresultio/sparqlxml/pom.xml +++ b/core/queryresultio/sparqlxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqlxml RDF4J: Query result IO - SPARQL/XML diff --git a/core/queryresultio/text/pom.xml b/core/queryresultio/text/pom.xml index f3f6877bdaf..e5f67e0b32e 100644 --- a/core/queryresultio/text/pom.xml +++ b/core/queryresultio/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-text RDF4J: Query result IO - plain text booleans diff --git a/core/repository/api/pom.xml b/core/repository/api/pom.xml index 7ef6b60860e..48fdeecfad7 100644 --- a/core/repository/api/pom.xml +++ b/core/repository/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-api RDF4J: Repository - API diff --git a/core/repository/contextaware/pom.xml b/core/repository/contextaware/pom.xml index fcce28e86e1..39bcbf0668c 100644 --- a/core/repository/contextaware/pom.xml +++ b/core/repository/contextaware/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-contextaware RDF4J: Repository - context aware (wrapper) diff --git a/core/repository/dataset/pom.xml b/core/repository/dataset/pom.xml index d44a04e340c..c843dccda42 100644 --- a/core/repository/dataset/pom.xml +++ b/core/repository/dataset/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-dataset RDF4J: DatasetRepository (wrapper) diff --git a/core/repository/event/pom.xml b/core/repository/event/pom.xml index b7bb0962319..3a3109cf967 100644 --- a/core/repository/event/pom.xml +++ b/core/repository/event/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-event RDF4J: Repository - event (wrapper) diff --git a/core/repository/http/pom.xml b/core/repository/http/pom.xml index 9448deaa0f6..4fc07dc06e9 100644 --- a/core/repository/http/pom.xml +++ b/core/repository/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-http RDF4J: HTTPRepository diff --git a/core/repository/manager/pom.xml b/core/repository/manager/pom.xml index ce64f0923ff..bad53d7101e 100644 --- a/core/repository/manager/pom.xml +++ b/core/repository/manager/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-manager RDF4J: Repository manager diff --git a/core/repository/pom.xml b/core/repository/pom.xml index a8e503256cf..873757a9580 100644 --- a/core/repository/pom.xml +++ b/core/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository pom diff --git a/core/repository/sail/pom.xml b/core/repository/sail/pom.xml index ed8bced2627..fb8fc483b2b 100644 --- a/core/repository/sail/pom.xml +++ b/core/repository/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sail RDF4J: SailRepository diff --git a/core/repository/sparql/pom.xml b/core/repository/sparql/pom.xml index ce7bc9cfd4a..66d5ee263ce 100644 --- a/core/repository/sparql/pom.xml +++ b/core/repository/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sparql RDF4J: SPARQL Repository diff --git a/core/rio/api/pom.xml b/core/rio/api/pom.xml index e423ec9b28d..3733b074423 100644 --- a/core/rio/api/pom.xml +++ b/core/rio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-api RDF4J: Rio - API diff --git a/core/rio/binary/pom.xml b/core/rio/binary/pom.xml index 4659decd397..4ff5469eddf 100644 --- a/core/rio/binary/pom.xml +++ b/core/rio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-binary RDF4J: Rio - Binary diff --git a/core/rio/datatypes/pom.xml b/core/rio/datatypes/pom.xml index af965f085d5..b9d9dcadcfb 100644 --- a/core/rio/datatypes/pom.xml +++ b/core/rio/datatypes/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-datatypes RDF4J: Rio - Datatypes diff --git a/core/rio/hdt/pom.xml b/core/rio/hdt/pom.xml index 0c8001d1ac9..f3647663a65 100644 --- a/core/rio/hdt/pom.xml +++ b/core/rio/hdt/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-hdt jar diff --git a/core/rio/jsonld-legacy/pom.xml b/core/rio/jsonld-legacy/pom.xml index c2bb2b27869..7509ef4b834 100644 --- a/core/rio/jsonld-legacy/pom.xml +++ b/core/rio/jsonld-legacy/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld-legacy RDF4J: Rio - JSON-LD 1.0 (legacy) diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml index 7f4d5404637..c817e4db0af 100644 --- a/core/rio/jsonld/pom.xml +++ b/core/rio/jsonld/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld RDF4J: Rio - JSON-LD diff --git a/core/rio/languages/pom.xml b/core/rio/languages/pom.xml index 4df04834575..b35931702bb 100644 --- a/core/rio/languages/pom.xml +++ b/core/rio/languages/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-languages RDF4J: Rio - Languages diff --git a/core/rio/n3/pom.xml b/core/rio/n3/pom.xml index edfe5961d95..54ae5fe573c 100644 --- a/core/rio/n3/pom.xml +++ b/core/rio/n3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-n3 RDF4J: Rio - N3 (writer-only) diff --git a/core/rio/nquads/pom.xml b/core/rio/nquads/pom.xml index a71891a6df4..044216524fb 100644 --- a/core/rio/nquads/pom.xml +++ b/core/rio/nquads/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-nquads RDF4J: Rio - N-Quads diff --git a/core/rio/ntriples/pom.xml b/core/rio/ntriples/pom.xml index d546b62f838..37553504ed5 100644 --- a/core/rio/ntriples/pom.xml +++ b/core/rio/ntriples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-ntriples RDF4J: Rio - N-Triples diff --git a/core/rio/pom.xml b/core/rio/pom.xml index 433fd04b0fb..77fc1cee292 100644 --- a/core/rio/pom.xml +++ b/core/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio pom diff --git a/core/rio/rdfjson/pom.xml b/core/rio/rdfjson/pom.xml index 5b783ee1eb9..55a3e3ad374 100644 --- a/core/rio/rdfjson/pom.xml +++ b/core/rio/rdfjson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfjson RDF4J: Rio - RDF/JSON diff --git a/core/rio/rdfxml/pom.xml b/core/rio/rdfxml/pom.xml index a6ae84c0e09..08a1e0f6eb3 100644 --- a/core/rio/rdfxml/pom.xml +++ b/core/rio/rdfxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfxml RDF4J: Rio - RDF/XML diff --git a/core/rio/trig/pom.xml b/core/rio/trig/pom.xml index feaa83bed41..2736b12a916 100644 --- a/core/rio/trig/pom.xml +++ b/core/rio/trig/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trig RDF4J: Rio - TriG diff --git a/core/rio/trix/pom.xml b/core/rio/trix/pom.xml index 424c3d323be..a8b99df7634 100644 --- a/core/rio/trix/pom.xml +++ b/core/rio/trix/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trix RDF4J: Rio - TriX diff --git a/core/rio/turtle/pom.xml b/core/rio/turtle/pom.xml index 2ce7fd5b7ae..087f4221601 100644 --- a/core/rio/turtle/pom.xml +++ b/core/rio/turtle/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-turtle RDF4J: Rio - Turtle diff --git a/core/sail/api/pom.xml b/core/sail/api/pom.xml index 3dea2c7c5bc..94ba13deba0 100644 --- a/core/sail/api/pom.xml +++ b/core/sail/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-api RDF4J: Sail API diff --git a/core/sail/base/pom.xml b/core/sail/base/pom.xml index 12ea493053c..37f440d24a5 100644 --- a/core/sail/base/pom.xml +++ b/core/sail/base/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-base RDF4J: Sail base implementations diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml index a50f44b1d19..8542f4a1aaa 100644 --- a/core/sail/elasticsearch-store/pom.xml +++ b/core/sail/elasticsearch-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch-store RDF4J: Elasticsearch Store diff --git a/core/sail/elasticsearch/pom.xml b/core/sail/elasticsearch/pom.xml index 8e75a6305ac..022319c4697 100644 --- a/core/sail/elasticsearch/pom.xml +++ b/core/sail/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch RDF4J: Elastic Search Sail Index diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml index 63ab44b9305..e8d6a1af491 100644 --- a/core/sail/extensible-store/pom.xml +++ b/core/sail/extensible-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-extensible-store RDF4J: Extensible Store diff --git a/core/sail/inferencer/pom.xml b/core/sail/inferencer/pom.xml index 531f0e3a8c3..45babf4a3e2 100644 --- a/core/sail/inferencer/pom.xml +++ b/core/sail/inferencer/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-inferencer RDF4J: Inferencer Sails diff --git a/core/sail/lmdb/pom.xml b/core/sail/lmdb/pom.xml index b2027f9b10d..9a494fe3521 100644 --- a/core/sail/lmdb/pom.xml +++ b/core/sail/lmdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lmdb RDF4J: LmdbStore diff --git a/core/sail/lucene-api/pom.xml b/core/sail/lucene-api/pom.xml index 66a041a8437..a52d440fc00 100644 --- a/core/sail/lucene-api/pom.xml +++ b/core/sail/lucene-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene-api RDF4J: Lucene Sail API diff --git a/core/sail/lucene/pom.xml b/core/sail/lucene/pom.xml index 9426ef7b6c7..530c6ac3c5d 100644 --- a/core/sail/lucene/pom.xml +++ b/core/sail/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene RDF4J: Lucene Sail Index diff --git a/core/sail/memory/pom.xml b/core/sail/memory/pom.xml index 1ad15a58094..ae81a8c5531 100644 --- a/core/sail/memory/pom.xml +++ b/core/sail/memory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-memory RDF4J: MemoryStore diff --git a/core/sail/model/pom.xml b/core/sail/model/pom.xml index 775203f4869..531c473d10a 100644 --- a/core/sail/model/pom.xml +++ b/core/sail/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-model RDF4J: Sail Model diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml index 08f174ebb0c..17dbcc1c962 100644 --- a/core/sail/nativerdf/pom.xml +++ b/core/sail/nativerdf/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-nativerdf RDF4J: NativeStore diff --git a/core/sail/pom.xml b/core/sail/pom.xml index fb588e4341e..cbce9f38bc7 100644 --- a/core/sail/pom.xml +++ b/core/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail pom diff --git a/core/sail/shacl/pom.xml b/core/sail/shacl/pom.xml index 02282768527..9cae94fe046 100644 --- a/core/sail/shacl/pom.xml +++ b/core/sail/shacl/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-shacl RDF4J: SHACL diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml index 49710681605..831a688cf4a 100644 --- a/core/sail/solr/pom.xml +++ b/core/sail/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-solr RDF4J: Solr Sail Index diff --git a/core/sparqlbuilder/pom.xml b/core/sparqlbuilder/pom.xml index 8d958714bb7..2e589196e67 100644 --- a/core/sparqlbuilder/pom.xml +++ b/core/sparqlbuilder/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparqlbuilder RDF4J: SparqlBuilder diff --git a/core/spin/pom.xml b/core/spin/pom.xml index a7b35e1a460..b80e9d40e04 100644 --- a/core/spin/pom.xml +++ b/core/spin/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spin RDF4J: SPIN diff --git a/core/storage/pom.xml b/core/storage/pom.xml index d251b11ce21..6775e4bf837 100644 --- a/core/storage/pom.xml +++ b/core/storage/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-storage RDF4J: Storage Libraries diff --git a/examples/pom.xml b/examples/pom.xml index 5da5d463e23..5610e589454 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index c0a9fbe818c..d905efa8377 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT pom Eclipse RDF4J An extensible Java framework for RDF and SPARQL diff --git a/spring-components/pom.xml b/spring-components/pom.xml index 2d4a4778b2e..571eebb5bce 100644 --- a/spring-components/pom.xml +++ b/spring-components/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT pom diff --git a/spring-components/rdf4j-spring-demo/pom.xml b/spring-components/rdf4j-spring-demo/pom.xml index 415e4b98d50..e3376a0dd51 100644 --- a/spring-components/rdf4j-spring-demo/pom.xml +++ b/spring-components/rdf4j-spring-demo/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/spring-components/rdf4j-spring/pom.xml b/spring-components/rdf4j-spring/pom.xml index a25834e11c6..b3616e04951 100644 --- a/spring-components/rdf4j-spring/pom.xml +++ b/spring-components/rdf4j-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring RDF4J: Spring diff --git a/spring-components/spring-boot-sparql-web/pom.xml b/spring-components/spring-boot-sparql-web/pom.xml index 16c412fce30..222e9020799 100644 --- a/spring-components/spring-boot-sparql-web/pom.xml +++ b/spring-components/spring-boot-sparql-web/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring-boot-sparql-web RDF4J: Spring boot component for a HTTP sparql server diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml index 2d34015255f..d2d51f0daa4 100644 --- a/testsuites/benchmark/pom.xml +++ b/testsuites/benchmark/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-benchmark RDF4J: benchmarks diff --git a/testsuites/geosparql/pom.xml b/testsuites/geosparql/pom.xml index 407b995d69d..3ebb0735c3e 100644 --- a/testsuites/geosparql/pom.xml +++ b/testsuites/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-testsuite RDF4J: GeoSPARQL compliance test suite diff --git a/testsuites/lucene/pom.xml b/testsuites/lucene/pom.xml index 361316e5bf6..cf0c02226d8 100644 --- a/testsuites/lucene/pom.xml +++ b/testsuites/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-testsuite RDF4J: Lucene Sail Tests diff --git a/testsuites/model/pom.xml b/testsuites/model/pom.xml index dc30dec13c8..cc4dc7ab767 100644 --- a/testsuites/model/pom.xml +++ b/testsuites/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-testsuite RDF4J: Model API testsuite diff --git a/testsuites/pom.xml b/testsuites/pom.xml index ef6292c21da..42088f21a4d 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-testsuites pom diff --git a/testsuites/queryresultio/pom.xml b/testsuites/queryresultio/pom.xml index ecd8e5bc82d..feaf586b953 100644 --- a/testsuites/queryresultio/pom.xml +++ b/testsuites/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-testsuite RDF4J: QueryResultIO testsuite diff --git a/testsuites/repository/pom.xml b/testsuites/repository/pom.xml index 4bbb5674036..d58184a0a20 100644 --- a/testsuites/repository/pom.xml +++ b/testsuites/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-testsuite RDF4J: Repository API testsuite diff --git a/testsuites/rio/pom.xml b/testsuites/rio/pom.xml index d0496fde84c..8bab2f967d5 100644 --- a/testsuites/rio/pom.xml +++ b/testsuites/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-testsuite RDF4J: Rio compliance test suite diff --git a/testsuites/sail/pom.xml b/testsuites/sail/pom.xml index c4cab60ac29..4b9b7d6c2d1 100644 --- a/testsuites/sail/pom.xml +++ b/testsuites/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-testsuite RDF4J: Sail API testsuite diff --git a/testsuites/sparql/pom.xml b/testsuites/sparql/pom.xml index a31c1387506..6d81c721943 100644 --- a/testsuites/sparql/pom.xml +++ b/testsuites/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-testsuite RDF4J: SPARQL compliance test suite diff --git a/tools/config/pom.xml b/tools/config/pom.xml index 0a517becf13..c6e819ebcc0 100644 --- a/tools/config/pom.xml +++ b/tools/config/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-config RDF4J: application configuration diff --git a/tools/console/pom.xml b/tools/console/pom.xml index 774ac4c1871..a342f03ad96 100644 --- a/tools/console/pom.xml +++ b/tools/console/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-console RDF4J: Console diff --git a/tools/federation/pom.xml b/tools/federation/pom.xml index 2516c478a19..7a8daf55286 100644 --- a/tools/federation/pom.xml +++ b/tools/federation/pom.xml @@ -8,7 +8,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index c1c6c02c729..08778066c03 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-tools pom diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml index c6eb5a4ef76..642959844af 100644 --- a/tools/runtime-osgi/pom.xml +++ b/tools/runtime-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime-osgi bundle diff --git a/tools/runtime/pom.xml b/tools/runtime/pom.xml index 58ed0f6d639..ccb07aa2992 100644 --- a/tools/runtime/pom.xml +++ b/tools/runtime/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime RDF4J: Runtime diff --git a/tools/server-spring/pom.xml b/tools/server-spring/pom.xml index 9213d3cda9e..a3cba434f29 100644 --- a/tools/server-spring/pom.xml +++ b/tools/server-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server-spring RDF4J: HTTP server - core diff --git a/tools/server/pom.xml b/tools/server/pom.xml index 05e9a3dee02..5e6fc517570 100644 --- a/tools/server/pom.xml +++ b/tools/server/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server war diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml index 71b861d3584..cabca3a9a48 100644 --- a/tools/workbench/pom.xml +++ b/tools/workbench/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.1-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-workbench war From 312073a576309801fec27909a986efa26e5357a1 Mon Sep 17 00:00:00 2001 From: Bart Hanssens Date: Sun, 30 Jun 2024 22:53:40 +0200 Subject: [PATCH 04/37] GH-5054: added DCAT v3 class and properties (#5057) --- .../eclipse/rdf4j/model/vocabulary/DCAT.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/DCAT.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/DCAT.java index ab30b170392..bec91ff2bc3 100644 --- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/DCAT.java +++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/DCAT.java @@ -20,6 +20,7 @@ * @author Bart Hanssens * @see Data Catalog Vocabulary * @see Data Catalog Vocabulary version 2 + * @see Data Catalog Vocabulary version 3 */ public class DCAT { @@ -51,6 +52,9 @@ public class DCAT { /** dcat:Dataset */ public static final IRI DATASET; + /** dcat;DatasetSeries */ + public static final IRI DATASET_SERIES; + /** dcat:Distribution */ public static final IRI DISTRIBUTION; @@ -97,12 +101,18 @@ public class DCAT { /** dcat:endpointURL */ public static final IRI ENDPOINT_URL; + /** dcat;first */ + public static final IRI FIRST; + /** dcat:hadRole */ public static final IRI HAD_ROLE; /** dcat:catalog */ public static final IRI HAS_CATALOG; + /** dcat:hasCurrentVersion */ + public static final IRI HAS_CURRENT_VERSION; + /** dcat:dataset */ public static final IRI HAS_DATASET; @@ -115,18 +125,48 @@ public class DCAT { /** dcat:service */ public static final IRI HAS_SERVICE; + /** dcat;inCatalog, inverse property, see section 7 of DCAT v3 */ + public static final IRI IN_CATALOG; + + /** dcat:inSeries */ + public static final IRI IN_SERIES; + + /** dcat:isDistributionOf, inverse property, see section 7 of DCAT v3 */ + public static final IRI IS_DISTRIBUTION_OF; + + /** dcat:isVersionOf, inverse property, see section 7 of DCAT v3 */ + public static final IRI IS_VERSION_OF; + /** dcat:keyword */ public static final IRI KEYWORD; /** dcat:landingPage */ public static final IRI LANDING_PAGE; + /** dcat:last */ + public static final IRI LAST; + /** dcat:mediaType */ public static final IRI MEDIA_TYPE; + /** dcat:next, inverse property, see section 7 of DCAT v3 */ + public static final IRI NEXT; + + /** dcat:nextVersion, inverse property, see section 7 of DCAT v3 */ + public static final IRI NEXT_VERSION; + /** dcat:packageFormat */ public static final IRI PACKAGE_FORMAT; + /** dcat:prev */ + public static final IRI PREV; + + /** dcat:previousVersion */ + public static final IRI PREVIOUS_VERSION; + + /** dcat:seriesMember, inverse property, see section 7 of DCAT v3 */ + public static final IRI SERIES_MEMBER; + /** dcat:qualifiedRelation */ public static final IRI QUALIFIED_RELATION; @@ -148,12 +188,16 @@ public class DCAT { /** dcat:themeTaxonomy */ public static final IRI THEME_TAXONOMY; + /** dcat:version */ + public static final IRI VERSION; + static { CATALOG = Vocabularies.createIRI(NAMESPACE, "Catalog"); CATALOG_RECORD = Vocabularies.createIRI(NAMESPACE, "CatalogRecord"); DATA_SERVICE = Vocabularies.createIRI(NAMESPACE, "DataService"); DATASET = Vocabularies.createIRI(NAMESPACE, "Dataset"); + DATASET_SERIES = Vocabularies.createIRI(NAMESPACE, "DatasetSeries"); DISTRIBUTION = Vocabularies.createIRI(NAMESPACE, "Distribution"); RELATIONSHIP = Vocabularies.createIRI(NAMESPACE, "Relationship"); RESOURCE = Vocabularies.createIRI(NAMESPACE, "Resource"); @@ -170,22 +214,35 @@ public class DCAT { END_DATE = Vocabularies.createIRI(NAMESPACE, "endDate"); ENDPOINT_DESCRIPTION = Vocabularies.createIRI(NAMESPACE, "endpointDescription"); ENDPOINT_URL = Vocabularies.createIRI(NAMESPACE, "endpointURL"); + FIRST = Vocabularies.createIRI(NAMESPACE, "first"); HAD_ROLE = Vocabularies.createIRI(NAMESPACE, "hadRole"); HAS_CATALOG = Vocabularies.createIRI(NAMESPACE, "catalog"); HAS_DATASET = Vocabularies.createIRI(NAMESPACE, "dataset"); + HAS_CURRENT_VERSION = Vocabularies.createIRI(NAMESPACE, "hasCurrentVersion"); HAS_DISTRIBUTION = Vocabularies.createIRI(NAMESPACE, "distribution"); HAS_RECORD = Vocabularies.createIRI(NAMESPACE, "record"); HAS_SERVICE = Vocabularies.createIRI(NAMESPACE, "service"); + IN_CATALOG = Vocabularies.createIRI(NAMESPACE, "inCatalog"); + IN_SERIES = Vocabularies.createIRI(NAMESPACE, "inSeries"); + IS_DISTRIBUTION_OF = Vocabularies.createIRI(NAMESPACE, "isDistributionOf"); + IS_VERSION_OF = Vocabularies.createIRI(NAMESPACE, "isVersionOf"); KEYWORD = Vocabularies.createIRI(NAMESPACE, "keyword"); LANDING_PAGE = Vocabularies.createIRI(NAMESPACE, "landingPage"); + LAST = Vocabularies.createIRI(NAMESPACE, "last"); MEDIA_TYPE = Vocabularies.createIRI(NAMESPACE, "mediaType"); + NEXT = Vocabularies.createIRI(NAMESPACE, "next"); + NEXT_VERSION = Vocabularies.createIRI(NAMESPACE, "nextVersion"); PACKAGE_FORMAT = Vocabularies.createIRI(NAMESPACE, "packageFormat"); + PREV = Vocabularies.createIRI(NAMESPACE, "prev"); + PREVIOUS_VERSION = Vocabularies.createIRI(NAMESPACE, "previousVersion"); QUALIFIED_RELATION = Vocabularies.createIRI(NAMESPACE, "qualifiedRelation"); + SERIES_MEMBER = Vocabularies.createIRI(NAMESPACE, "seriesMember"); SERVES_DATASET = Vocabularies.createIRI(NAMESPACE, "servesDataset"); SPATIAL_RESOLUTION_IN_METERS = Vocabularies.createIRI(NAMESPACE, "spatialResolutionInMeters"); START_DATE = Vocabularies.createIRI(NAMESPACE, "startDate"); TEMPORAL_RESOLUTION = Vocabularies.createIRI(NAMESPACE, "temporalResolution"); THEME = Vocabularies.createIRI(NAMESPACE, "theme"); THEME_TAXONOMY = Vocabularies.createIRI(NAMESPACE, "themeTaxonomy"); + VERSION = Vocabularies.createIRI(NAMESPACE, "version"); } } From 02e7b3c64faf058eb6b56e7fc3e4e5de16d93a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Tue, 9 Jul 2024 17:01:34 +0200 Subject: [PATCH 05/37] set correct version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håvard Ottestad --- assembly-descriptors/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 2 +- compliance/elasticsearch/pom.xml | 2 +- compliance/geosparql/pom.xml | 2 +- compliance/lucene/pom.xml | 2 +- compliance/model/pom.xml | 2 +- compliance/pom.xml | 2 +- compliance/repository/pom.xml | 2 +- compliance/rio/pom.xml | 2 +- compliance/solr/pom.xml | 2 +- compliance/sparql/pom.xml | 2 +- core/client/pom.xml | 2 +- core/collection-factory/api/pom.xml | 2 +- core/collection-factory/mapdb/pom.xml | 2 +- core/collection-factory/mapdb3/pom.xml | 2 +- core/collection-factory/pom.xml | 2 +- core/common/annotation/pom.xml | 2 +- core/common/exception/pom.xml | 2 +- core/common/io/pom.xml | 2 +- core/common/iterator/pom.xml | 2 +- core/common/order/pom.xml | 2 +- core/common/pom.xml | 2 +- core/common/text/pom.xml | 2 +- core/common/transaction/pom.xml | 2 +- core/common/xml/pom.xml | 2 +- core/http/client/pom.xml | 2 +- core/http/pom.xml | 2 +- core/http/protocol/pom.xml | 2 +- core/model-api/pom.xml | 2 +- core/model-vocabulary/pom.xml | 2 +- core/model/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/queryalgebra/evaluation/pom.xml | 2 +- core/queryalgebra/geosparql/pom.xml | 2 +- core/queryalgebra/model/pom.xml | 2 +- core/queryalgebra/pom.xml | 2 +- core/queryparser/api/pom.xml | 2 +- core/queryparser/pom.xml | 2 +- core/queryparser/sparql/pom.xml | 2 +- core/queryrender/pom.xml | 2 +- core/queryresultio/api/pom.xml | 2 +- core/queryresultio/binary/pom.xml | 2 +- core/queryresultio/pom.xml | 2 +- core/queryresultio/sparqljson/pom.xml | 2 +- core/queryresultio/sparqlxml/pom.xml | 2 +- core/queryresultio/text/pom.xml | 2 +- core/repository/api/pom.xml | 2 +- core/repository/contextaware/pom.xml | 2 +- core/repository/dataset/pom.xml | 2 +- core/repository/event/pom.xml | 2 +- core/repository/http/pom.xml | 2 +- core/repository/manager/pom.xml | 2 +- core/repository/pom.xml | 2 +- core/repository/sail/pom.xml | 2 +- core/repository/sparql/pom.xml | 2 +- core/rio/api/pom.xml | 2 +- core/rio/binary/pom.xml | 2 +- core/rio/datatypes/pom.xml | 2 +- core/rio/hdt/pom.xml | 2 +- core/rio/jsonld-legacy/pom.xml | 2 +- core/rio/jsonld/pom.xml | 2 +- core/rio/languages/pom.xml | 2 +- core/rio/n3/pom.xml | 2 +- core/rio/nquads/pom.xml | 2 +- core/rio/ntriples/pom.xml | 2 +- core/rio/pom.xml | 2 +- core/rio/rdfjson/pom.xml | 2 +- core/rio/rdfxml/pom.xml | 2 +- core/rio/trig/pom.xml | 2 +- core/rio/trix/pom.xml | 2 +- core/rio/turtle/pom.xml | 2 +- core/sail/api/pom.xml | 2 +- core/sail/base/pom.xml | 2 +- core/sail/elasticsearch-store/pom.xml | 2 +- core/sail/elasticsearch/pom.xml | 2 +- core/sail/extensible-store/pom.xml | 2 +- core/sail/inferencer/pom.xml | 2 +- core/sail/lmdb/pom.xml | 2 +- core/sail/lucene-api/pom.xml | 2 +- core/sail/lucene/pom.xml | 2 +- core/sail/memory/pom.xml | 2 +- core/sail/model/pom.xml | 2 +- core/sail/nativerdf/pom.xml | 2 +- core/sail/pom.xml | 2 +- core/sail/shacl/pom.xml | 2 +- core/sail/solr/pom.xml | 2 +- core/sparqlbuilder/pom.xml | 2 +- core/spin/pom.xml | 2 +- core/storage/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- spring-components/pom.xml | 2 +- spring-components/rdf4j-spring-demo/pom.xml | 2 +- spring-components/rdf4j-spring/pom.xml | 2 +- spring-components/spring-boot-sparql-web/pom.xml | 2 +- testsuites/benchmark/pom.xml | 2 +- testsuites/geosparql/pom.xml | 2 +- testsuites/lucene/pom.xml | 2 +- testsuites/model/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/queryresultio/pom.xml | 2 +- testsuites/repository/pom.xml | 2 +- testsuites/rio/pom.xml | 2 +- testsuites/sail/pom.xml | 2 +- testsuites/sparql/pom.xml | 2 +- tools/config/pom.xml | 2 +- tools/console/pom.xml | 2 +- tools/federation/pom.xml | 2 +- tools/pom.xml | 2 +- tools/runtime-osgi/pom.xml | 2 +- tools/runtime/pom.xml | 2 +- tools/server-spring/pom.xml | 2 +- tools/server/pom.xml | 2 +- tools/workbench/pom.xml | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/assembly-descriptors/pom.xml b/assembly-descriptors/pom.xml index df1405dfe9b..adb16157dc8 100644 --- a/assembly-descriptors/pom.xml +++ b/assembly-descriptors/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly-descriptors RDF4J: Assembly Descriptors diff --git a/assembly/pom.xml b/assembly/pom.xml index 46ddb44e8f6..a88d567f0e5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly pom diff --git a/bom/pom.xml b/bom/pom.xml index 2875e085c92..f9a2a634d30 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-bom pom diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml index df18e10c146..794dacb7bd7 100644 --- a/compliance/elasticsearch/pom.xml +++ b/compliance/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-elasticsearch-compliance RDF4J: Elasticsearch Sail Tests diff --git a/compliance/geosparql/pom.xml b/compliance/geosparql/pom.xml index 64b980e00cf..41e8785595b 100644 --- a/compliance/geosparql/pom.xml +++ b/compliance/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-compliance RDF4J: GeoSPARQL compliance tests diff --git a/compliance/lucene/pom.xml b/compliance/lucene/pom.xml index 2ba823d3175..dcf84054c6d 100644 --- a/compliance/lucene/pom.xml +++ b/compliance/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-compliance RDF4J: Lucene Sail Tests diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml index adb3a628612..3d3ac105fa9 100644 --- a/compliance/model/pom.xml +++ b/compliance/model/pom.xml @@ -3,7 +3,7 @@ rdf4j-compliance org.eclipse.rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT 4.0.0 rdf4j-model-compliance diff --git a/compliance/pom.xml b/compliance/pom.xml index 058bc361e17..7a3f7a3e7ff 100644 --- a/compliance/pom.xml +++ b/compliance/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-compliance pom diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml index b5e75f0c7b3..069ade53eec 100644 --- a/compliance/repository/pom.xml +++ b/compliance/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-compliance war diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml index f1502fb5055..850062bf2f4 100644 --- a/compliance/rio/pom.xml +++ b/compliance/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-compliance RDF4J: Rio compliance tests diff --git a/compliance/solr/pom.xml b/compliance/solr/pom.xml index 7db4674acce..454f5295ca6 100644 --- a/compliance/solr/pom.xml +++ b/compliance/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-solr-compliance RDF4J: Solr Sail Tests diff --git a/compliance/sparql/pom.xml b/compliance/sparql/pom.xml index 58e74663d2e..3340661c18d 100644 --- a/compliance/sparql/pom.xml +++ b/compliance/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-compliance war diff --git a/core/client/pom.xml b/core/client/pom.xml index d3c81758a7f..845360a26cc 100644 --- a/core/client/pom.xml +++ b/core/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-client RDF4J: Client Libraries diff --git a/core/collection-factory/api/pom.xml b/core/collection-factory/api/pom.xml index 51de45eb71e..5ba6df646b7 100644 --- a/core/collection-factory/api/pom.xml +++ b/core/collection-factory/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-api RDF4J: Collection Factory - API diff --git a/core/collection-factory/mapdb/pom.xml b/core/collection-factory/mapdb/pom.xml index 684bebbe80b..c8e843b984e 100644 --- a/core/collection-factory/mapdb/pom.xml +++ b/core/collection-factory/mapdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb RDF4J: Collection Factory - Map DB backed diff --git a/core/collection-factory/mapdb3/pom.xml b/core/collection-factory/mapdb3/pom.xml index 48cfe119465..a00d4c8e811 100644 --- a/core/collection-factory/mapdb3/pom.xml +++ b/core/collection-factory/mapdb3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb3 RDF4J: Collection Factory - Map DB v3 backed diff --git a/core/collection-factory/pom.xml b/core/collection-factory/pom.xml index d8f51f9cfc1..bb1df7bb226 100644 --- a/core/collection-factory/pom.xml +++ b/core/collection-factory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory pom diff --git a/core/common/annotation/pom.xml b/core/common/annotation/pom.xml index 4ad46c7e52b..f5f53a65e21 100644 --- a/core/common/annotation/pom.xml +++ b/core/common/annotation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-annotation RDF4J: common annotation diff --git a/core/common/exception/pom.xml b/core/common/exception/pom.xml index 9ad62285ffb..bbd533f1adf 100644 --- a/core/common/exception/pom.xml +++ b/core/common/exception/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-exception RDF4J: common exception diff --git a/core/common/io/pom.xml b/core/common/io/pom.xml index 85515f61896..f99f7f2af4e 100644 --- a/core/common/io/pom.xml +++ b/core/common/io/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-io RDF4J: common IO diff --git a/core/common/iterator/pom.xml b/core/common/iterator/pom.xml index d7fbb84b906..c8b62012574 100644 --- a/core/common/iterator/pom.xml +++ b/core/common/iterator/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-iterator RDF4J: common iterators diff --git a/core/common/order/pom.xml b/core/common/order/pom.xml index 9025550749f..5228081fc0e 100644 --- a/core/common/order/pom.xml +++ b/core/common/order/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-order RDF4J: common order diff --git a/core/common/pom.xml b/core/common/pom.xml index 321fe818687..fc821867500 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common pom diff --git a/core/common/text/pom.xml b/core/common/text/pom.xml index ebe15c25018..f26391a3d11 100644 --- a/core/common/text/pom.xml +++ b/core/common/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-text RDF4J: common text diff --git a/core/common/transaction/pom.xml b/core/common/transaction/pom.xml index 521eb1f032c..2a327eba54c 100644 --- a/core/common/transaction/pom.xml +++ b/core/common/transaction/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-transaction RDF4J: common transaction diff --git a/core/common/xml/pom.xml b/core/common/xml/pom.xml index 83d49933e72..76184d6e127 100644 --- a/core/common/xml/pom.xml +++ b/core/common/xml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-xml RDF4J: common XML diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml index d1c0d717104..8e26e6c8d3f 100644 --- a/core/http/client/pom.xml +++ b/core/http/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-client RDF4J: HTTP client diff --git a/core/http/pom.xml b/core/http/pom.xml index b04a4cf2cc2..ee3e0261ad0 100644 --- a/core/http/pom.xml +++ b/core/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http pom diff --git a/core/http/protocol/pom.xml b/core/http/protocol/pom.xml index 841b0058ce6..a5d66a693e0 100644 --- a/core/http/protocol/pom.xml +++ b/core/http/protocol/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-protocol RDF4J: HTTP protocol diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml index 54cd1617fb3..cf07e38798c 100644 --- a/core/model-api/pom.xml +++ b/core/model-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-api RDF4J: Model API diff --git a/core/model-vocabulary/pom.xml b/core/model-vocabulary/pom.xml index 980ffb90b4a..bd27791c1d8 100644 --- a/core/model-vocabulary/pom.xml +++ b/core/model-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-vocabulary RDF4J: RDF Vocabularies diff --git a/core/model/pom.xml b/core/model/pom.xml index cccfa4bee96..17a4deb868b 100644 --- a/core/model/pom.xml +++ b/core/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model RDF4J: Model diff --git a/core/pom.xml b/core/pom.xml index bc1011b81bb..ed94faedcde 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-core pom diff --git a/core/query/pom.xml b/core/query/pom.xml index 14047d8ba4a..6600bd51a4e 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-query RDF4J: Query diff --git a/core/queryalgebra/evaluation/pom.xml b/core/queryalgebra/evaluation/pom.xml index 9d3fe1dafe5..a29c5f1ab29 100644 --- a/core/queryalgebra/evaluation/pom.xml +++ b/core/queryalgebra/evaluation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-evaluation RDF4J: Query algebra - evaluation diff --git a/core/queryalgebra/geosparql/pom.xml b/core/queryalgebra/geosparql/pom.xml index b5981243eb0..10fcbc837ce 100644 --- a/core/queryalgebra/geosparql/pom.xml +++ b/core/queryalgebra/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-geosparql RDF4J: Query algebra - GeoSPARQL diff --git a/core/queryalgebra/model/pom.xml b/core/queryalgebra/model/pom.xml index 7930e34baad..c561441a066 100644 --- a/core/queryalgebra/model/pom.xml +++ b/core/queryalgebra/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-model RDF4J: Query algebra - model diff --git a/core/queryalgebra/pom.xml b/core/queryalgebra/pom.xml index 70abfe9bd79..fb04d8339cd 100644 --- a/core/queryalgebra/pom.xml +++ b/core/queryalgebra/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra pom diff --git a/core/queryparser/api/pom.xml b/core/queryparser/api/pom.xml index a959911f0bb..6450c375f42 100644 --- a/core/queryparser/api/pom.xml +++ b/core/queryparser/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-api RDF4J: Query parser - API diff --git a/core/queryparser/pom.xml b/core/queryparser/pom.xml index 40824099ba4..0dfcb8573d3 100644 --- a/core/queryparser/pom.xml +++ b/core/queryparser/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser pom diff --git a/core/queryparser/sparql/pom.xml b/core/queryparser/sparql/pom.xml index 7d87e79b1d7..d21ecf2b1b2 100644 --- a/core/queryparser/sparql/pom.xml +++ b/core/queryparser/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-sparql RDF4J: Query parser - SPARQL diff --git a/core/queryrender/pom.xml b/core/queryrender/pom.xml index 0163b2d0cf9..8db12169a80 100644 --- a/core/queryrender/pom.xml +++ b/core/queryrender/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryrender RDF4J: Query Rendering diff --git a/core/queryresultio/api/pom.xml b/core/queryresultio/api/pom.xml index ca0d077b482..273fe3b9801 100644 --- a/core/queryresultio/api/pom.xml +++ b/core/queryresultio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-api RDF4J: Query result IO - API diff --git a/core/queryresultio/binary/pom.xml b/core/queryresultio/binary/pom.xml index 6d8b4f1896b..34df6c0b64f 100644 --- a/core/queryresultio/binary/pom.xml +++ b/core/queryresultio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-binary RDF4J: Query result IO - binary diff --git a/core/queryresultio/pom.xml b/core/queryresultio/pom.xml index adf442ee57f..c1ba95a8c53 100644 --- a/core/queryresultio/pom.xml +++ b/core/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio pom diff --git a/core/queryresultio/sparqljson/pom.xml b/core/queryresultio/sparqljson/pom.xml index 3da8116219d..c5f589b6457 100644 --- a/core/queryresultio/sparqljson/pom.xml +++ b/core/queryresultio/sparqljson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqljson RDF4J: Query result IO - SPARQL/JSON diff --git a/core/queryresultio/sparqlxml/pom.xml b/core/queryresultio/sparqlxml/pom.xml index f33808a090c..8d7bee2745b 100644 --- a/core/queryresultio/sparqlxml/pom.xml +++ b/core/queryresultio/sparqlxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqlxml RDF4J: Query result IO - SPARQL/XML diff --git a/core/queryresultio/text/pom.xml b/core/queryresultio/text/pom.xml index 43878203874..e5f67e0b32e 100644 --- a/core/queryresultio/text/pom.xml +++ b/core/queryresultio/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-text RDF4J: Query result IO - plain text booleans diff --git a/core/repository/api/pom.xml b/core/repository/api/pom.xml index c9c5fcd4ca8..48fdeecfad7 100644 --- a/core/repository/api/pom.xml +++ b/core/repository/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-api RDF4J: Repository - API diff --git a/core/repository/contextaware/pom.xml b/core/repository/contextaware/pom.xml index 7a681c18c23..39bcbf0668c 100644 --- a/core/repository/contextaware/pom.xml +++ b/core/repository/contextaware/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-contextaware RDF4J: Repository - context aware (wrapper) diff --git a/core/repository/dataset/pom.xml b/core/repository/dataset/pom.xml index 0df4f37da67..c843dccda42 100644 --- a/core/repository/dataset/pom.xml +++ b/core/repository/dataset/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-dataset RDF4J: DatasetRepository (wrapper) diff --git a/core/repository/event/pom.xml b/core/repository/event/pom.xml index 8dfebe03388..3a3109cf967 100644 --- a/core/repository/event/pom.xml +++ b/core/repository/event/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-event RDF4J: Repository - event (wrapper) diff --git a/core/repository/http/pom.xml b/core/repository/http/pom.xml index 8ea2c389c33..4fc07dc06e9 100644 --- a/core/repository/http/pom.xml +++ b/core/repository/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-http RDF4J: HTTPRepository diff --git a/core/repository/manager/pom.xml b/core/repository/manager/pom.xml index 9c92d43a0ac..bad53d7101e 100644 --- a/core/repository/manager/pom.xml +++ b/core/repository/manager/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-manager RDF4J: Repository manager diff --git a/core/repository/pom.xml b/core/repository/pom.xml index ef4fd9d0073..873757a9580 100644 --- a/core/repository/pom.xml +++ b/core/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository pom diff --git a/core/repository/sail/pom.xml b/core/repository/sail/pom.xml index 8aa8d8db3a4..fb8fc483b2b 100644 --- a/core/repository/sail/pom.xml +++ b/core/repository/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sail RDF4J: SailRepository diff --git a/core/repository/sparql/pom.xml b/core/repository/sparql/pom.xml index 0bf166d7630..66d5ee263ce 100644 --- a/core/repository/sparql/pom.xml +++ b/core/repository/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sparql RDF4J: SPARQL Repository diff --git a/core/rio/api/pom.xml b/core/rio/api/pom.xml index 799413da195..3733b074423 100644 --- a/core/rio/api/pom.xml +++ b/core/rio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-api RDF4J: Rio - API diff --git a/core/rio/binary/pom.xml b/core/rio/binary/pom.xml index 5470b31e9ff..4ff5469eddf 100644 --- a/core/rio/binary/pom.xml +++ b/core/rio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-binary RDF4J: Rio - Binary diff --git a/core/rio/datatypes/pom.xml b/core/rio/datatypes/pom.xml index fb9a7dfcf6f..b9d9dcadcfb 100644 --- a/core/rio/datatypes/pom.xml +++ b/core/rio/datatypes/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-datatypes RDF4J: Rio - Datatypes diff --git a/core/rio/hdt/pom.xml b/core/rio/hdt/pom.xml index f979a1d7c80..f3647663a65 100644 --- a/core/rio/hdt/pom.xml +++ b/core/rio/hdt/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-hdt jar diff --git a/core/rio/jsonld-legacy/pom.xml b/core/rio/jsonld-legacy/pom.xml index 050ad051ac6..7509ef4b834 100644 --- a/core/rio/jsonld-legacy/pom.xml +++ b/core/rio/jsonld-legacy/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld-legacy RDF4J: Rio - JSON-LD 1.0 (legacy) diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml index fe7ffc43827..c817e4db0af 100644 --- a/core/rio/jsonld/pom.xml +++ b/core/rio/jsonld/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld RDF4J: Rio - JSON-LD diff --git a/core/rio/languages/pom.xml b/core/rio/languages/pom.xml index 3293115f645..b35931702bb 100644 --- a/core/rio/languages/pom.xml +++ b/core/rio/languages/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-languages RDF4J: Rio - Languages diff --git a/core/rio/n3/pom.xml b/core/rio/n3/pom.xml index b45aff576ac..54ae5fe573c 100644 --- a/core/rio/n3/pom.xml +++ b/core/rio/n3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-n3 RDF4J: Rio - N3 (writer-only) diff --git a/core/rio/nquads/pom.xml b/core/rio/nquads/pom.xml index 9ae90c7f16f..044216524fb 100644 --- a/core/rio/nquads/pom.xml +++ b/core/rio/nquads/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-nquads RDF4J: Rio - N-Quads diff --git a/core/rio/ntriples/pom.xml b/core/rio/ntriples/pom.xml index b0aad8a90dc..37553504ed5 100644 --- a/core/rio/ntriples/pom.xml +++ b/core/rio/ntriples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-ntriples RDF4J: Rio - N-Triples diff --git a/core/rio/pom.xml b/core/rio/pom.xml index 5a4608a33ff..77fc1cee292 100644 --- a/core/rio/pom.xml +++ b/core/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio pom diff --git a/core/rio/rdfjson/pom.xml b/core/rio/rdfjson/pom.xml index 81b51b82205..55a3e3ad374 100644 --- a/core/rio/rdfjson/pom.xml +++ b/core/rio/rdfjson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfjson RDF4J: Rio - RDF/JSON diff --git a/core/rio/rdfxml/pom.xml b/core/rio/rdfxml/pom.xml index 7a9a8a1ff77..08a1e0f6eb3 100644 --- a/core/rio/rdfxml/pom.xml +++ b/core/rio/rdfxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfxml RDF4J: Rio - RDF/XML diff --git a/core/rio/trig/pom.xml b/core/rio/trig/pom.xml index 4aa3b733e24..2736b12a916 100644 --- a/core/rio/trig/pom.xml +++ b/core/rio/trig/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trig RDF4J: Rio - TriG diff --git a/core/rio/trix/pom.xml b/core/rio/trix/pom.xml index d523782ea02..a8b99df7634 100644 --- a/core/rio/trix/pom.xml +++ b/core/rio/trix/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trix RDF4J: Rio - TriX diff --git a/core/rio/turtle/pom.xml b/core/rio/turtle/pom.xml index 8c3456e457a..087f4221601 100644 --- a/core/rio/turtle/pom.xml +++ b/core/rio/turtle/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-turtle RDF4J: Rio - Turtle diff --git a/core/sail/api/pom.xml b/core/sail/api/pom.xml index 89371354466..94ba13deba0 100644 --- a/core/sail/api/pom.xml +++ b/core/sail/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-api RDF4J: Sail API diff --git a/core/sail/base/pom.xml b/core/sail/base/pom.xml index c1c2b0836ff..37f440d24a5 100644 --- a/core/sail/base/pom.xml +++ b/core/sail/base/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-base RDF4J: Sail base implementations diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml index dd41f3f4a94..8542f4a1aaa 100644 --- a/core/sail/elasticsearch-store/pom.xml +++ b/core/sail/elasticsearch-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch-store RDF4J: Elasticsearch Store diff --git a/core/sail/elasticsearch/pom.xml b/core/sail/elasticsearch/pom.xml index fe3ba319f5f..022319c4697 100644 --- a/core/sail/elasticsearch/pom.xml +++ b/core/sail/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch RDF4J: Elastic Search Sail Index diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml index af9656421ae..e8d6a1af491 100644 --- a/core/sail/extensible-store/pom.xml +++ b/core/sail/extensible-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-extensible-store RDF4J: Extensible Store diff --git a/core/sail/inferencer/pom.xml b/core/sail/inferencer/pom.xml index 2a1c6d458ec..45babf4a3e2 100644 --- a/core/sail/inferencer/pom.xml +++ b/core/sail/inferencer/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-inferencer RDF4J: Inferencer Sails diff --git a/core/sail/lmdb/pom.xml b/core/sail/lmdb/pom.xml index 77ddc62311b..9a494fe3521 100644 --- a/core/sail/lmdb/pom.xml +++ b/core/sail/lmdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lmdb RDF4J: LmdbStore diff --git a/core/sail/lucene-api/pom.xml b/core/sail/lucene-api/pom.xml index 86ac34dce7f..a52d440fc00 100644 --- a/core/sail/lucene-api/pom.xml +++ b/core/sail/lucene-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene-api RDF4J: Lucene Sail API diff --git a/core/sail/lucene/pom.xml b/core/sail/lucene/pom.xml index a0e0c7f070f..530c6ac3c5d 100644 --- a/core/sail/lucene/pom.xml +++ b/core/sail/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene RDF4J: Lucene Sail Index diff --git a/core/sail/memory/pom.xml b/core/sail/memory/pom.xml index d6e4f8bd54d..ae81a8c5531 100644 --- a/core/sail/memory/pom.xml +++ b/core/sail/memory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-memory RDF4J: MemoryStore diff --git a/core/sail/model/pom.xml b/core/sail/model/pom.xml index e4b71836b52..531c473d10a 100644 --- a/core/sail/model/pom.xml +++ b/core/sail/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-model RDF4J: Sail Model diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml index fbba7a701b3..17dbcc1c962 100644 --- a/core/sail/nativerdf/pom.xml +++ b/core/sail/nativerdf/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-nativerdf RDF4J: NativeStore diff --git a/core/sail/pom.xml b/core/sail/pom.xml index 8ec1ee27a6a..cbce9f38bc7 100644 --- a/core/sail/pom.xml +++ b/core/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail pom diff --git a/core/sail/shacl/pom.xml b/core/sail/shacl/pom.xml index b852b92c1ee..9cae94fe046 100644 --- a/core/sail/shacl/pom.xml +++ b/core/sail/shacl/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-shacl RDF4J: SHACL diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml index ae16fa2d609..c79bfa393e7 100644 --- a/core/sail/solr/pom.xml +++ b/core/sail/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-solr RDF4J: Solr Sail Index diff --git a/core/sparqlbuilder/pom.xml b/core/sparqlbuilder/pom.xml index aff6f89bbfe..2e589196e67 100644 --- a/core/sparqlbuilder/pom.xml +++ b/core/sparqlbuilder/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparqlbuilder RDF4J: SparqlBuilder diff --git a/core/spin/pom.xml b/core/spin/pom.xml index 51b98987e1b..b80e9d40e04 100644 --- a/core/spin/pom.xml +++ b/core/spin/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spin RDF4J: SPIN diff --git a/core/storage/pom.xml b/core/storage/pom.xml index d3c07cdb3ee..6775e4bf837 100644 --- a/core/storage/pom.xml +++ b/core/storage/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-storage RDF4J: Storage Libraries diff --git a/examples/pom.xml b/examples/pom.xml index 0659a2960d3..5610e589454 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 63c7e921e67..8338a334348 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT pom Eclipse RDF4J An extensible Java framework for RDF and SPARQL diff --git a/spring-components/pom.xml b/spring-components/pom.xml index f985a5ba5e3..571eebb5bce 100644 --- a/spring-components/pom.xml +++ b/spring-components/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT pom diff --git a/spring-components/rdf4j-spring-demo/pom.xml b/spring-components/rdf4j-spring-demo/pom.xml index f001dda2a5d..e3376a0dd51 100644 --- a/spring-components/rdf4j-spring-demo/pom.xml +++ b/spring-components/rdf4j-spring-demo/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/spring-components/rdf4j-spring/pom.xml b/spring-components/rdf4j-spring/pom.xml index e8636c2b322..b3616e04951 100644 --- a/spring-components/rdf4j-spring/pom.xml +++ b/spring-components/rdf4j-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring RDF4J: Spring diff --git a/spring-components/spring-boot-sparql-web/pom.xml b/spring-components/spring-boot-sparql-web/pom.xml index 66416574142..222e9020799 100644 --- a/spring-components/spring-boot-sparql-web/pom.xml +++ b/spring-components/spring-boot-sparql-web/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring-boot-sparql-web RDF4J: Spring boot component for a HTTP sparql server diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml index 0dab67931cf..d2d51f0daa4 100644 --- a/testsuites/benchmark/pom.xml +++ b/testsuites/benchmark/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-benchmark RDF4J: benchmarks diff --git a/testsuites/geosparql/pom.xml b/testsuites/geosparql/pom.xml index 1db6bf2aa10..3ebb0735c3e 100644 --- a/testsuites/geosparql/pom.xml +++ b/testsuites/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-testsuite RDF4J: GeoSPARQL compliance test suite diff --git a/testsuites/lucene/pom.xml b/testsuites/lucene/pom.xml index e9fa2233aa4..cf0c02226d8 100644 --- a/testsuites/lucene/pom.xml +++ b/testsuites/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-testsuite RDF4J: Lucene Sail Tests diff --git a/testsuites/model/pom.xml b/testsuites/model/pom.xml index c387738e3dc..cc4dc7ab767 100644 --- a/testsuites/model/pom.xml +++ b/testsuites/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-testsuite RDF4J: Model API testsuite diff --git a/testsuites/pom.xml b/testsuites/pom.xml index 7a1ee5ce63a..42088f21a4d 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-testsuites pom diff --git a/testsuites/queryresultio/pom.xml b/testsuites/queryresultio/pom.xml index 4504d829d5c..feaf586b953 100644 --- a/testsuites/queryresultio/pom.xml +++ b/testsuites/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-testsuite RDF4J: QueryResultIO testsuite diff --git a/testsuites/repository/pom.xml b/testsuites/repository/pom.xml index 1efc34cce65..d58184a0a20 100644 --- a/testsuites/repository/pom.xml +++ b/testsuites/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-testsuite RDF4J: Repository API testsuite diff --git a/testsuites/rio/pom.xml b/testsuites/rio/pom.xml index dfddec8d56b..8bab2f967d5 100644 --- a/testsuites/rio/pom.xml +++ b/testsuites/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-testsuite RDF4J: Rio compliance test suite diff --git a/testsuites/sail/pom.xml b/testsuites/sail/pom.xml index ab7752031b5..4b9b7d6c2d1 100644 --- a/testsuites/sail/pom.xml +++ b/testsuites/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-testsuite RDF4J: Sail API testsuite diff --git a/testsuites/sparql/pom.xml b/testsuites/sparql/pom.xml index 923a002d614..6d81c721943 100644 --- a/testsuites/sparql/pom.xml +++ b/testsuites/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-testsuite RDF4J: SPARQL compliance test suite diff --git a/tools/config/pom.xml b/tools/config/pom.xml index 19f429f02fa..c6e819ebcc0 100644 --- a/tools/config/pom.xml +++ b/tools/config/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-config RDF4J: application configuration diff --git a/tools/console/pom.xml b/tools/console/pom.xml index 3114ffc3012..a342f03ad96 100644 --- a/tools/console/pom.xml +++ b/tools/console/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-console RDF4J: Console diff --git a/tools/federation/pom.xml b/tools/federation/pom.xml index 8d878eb3e01..5430f89d375 100644 --- a/tools/federation/pom.xml +++ b/tools/federation/pom.xml @@ -8,7 +8,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index 96780209a2e..08778066c03 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-tools pom diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml index 46148a94fb8..642959844af 100644 --- a/tools/runtime-osgi/pom.xml +++ b/tools/runtime-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime-osgi bundle diff --git a/tools/runtime/pom.xml b/tools/runtime/pom.xml index 524a3adffee..ccb07aa2992 100644 --- a/tools/runtime/pom.xml +++ b/tools/runtime/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime RDF4J: Runtime diff --git a/tools/server-spring/pom.xml b/tools/server-spring/pom.xml index 97ec6fdf4b2..a3cba434f29 100644 --- a/tools/server-spring/pom.xml +++ b/tools/server-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server-spring RDF4J: HTTP server - core diff --git a/tools/server/pom.xml b/tools/server/pom.xml index 171395da310..5e6fc517570 100644 --- a/tools/server/pom.xml +++ b/tools/server/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server war diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml index 7d1c79f12d1..cabca3a9a48 100644 --- a/tools/workbench/pom.xml +++ b/tools/workbench/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.2-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-workbench war From f7566d03755d6756789b491b4900f462b6e6db3c Mon Sep 17 00:00:00 2001 From: Bart Hanssens Date: Thu, 18 Jul 2024 19:33:49 +0000 Subject: [PATCH 06/37] GH-5064: added docker makefile for Tomcat 9 / Jetty 9 and updated e2e tests Signed-off-by: Bart Hanssens --- docker/Dockerfile-jetty | 36 +++++++++++++ docker/{Dockerfile => Dockerfile-tomcat} | 4 +- docker/README.md | 18 ++++--- docker/build.sh | 53 ++++++++++--------- docker/docker-compose.yml | 9 ++-- docker/run.sh | 4 +- docker/shutdown.sh | 6 +++ docker/{ => tomcat}/web.xml | 0 e2e/run.sh | 50 +++++++++++------ pom.xml | 2 +- .../documentation/tools/server-workbench.md | 5 +- .../main/webapp/WEB-INF/views/overview.jsp | 2 +- 12 files changed, 130 insertions(+), 59 deletions(-) create mode 100644 docker/Dockerfile-jetty rename docker/{Dockerfile => Dockerfile-tomcat} (90%) create mode 100755 docker/shutdown.sh rename docker/{ => tomcat}/web.xml (100%) diff --git a/docker/Dockerfile-jetty b/docker/Dockerfile-jetty new file mode 100644 index 00000000000..b2f3e93d915 --- /dev/null +++ b/docker/Dockerfile-jetty @@ -0,0 +1,36 @@ +# Temp to reduce image size +FROM ubuntu:jammy AS temp + +RUN apt-get clean && apt-get update && apt-get install -y unzip + + +COPY ignore/rdf4j.zip /tmp/rdf4j.zip + +WORKDIR /tmp + +RUN unzip -q /tmp/rdf4j.zip + +# Final workbench +FROM jetty:9-jre17-eclipse-temurin +LABEL org.opencontainers.image.authors="Bart Hanssens (bart.hanssens@bosa.fgov.be)" + +USER root + +ENV JAVA_OPTIONS="-Dorg.eclipse.rdf4j.appdata.basedir=/var/rdf4j -Dorg.eclipse.rdf4j.rio.jsonld_secure_mode=false" +ENV JETTY_MODULES="server,bytebufferpool,threadpool,security,servlet,webapp,ext,plus,deploy,annotations,http,jsp,jstl" + +COPY --from=temp /tmp/eclipse-rdf4j*/war/*.war /var/lib/jetty/webapps/ + +# mimic Tomcat directories for data and logs + +RUN ln -s /usr/local/jetty/logs /var/lib/jetty/logs && \ + mkdir -p /usr/local/jetty/logs /var/rdf4j && \ + chown -R jetty:jetty /usr/local/jetty/logs && \ + chown -R jetty:jetty /var/rdf4j && \ + chown -R jetty:jetty /var/lib/jetty/webapps && \ + java -jar $JETTY_HOME/start.jar --add-to-start=$JETTY_MODULES --approve-all-licenses + +USER jetty + +EXPOSE 8080 + diff --git a/docker/Dockerfile b/docker/Dockerfile-tomcat similarity index 90% rename from docker/Dockerfile rename to docker/Dockerfile-tomcat index 800553f06f6..711e4f7681f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile-tomcat @@ -11,7 +11,7 @@ WORKDIR /tmp RUN unzip -q /tmp/rdf4j.zip # Final workbench -FROM tomcat:8.5-jre11-temurin +FROM tomcat:9-jre17-temurin-jammy MAINTAINER Bart Hanssens (bart.hanssens@bosa.fgov.be) RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get clean @@ -28,7 +28,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ COPY --from=temp /tmp/eclipse-rdf4j*/war/*.war /usr/local/tomcat/webapps/ -COPY web.xml /usr/local/tomcat/conf/web.xml +COPY tomcat/web.xml /usr/local/tomcat/conf/web.xml USER tomcat diff --git a/docker/README.md b/docker/README.md index 47178c7458a..8a96fa1332c 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,8 +1,8 @@ # Eclipse RDF4J server and workbench -Docker image for RDF4J server and workbench, based on the Tomcat 8.5 (JRE 11) image. +Docker image for RDF4J server and workbench, based on a Tomcat 9.0 or Jetty 9.4 (JRE 17) image. -A slightly modified web.mxl is used to fix a known UTF-8 issue +A slightly modified web.mxl is used for Tomcat to fix a known UTF-8 issue (see also http://docs.rdf4j.org/server-workbench-console) ## Port @@ -12,7 +12,7 @@ By default port 8080 is exposed. ## Volumes * RDF4J data will be stored in `/var/rdf4j` - * Tomcat server logs in `/usr/local/tomcat/logs` + * Server logs go to `/usr/local/tomcat/logs` or `/usr/local/jetty/logs` ## Running the docker container @@ -20,21 +20,23 @@ The default java runtime options (-Xmx2g) can be changed by setting the `JAVA_OPTS` environment variable. To avoid data loss between restarts of the docker container, -the exposed volumes can be mapped to existing directories on the host. +the exposed volumes can be mapped to existing (and writable) directories on the host. Example: ``` docker run -d -p 127.0.0.1:8080:8080 -e JAVA_OPTS="-Xms1g -Xmx4g" \ - -v data:/var/rdf4j -v logs:/usr/local/tomcat/logs eclipse/rdf4j + -v /home/rdf4j/data:/var/rdf4j -v /home/rdf4j/logs:/usr/local/tomcat/logs \ + eclipse/rdf4j-workbench ``` -To access your server from another machine you will need to bind to `0.0.0.0` -instead of `127.0.0.1`. - The workbench will be accessible via http://localhost:8080/rdf4j-workbench The server will be accessible via http://localhost:8080/rdf4j-server + +In order to access the workbench and server from another machine, +you will need to bind the docker container to `0.0.0.0` instead of `127.0.0.1`. + ## Security Please note that the RDF4J server in the docker container is not diff --git a/docker/build.sh b/docker/build.sh index d9a7aa6daf2..d128c0661e1 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -5,45 +5,48 @@ set -e CURRENT=$(pwd) cd .. PROJECT_ROOT=$(pwd) +MVN_VERSION=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml) + cd "$CURRENT" -# clean "ignore" directory -cd ignore -rm -f *.zip +if [ -z ${SKIP_BUILD+x} ]; then + # clean "ignore" directory + cd ignore + rm -f *.zip -cd "$PROJECT_ROOT" + cd "$PROJECT_ROOT" -# remove assembly/target since this is not removed by mvn clean -rm -rf assembly/target/ + # remove assembly/target since this is not removed by mvn clean + rm -rf assembly/target/ -MVN_VERSION=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml) + #Clean, format and package + echo "Building with Maven" + mvn clean + mvn -T 2C formatter:format impsort:sort && mvn xml-format:xml-format + mvn install -DskipTests + mvn -Passembly package -DskipTests -Dmaven.javadoc.skip=true -Dformatter.skip=true -Dimpsort.skip=true -Dxml-format.skip=true -Djapicmp.skip -Denforcer.skip=true -Dbuildnumber.plugin.phase=none -Danimal.sniffer.skip=true -#Clean, format and package -echo "Building with Maven" -mvn clean -mvn -T 2C formatter:format impsort:sort && mvn xml-format:xml-format -mvn install -DskipTests -mvn -Passembly package -DskipTests -Dmaven.javadoc.skip=true -Dformatter.skip=true -Dimpsort.skip=true -Dxml-format.skip=true -Djapicmp.skip -Denforcer.skip=true -Dbuildnumber.plugin.phase=none -Danimal.sniffer.skip=true + # find .zip file + ZIP=$(find assembly/target/*.zip) + echo "$ZIP" -# find .zip file -ZIP=$(find assembly/target/*.zip) -echo "$ZIP" + # copy zip file into rdf4j.zip + cp "$ZIP" "${CURRENT}/ignore/rdf4j.zip" -# copy zip file into rdf4j.zip -cp "$ZIP" "${CURRENT}/ignore/rdf4j.zip" - -cd "$CURRENT" + cd "$CURRENT" +fi # build -echo "Building docker image" -docker compose build --pull --no-cache +APP_SERVER=${APP_SERVER:-tomcat} +echo "Building docker image for ${APP_SERVER}" -docker tag docker-rdf4j:latest eclipse/rdf4j-workbench:${MVN_VERSION} +docker compose build --pull --no-cache +docker tag docker-rdf4j:latest eclipse/rdf4j-workbench-${APP_SERVER}:${MVN_VERSION} echo " Docker image tagged as: - docker-rdf4j:latest - eclipse/rdf4j-workbench:${MVN_VERSION} + docker-rdf4j:latest + eclipse/rdf4j-workbench-${APP_SERVER}:${MVN_VERSION} To start the workbench and server: docker compose up -d diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 29fd5ddd6ed..63f5490cda4 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,14 +3,17 @@ services: rdf4j: environment: - APP_LOGGING_LEVEL=${APP_LOGGING_LEVEL} + - APP_SERVER=${APP_SERVER:-tomcat} ports: - 127.0.0.1:8080:8080 - build: . + build: + context: . + dockerfile: Dockerfile-${APP_SERVER:-tomcat} restart: always volumes: - rdf4j_data:/var/rdf4j - - rdf4j_logs:/usr/local/tomcat/logs + - rdf4j_logs:/usr/local/${APP_SERVER:-tomcat}/logs volumes: rdf4j_data: - rdf4j_logs: \ No newline at end of file + rdf4j_logs: diff --git a/docker/run.sh b/docker/run.sh index 1f7572be038..6cf1e75aff8 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -2,12 +2,12 @@ set -e ./build.sh -echo "Starting the docker container" +echo "Starting the docker container for ${APP_SERVER}" docker compose up --force-recreate -d # Wait for the server to be ready. Server is ready when the log contains something like "org.apache.catalina.startup.Catalina.start Server startup in 3400 ms". printf '%s' "Waiting for container to be ready" -while ! docker compose logs rdf4j | grep -q "Server startup in"; do +while ! docker compose logs rdf4j | grep -q -e "Server startup in" -e "Started ServerConnector"; do printf '%s' "." # Exit with error if we have looped 30 times (e.g. 30 seconds) ((c++)) && ((c == 30)) && echo "" && docker compose logs | tee && echo "" && docker ps -a | tee && printf '\n%s\n' "Timed out while waiting!" >&2 && exit 1 diff --git a/docker/shutdown.sh b/docker/shutdown.sh new file mode 100755 index 00000000000..adbdf22d585 --- /dev/null +++ b/docker/shutdown.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +echo "Stopping the docker container for ${APP_SERVER}" +docker compose down --rmi all -v + diff --git a/docker/web.xml b/docker/tomcat/web.xml similarity index 100% rename from docker/web.xml rename to docker/tomcat/web.xml diff --git a/e2e/run.sh b/e2e/run.sh index 130ed050b92..8fb93afce7e 100755 --- a/e2e/run.sh +++ b/e2e/run.sh @@ -12,23 +12,43 @@ set -e -cd .. -cd docker -./run.sh -./waitForDocker.sh -cd .. -cd e2e +for APP_SERVER in tomcat jetty; do + export APP_SERVER + + cd .. + cd docker + ./run.sh + ./waitForDocker.sh + cd .. + cd e2e -sleep 10 + sleep 10 -if [ ! -d 'node_modules' ]; then - echo "npm ci" - npm ci -fi + if [ ! -d 'node_modules' ]; then + echo "npm ci" + npm ci + fi -docker ps + docker ps -npx playwright install --with-deps # install browsers -npx playwright test -exit $? + npx playwright install --with-deps # install browsers + npx playwright test + + status_npx=$? + + cd .. + cd docker + ./shutdown.sh + + # test for error code + if [ $status_npx -ne 0 ] ; then + echo "Error in E2E test for $APP_SERVER" + exit $status_npx + fi + + echo "E2E test for $APP_SERVER OK" + + # don't redo the whole build process just for making another docker image + export SKIP_BUILD="skip" +done diff --git a/pom.xml b/pom.xml index 8338a334348..b878a558b14 100644 --- a/pom.xml +++ b/pom.xml @@ -374,7 +374,7 @@ 5.3.37 32.1.3-jre 1.37 - 3.1.0 + 4.0.0 5.9.3 9.4.54.v20240208 4.1.111.Final diff --git a/site/content/documentation/tools/server-workbench.md b/site/content/documentation/tools/server-workbench.md index 8994b859203..921c1780c73 100644 --- a/site/content/documentation/tools/server-workbench.md +++ b/site/content/documentation/tools/server-workbench.md @@ -15,13 +15,14 @@ RDF4J Server and RDF4J Workbench requires the following software: - Java 11 or newer - A Java Servlet Container that supports Java Servlet API 3.1 and Java Server Pages (JSP) 2.2, or newer. -We recommend using a recent, stable version of [Apache Tomcat](https://tomcat.apache.org/) ([version 9.0](https://tomcat.apache.org/download-90.cgi) at the time of writing). +We recommend using a recent, stable version of [Apache Tomcat](https://tomcat.apache.org/) (version 9.0) or [Jetty](https://jetty.org) (version 9.4) ## Deploying Server and Workbench RDF4J Server is a database management application: it provides HTTP access to RDF4J repositories, exposing them as SPARQL endpoints. RDF4J Server is meant to be accessed by other applications. Apart from some functionality to view the server’s log messages, it doesn’t provide any user oriented functionality. Instead, the user oriented functionality is part of RDF4J Workbench. The Workbench provides a web interface for querying, updating and exploring the repositories of an RDF4J Server. If you have not done so already, you will first need to [download the RDF4J SDK](/download). Both RDF4J Server and RDF4J Workbench can be found in the `war` directory of the SDK. The war-files in this directory need to be deployed in a Java Servlet Container. The deployment process is container-specific, please consult the documentation for your container on how to deploy a web application. For Apache Tomcat, we recommend using the [Tomcat Manager](https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html) to make deployment easier. +For Jetty, it's just a matter of copying the war-files to `$JETTY_BASE\webapps` After you have deployed the RDF4J Workbench webapp, you should be able to access it, by default, at path `http://localhost:8080/rdf4j-workbench`. You can point your browser at this location to verify that the deployment succeeded. @@ -440,7 +441,7 @@ For a list of supported features and more info on how to use SHACL - see [Progra ## Federation -NOTE: new in RDF4J 3.1 +NOTE: since RDF4J 3.1 RDF4J integrates federation support using the [FedX engine](/documentation/programming/federation/). diff --git a/tools/server/src/main/webapp/WEB-INF/views/overview.jsp b/tools/server/src/main/webapp/WEB-INF/views/overview.jsp index ceb7b95bfea..b31deafa835 100644 --- a/tools/server/src/main/webapp/WEB-INF/views/overview.jsp +++ b/tools/server/src/main/webapp/WEB-INF/views/overview.jsp @@ -1,2 +1,2 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - \ No newline at end of file + From 0173d844db10cd646cecb961f295eaccdbb3687c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Fri, 2 Aug 2024 17:43:36 +0200 Subject: [PATCH 07/37] set correct version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håvard Ottestad --- assembly-descriptors/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 2 +- compliance/elasticsearch/pom.xml | 2 +- compliance/geosparql/pom.xml | 2 +- compliance/lucene/pom.xml | 2 +- compliance/model/pom.xml | 2 +- compliance/pom.xml | 2 +- compliance/repository/pom.xml | 2 +- compliance/rio/pom.xml | 2 +- compliance/solr/pom.xml | 2 +- compliance/sparql/pom.xml | 2 +- core/client/pom.xml | 2 +- core/collection-factory/api/pom.xml | 2 +- core/collection-factory/mapdb/pom.xml | 2 +- core/collection-factory/mapdb3/pom.xml | 2 +- core/collection-factory/pom.xml | 2 +- core/common/annotation/pom.xml | 2 +- core/common/exception/pom.xml | 2 +- core/common/io/pom.xml | 2 +- core/common/iterator/pom.xml | 2 +- core/common/order/pom.xml | 2 +- core/common/pom.xml | 2 +- core/common/text/pom.xml | 2 +- core/common/transaction/pom.xml | 2 +- core/common/xml/pom.xml | 2 +- core/http/client/pom.xml | 2 +- core/http/pom.xml | 2 +- core/http/protocol/pom.xml | 2 +- core/model-api/pom.xml | 2 +- core/model-vocabulary/pom.xml | 2 +- core/model/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/queryalgebra/evaluation/pom.xml | 2 +- core/queryalgebra/geosparql/pom.xml | 2 +- core/queryalgebra/model/pom.xml | 2 +- core/queryalgebra/pom.xml | 2 +- core/queryparser/api/pom.xml | 2 +- core/queryparser/pom.xml | 2 +- core/queryparser/sparql/pom.xml | 2 +- core/queryrender/pom.xml | 2 +- core/queryresultio/api/pom.xml | 2 +- core/queryresultio/binary/pom.xml | 2 +- core/queryresultio/pom.xml | 2 +- core/queryresultio/sparqljson/pom.xml | 2 +- core/queryresultio/sparqlxml/pom.xml | 2 +- core/queryresultio/text/pom.xml | 2 +- core/repository/api/pom.xml | 2 +- core/repository/contextaware/pom.xml | 2 +- core/repository/dataset/pom.xml | 2 +- core/repository/event/pom.xml | 2 +- core/repository/http/pom.xml | 2 +- core/repository/manager/pom.xml | 2 +- core/repository/pom.xml | 2 +- core/repository/sail/pom.xml | 2 +- core/repository/sparql/pom.xml | 2 +- core/rio/api/pom.xml | 2 +- core/rio/binary/pom.xml | 2 +- core/rio/datatypes/pom.xml | 2 +- core/rio/hdt/pom.xml | 2 +- core/rio/jsonld-legacy/pom.xml | 2 +- core/rio/jsonld/pom.xml | 2 +- core/rio/languages/pom.xml | 2 +- core/rio/n3/pom.xml | 2 +- core/rio/nquads/pom.xml | 2 +- core/rio/ntriples/pom.xml | 2 +- core/rio/pom.xml | 2 +- core/rio/rdfjson/pom.xml | 2 +- core/rio/rdfxml/pom.xml | 2 +- core/rio/trig/pom.xml | 2 +- core/rio/trix/pom.xml | 2 +- core/rio/turtle/pom.xml | 2 +- core/sail/api/pom.xml | 2 +- core/sail/base/pom.xml | 2 +- core/sail/elasticsearch-store/pom.xml | 2 +- core/sail/elasticsearch/pom.xml | 2 +- core/sail/extensible-store/pom.xml | 2 +- core/sail/inferencer/pom.xml | 2 +- core/sail/lmdb/pom.xml | 2 +- core/sail/lucene-api/pom.xml | 2 +- core/sail/lucene/pom.xml | 2 +- core/sail/memory/pom.xml | 2 +- core/sail/model/pom.xml | 2 +- core/sail/nativerdf/pom.xml | 2 +- core/sail/pom.xml | 2 +- core/sail/shacl/pom.xml | 2 +- core/sail/solr/pom.xml | 2 +- core/sparqlbuilder/pom.xml | 2 +- core/spin/pom.xml | 2 +- core/storage/pom.xml | 2 +- examples/pom.xml | 2 +- pom.xml | 2 +- spring-components/pom.xml | 2 +- spring-components/rdf4j-spring-demo/pom.xml | 2 +- spring-components/rdf4j-spring/pom.xml | 2 +- spring-components/spring-boot-sparql-web/pom.xml | 2 +- testsuites/benchmark/pom.xml | 2 +- testsuites/geosparql/pom.xml | 2 +- testsuites/lucene/pom.xml | 2 +- testsuites/model/pom.xml | 2 +- testsuites/pom.xml | 2 +- testsuites/queryresultio/pom.xml | 2 +- testsuites/repository/pom.xml | 2 +- testsuites/rio/pom.xml | 2 +- testsuites/sail/pom.xml | 2 +- testsuites/sparql/pom.xml | 2 +- tools/config/pom.xml | 2 +- tools/console/pom.xml | 2 +- tools/federation/pom.xml | 2 +- tools/pom.xml | 2 +- tools/runtime-osgi/pom.xml | 2 +- tools/runtime/pom.xml | 2 +- tools/server-spring/pom.xml | 2 +- tools/server/pom.xml | 2 +- tools/workbench/pom.xml | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/assembly-descriptors/pom.xml b/assembly-descriptors/pom.xml index 5b4e1e31c2c..adb16157dc8 100644 --- a/assembly-descriptors/pom.xml +++ b/assembly-descriptors/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly-descriptors RDF4J: Assembly Descriptors diff --git a/assembly/pom.xml b/assembly/pom.xml index 113bc8b4fbf..a88d567f0e5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-assembly pom diff --git a/bom/pom.xml b/bom/pom.xml index a0beb8e86b0..f9a2a634d30 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-bom pom diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml index 9572a526d12..794dacb7bd7 100644 --- a/compliance/elasticsearch/pom.xml +++ b/compliance/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-elasticsearch-compliance RDF4J: Elasticsearch Sail Tests diff --git a/compliance/geosparql/pom.xml b/compliance/geosparql/pom.xml index 29cfadd3b23..41e8785595b 100644 --- a/compliance/geosparql/pom.xml +++ b/compliance/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-compliance RDF4J: GeoSPARQL compliance tests diff --git a/compliance/lucene/pom.xml b/compliance/lucene/pom.xml index f1743d9365d..dcf84054c6d 100644 --- a/compliance/lucene/pom.xml +++ b/compliance/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-compliance RDF4J: Lucene Sail Tests diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml index 4dc2bba77d5..3d3ac105fa9 100644 --- a/compliance/model/pom.xml +++ b/compliance/model/pom.xml @@ -3,7 +3,7 @@ rdf4j-compliance org.eclipse.rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT 4.0.0 rdf4j-model-compliance diff --git a/compliance/pom.xml b/compliance/pom.xml index 6f647a7f8c6..7a3f7a3e7ff 100644 --- a/compliance/pom.xml +++ b/compliance/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-compliance pom diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml index 4462f2ac42f..069ade53eec 100644 --- a/compliance/repository/pom.xml +++ b/compliance/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-compliance war diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml index 4facf6c5333..850062bf2f4 100644 --- a/compliance/rio/pom.xml +++ b/compliance/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-compliance RDF4J: Rio compliance tests diff --git a/compliance/solr/pom.xml b/compliance/solr/pom.xml index a99d8bce07d..454f5295ca6 100644 --- a/compliance/solr/pom.xml +++ b/compliance/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-solr-compliance RDF4J: Solr Sail Tests diff --git a/compliance/sparql/pom.xml b/compliance/sparql/pom.xml index a92e335fc1a..3340661c18d 100644 --- a/compliance/sparql/pom.xml +++ b/compliance/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-compliance - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-compliance war diff --git a/core/client/pom.xml b/core/client/pom.xml index afe7b45bac2..845360a26cc 100644 --- a/core/client/pom.xml +++ b/core/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-client RDF4J: Client Libraries diff --git a/core/collection-factory/api/pom.xml b/core/collection-factory/api/pom.xml index afe221f4e15..5ba6df646b7 100644 --- a/core/collection-factory/api/pom.xml +++ b/core/collection-factory/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-api RDF4J: Collection Factory - API diff --git a/core/collection-factory/mapdb/pom.xml b/core/collection-factory/mapdb/pom.xml index ceac9ec1f8f..c8e843b984e 100644 --- a/core/collection-factory/mapdb/pom.xml +++ b/core/collection-factory/mapdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb RDF4J: Collection Factory - Map DB backed diff --git a/core/collection-factory/mapdb3/pom.xml b/core/collection-factory/mapdb3/pom.xml index d36051ac023..a00d4c8e811 100644 --- a/core/collection-factory/mapdb3/pom.xml +++ b/core/collection-factory/mapdb3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-collection-factory - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory-mapdb3 RDF4J: Collection Factory - Map DB v3 backed diff --git a/core/collection-factory/pom.xml b/core/collection-factory/pom.xml index 6459d2b1bca..bb1df7bb226 100644 --- a/core/collection-factory/pom.xml +++ b/core/collection-factory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-collection-factory pom diff --git a/core/common/annotation/pom.xml b/core/common/annotation/pom.xml index 0ccf749beb6..f5f53a65e21 100644 --- a/core/common/annotation/pom.xml +++ b/core/common/annotation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-annotation RDF4J: common annotation diff --git a/core/common/exception/pom.xml b/core/common/exception/pom.xml index 3fca16b75b3..bbd533f1adf 100644 --- a/core/common/exception/pom.xml +++ b/core/common/exception/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-exception RDF4J: common exception diff --git a/core/common/io/pom.xml b/core/common/io/pom.xml index d9ed22c41e3..f99f7f2af4e 100644 --- a/core/common/io/pom.xml +++ b/core/common/io/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-io RDF4J: common IO diff --git a/core/common/iterator/pom.xml b/core/common/iterator/pom.xml index fb057d78054..c8b62012574 100644 --- a/core/common/iterator/pom.xml +++ b/core/common/iterator/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-iterator RDF4J: common iterators diff --git a/core/common/order/pom.xml b/core/common/order/pom.xml index 80ec2a1ecdc..5228081fc0e 100644 --- a/core/common/order/pom.xml +++ b/core/common/order/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-order RDF4J: common order diff --git a/core/common/pom.xml b/core/common/pom.xml index a0732fdbbb4..fc821867500 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common pom diff --git a/core/common/text/pom.xml b/core/common/text/pom.xml index 077b3c14ade..f26391a3d11 100644 --- a/core/common/text/pom.xml +++ b/core/common/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-text RDF4J: common text diff --git a/core/common/transaction/pom.xml b/core/common/transaction/pom.xml index 43cfd8a76df..2a327eba54c 100644 --- a/core/common/transaction/pom.xml +++ b/core/common/transaction/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-transaction RDF4J: common transaction diff --git a/core/common/xml/pom.xml b/core/common/xml/pom.xml index 3d714797c0e..76184d6e127 100644 --- a/core/common/xml/pom.xml +++ b/core/common/xml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-common - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-common-xml RDF4J: common XML diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml index f971d6ada2a..8e26e6c8d3f 100644 --- a/core/http/client/pom.xml +++ b/core/http/client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-client RDF4J: HTTP client diff --git a/core/http/pom.xml b/core/http/pom.xml index 800c46d2ed3..ee3e0261ad0 100644 --- a/core/http/pom.xml +++ b/core/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http pom diff --git a/core/http/protocol/pom.xml b/core/http/protocol/pom.xml index babf44e2fb9..a5d66a693e0 100644 --- a/core/http/protocol/pom.xml +++ b/core/http/protocol/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-http - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-protocol RDF4J: HTTP protocol diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml index 4e7217500a5..cf07e38798c 100644 --- a/core/model-api/pom.xml +++ b/core/model-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-api RDF4J: Model API diff --git a/core/model-vocabulary/pom.xml b/core/model-vocabulary/pom.xml index 45f3bd2e0e6..bd27791c1d8 100644 --- a/core/model-vocabulary/pom.xml +++ b/core/model-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-vocabulary RDF4J: RDF Vocabularies diff --git a/core/model/pom.xml b/core/model/pom.xml index 6fe6c46a313..17a4deb868b 100644 --- a/core/model/pom.xml +++ b/core/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model RDF4J: Model diff --git a/core/pom.xml b/core/pom.xml index d7882604b6c..ed94faedcde 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-core pom diff --git a/core/query/pom.xml b/core/query/pom.xml index d6a1a4d5c1c..6600bd51a4e 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-query RDF4J: Query diff --git a/core/queryalgebra/evaluation/pom.xml b/core/queryalgebra/evaluation/pom.xml index 079ecf071fa..a29c5f1ab29 100644 --- a/core/queryalgebra/evaluation/pom.xml +++ b/core/queryalgebra/evaluation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-evaluation RDF4J: Query algebra - evaluation diff --git a/core/queryalgebra/geosparql/pom.xml b/core/queryalgebra/geosparql/pom.xml index 08183977eab..10fcbc837ce 100644 --- a/core/queryalgebra/geosparql/pom.xml +++ b/core/queryalgebra/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-geosparql RDF4J: Query algebra - GeoSPARQL diff --git a/core/queryalgebra/model/pom.xml b/core/queryalgebra/model/pom.xml index 56685af9662..c561441a066 100644 --- a/core/queryalgebra/model/pom.xml +++ b/core/queryalgebra/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryalgebra - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra-model RDF4J: Query algebra - model diff --git a/core/queryalgebra/pom.xml b/core/queryalgebra/pom.xml index d680dddf774..fb04d8339cd 100644 --- a/core/queryalgebra/pom.xml +++ b/core/queryalgebra/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryalgebra pom diff --git a/core/queryparser/api/pom.xml b/core/queryparser/api/pom.xml index fcd727095bc..6450c375f42 100644 --- a/core/queryparser/api/pom.xml +++ b/core/queryparser/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-api RDF4J: Query parser - API diff --git a/core/queryparser/pom.xml b/core/queryparser/pom.xml index ad7e93c1fb2..0dfcb8573d3 100644 --- a/core/queryparser/pom.xml +++ b/core/queryparser/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser pom diff --git a/core/queryparser/sparql/pom.xml b/core/queryparser/sparql/pom.xml index 97e993b54ef..d21ecf2b1b2 100644 --- a/core/queryparser/sparql/pom.xml +++ b/core/queryparser/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryparser - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryparser-sparql RDF4J: Query parser - SPARQL diff --git a/core/queryrender/pom.xml b/core/queryrender/pom.xml index d2202af3b42..8db12169a80 100644 --- a/core/queryrender/pom.xml +++ b/core/queryrender/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryrender RDF4J: Query Rendering diff --git a/core/queryresultio/api/pom.xml b/core/queryresultio/api/pom.xml index a83644cca0b..273fe3b9801 100644 --- a/core/queryresultio/api/pom.xml +++ b/core/queryresultio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-api RDF4J: Query result IO - API diff --git a/core/queryresultio/binary/pom.xml b/core/queryresultio/binary/pom.xml index fc0f24c39e8..34df6c0b64f 100644 --- a/core/queryresultio/binary/pom.xml +++ b/core/queryresultio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-binary RDF4J: Query result IO - binary diff --git a/core/queryresultio/pom.xml b/core/queryresultio/pom.xml index e0d8a74e9c7..c1ba95a8c53 100644 --- a/core/queryresultio/pom.xml +++ b/core/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio pom diff --git a/core/queryresultio/sparqljson/pom.xml b/core/queryresultio/sparqljson/pom.xml index c15482d74e5..c5f589b6457 100644 --- a/core/queryresultio/sparqljson/pom.xml +++ b/core/queryresultio/sparqljson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqljson RDF4J: Query result IO - SPARQL/JSON diff --git a/core/queryresultio/sparqlxml/pom.xml b/core/queryresultio/sparqlxml/pom.xml index 40960bf2d36..8d7bee2745b 100644 --- a/core/queryresultio/sparqlxml/pom.xml +++ b/core/queryresultio/sparqlxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-sparqlxml RDF4J: Query result IO - SPARQL/XML diff --git a/core/queryresultio/text/pom.xml b/core/queryresultio/text/pom.xml index f458e35cb88..e5f67e0b32e 100644 --- a/core/queryresultio/text/pom.xml +++ b/core/queryresultio/text/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-queryresultio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-text RDF4J: Query result IO - plain text booleans diff --git a/core/repository/api/pom.xml b/core/repository/api/pom.xml index 8f70c452590..48fdeecfad7 100644 --- a/core/repository/api/pom.xml +++ b/core/repository/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-api RDF4J: Repository - API diff --git a/core/repository/contextaware/pom.xml b/core/repository/contextaware/pom.xml index 8b43fb77474..39bcbf0668c 100644 --- a/core/repository/contextaware/pom.xml +++ b/core/repository/contextaware/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-contextaware RDF4J: Repository - context aware (wrapper) diff --git a/core/repository/dataset/pom.xml b/core/repository/dataset/pom.xml index 18bc1555e79..c843dccda42 100644 --- a/core/repository/dataset/pom.xml +++ b/core/repository/dataset/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-dataset RDF4J: DatasetRepository (wrapper) diff --git a/core/repository/event/pom.xml b/core/repository/event/pom.xml index 95e5de0d3fa..3a3109cf967 100644 --- a/core/repository/event/pom.xml +++ b/core/repository/event/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-event RDF4J: Repository - event (wrapper) diff --git a/core/repository/http/pom.xml b/core/repository/http/pom.xml index da8ae5b68eb..4fc07dc06e9 100644 --- a/core/repository/http/pom.xml +++ b/core/repository/http/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-http RDF4J: HTTPRepository diff --git a/core/repository/manager/pom.xml b/core/repository/manager/pom.xml index 5399306c188..bad53d7101e 100644 --- a/core/repository/manager/pom.xml +++ b/core/repository/manager/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-manager RDF4J: Repository manager diff --git a/core/repository/pom.xml b/core/repository/pom.xml index 58684588998..873757a9580 100644 --- a/core/repository/pom.xml +++ b/core/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository pom diff --git a/core/repository/sail/pom.xml b/core/repository/sail/pom.xml index 9c740f1d47e..fb8fc483b2b 100644 --- a/core/repository/sail/pom.xml +++ b/core/repository/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sail RDF4J: SailRepository diff --git a/core/repository/sparql/pom.xml b/core/repository/sparql/pom.xml index 7997f8b1a6c..66d5ee263ce 100644 --- a/core/repository/sparql/pom.xml +++ b/core/repository/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-repository - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-sparql RDF4J: SPARQL Repository diff --git a/core/rio/api/pom.xml b/core/rio/api/pom.xml index ace2daabda7..3733b074423 100644 --- a/core/rio/api/pom.xml +++ b/core/rio/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-api RDF4J: Rio - API diff --git a/core/rio/binary/pom.xml b/core/rio/binary/pom.xml index 4feafbee97c..4ff5469eddf 100644 --- a/core/rio/binary/pom.xml +++ b/core/rio/binary/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-binary RDF4J: Rio - Binary diff --git a/core/rio/datatypes/pom.xml b/core/rio/datatypes/pom.xml index 34849ddb71f..b9d9dcadcfb 100644 --- a/core/rio/datatypes/pom.xml +++ b/core/rio/datatypes/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-datatypes RDF4J: Rio - Datatypes diff --git a/core/rio/hdt/pom.xml b/core/rio/hdt/pom.xml index deb03a86f85..f3647663a65 100644 --- a/core/rio/hdt/pom.xml +++ b/core/rio/hdt/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-hdt jar diff --git a/core/rio/jsonld-legacy/pom.xml b/core/rio/jsonld-legacy/pom.xml index 251ba808efb..7509ef4b834 100644 --- a/core/rio/jsonld-legacy/pom.xml +++ b/core/rio/jsonld-legacy/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld-legacy RDF4J: Rio - JSON-LD 1.0 (legacy) diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml index 538db72439a..c817e4db0af 100644 --- a/core/rio/jsonld/pom.xml +++ b/core/rio/jsonld/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-jsonld RDF4J: Rio - JSON-LD diff --git a/core/rio/languages/pom.xml b/core/rio/languages/pom.xml index d6b563f121b..b35931702bb 100644 --- a/core/rio/languages/pom.xml +++ b/core/rio/languages/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-languages RDF4J: Rio - Languages diff --git a/core/rio/n3/pom.xml b/core/rio/n3/pom.xml index d6d31c61121..54ae5fe573c 100644 --- a/core/rio/n3/pom.xml +++ b/core/rio/n3/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-n3 RDF4J: Rio - N3 (writer-only) diff --git a/core/rio/nquads/pom.xml b/core/rio/nquads/pom.xml index 754eea195ad..044216524fb 100644 --- a/core/rio/nquads/pom.xml +++ b/core/rio/nquads/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-nquads RDF4J: Rio - N-Quads diff --git a/core/rio/ntriples/pom.xml b/core/rio/ntriples/pom.xml index f4c786c509b..37553504ed5 100644 --- a/core/rio/ntriples/pom.xml +++ b/core/rio/ntriples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-ntriples RDF4J: Rio - N-Triples diff --git a/core/rio/pom.xml b/core/rio/pom.xml index 6392c40a680..77fc1cee292 100644 --- a/core/rio/pom.xml +++ b/core/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio pom diff --git a/core/rio/rdfjson/pom.xml b/core/rio/rdfjson/pom.xml index 1498e9447f7..55a3e3ad374 100644 --- a/core/rio/rdfjson/pom.xml +++ b/core/rio/rdfjson/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfjson RDF4J: Rio - RDF/JSON diff --git a/core/rio/rdfxml/pom.xml b/core/rio/rdfxml/pom.xml index 87e79b349e5..08a1e0f6eb3 100644 --- a/core/rio/rdfxml/pom.xml +++ b/core/rio/rdfxml/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-rdfxml RDF4J: Rio - RDF/XML diff --git a/core/rio/trig/pom.xml b/core/rio/trig/pom.xml index 1d264b72071..2736b12a916 100644 --- a/core/rio/trig/pom.xml +++ b/core/rio/trig/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trig RDF4J: Rio - TriG diff --git a/core/rio/trix/pom.xml b/core/rio/trix/pom.xml index 9c523b2a9c6..a8b99df7634 100644 --- a/core/rio/trix/pom.xml +++ b/core/rio/trix/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-trix RDF4J: Rio - TriX diff --git a/core/rio/turtle/pom.xml b/core/rio/turtle/pom.xml index 5ac54e30b0e..087f4221601 100644 --- a/core/rio/turtle/pom.xml +++ b/core/rio/turtle/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-rio - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-turtle RDF4J: Rio - Turtle diff --git a/core/sail/api/pom.xml b/core/sail/api/pom.xml index f5e36f9d860..94ba13deba0 100644 --- a/core/sail/api/pom.xml +++ b/core/sail/api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-api RDF4J: Sail API diff --git a/core/sail/base/pom.xml b/core/sail/base/pom.xml index 8266e2e3307..37f440d24a5 100644 --- a/core/sail/base/pom.xml +++ b/core/sail/base/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-base RDF4J: Sail base implementations diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml index c28fa1a0356..8542f4a1aaa 100644 --- a/core/sail/elasticsearch-store/pom.xml +++ b/core/sail/elasticsearch-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch-store RDF4J: Elasticsearch Store diff --git a/core/sail/elasticsearch/pom.xml b/core/sail/elasticsearch/pom.xml index 97308f75c02..022319c4697 100644 --- a/core/sail/elasticsearch/pom.xml +++ b/core/sail/elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-elasticsearch RDF4J: Elastic Search Sail Index diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml index b9b653c8576..e8d6a1af491 100644 --- a/core/sail/extensible-store/pom.xml +++ b/core/sail/extensible-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-extensible-store RDF4J: Extensible Store diff --git a/core/sail/inferencer/pom.xml b/core/sail/inferencer/pom.xml index 7db5e1d72fc..45babf4a3e2 100644 --- a/core/sail/inferencer/pom.xml +++ b/core/sail/inferencer/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-inferencer RDF4J: Inferencer Sails diff --git a/core/sail/lmdb/pom.xml b/core/sail/lmdb/pom.xml index d1f7ca924e8..9a494fe3521 100644 --- a/core/sail/lmdb/pom.xml +++ b/core/sail/lmdb/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lmdb RDF4J: LmdbStore diff --git a/core/sail/lucene-api/pom.xml b/core/sail/lucene-api/pom.xml index c84f3dc70b1..a52d440fc00 100644 --- a/core/sail/lucene-api/pom.xml +++ b/core/sail/lucene-api/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene-api RDF4J: Lucene Sail API diff --git a/core/sail/lucene/pom.xml b/core/sail/lucene/pom.xml index 58e7bcf7578..530c6ac3c5d 100644 --- a/core/sail/lucene/pom.xml +++ b/core/sail/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-lucene RDF4J: Lucene Sail Index diff --git a/core/sail/memory/pom.xml b/core/sail/memory/pom.xml index a6c97202f4a..ae81a8c5531 100644 --- a/core/sail/memory/pom.xml +++ b/core/sail/memory/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-memory RDF4J: MemoryStore diff --git a/core/sail/model/pom.xml b/core/sail/model/pom.xml index a1e8fd78289..531c473d10a 100644 --- a/core/sail/model/pom.xml +++ b/core/sail/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-model RDF4J: Sail Model diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml index 389a95854ec..17dbcc1c962 100644 --- a/core/sail/nativerdf/pom.xml +++ b/core/sail/nativerdf/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-nativerdf RDF4J: NativeStore diff --git a/core/sail/pom.xml b/core/sail/pom.xml index 34de9feece2..cbce9f38bc7 100644 --- a/core/sail/pom.xml +++ b/core/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail pom diff --git a/core/sail/shacl/pom.xml b/core/sail/shacl/pom.xml index 2c8e17a53db..9cae94fe046 100644 --- a/core/sail/shacl/pom.xml +++ b/core/sail/shacl/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-shacl RDF4J: SHACL diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml index dee25e97991..c79bfa393e7 100644 --- a/core/sail/solr/pom.xml +++ b/core/sail/solr/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-sail - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-solr RDF4J: Solr Sail Index diff --git a/core/sparqlbuilder/pom.xml b/core/sparqlbuilder/pom.xml index b341f935867..2e589196e67 100644 --- a/core/sparqlbuilder/pom.xml +++ b/core/sparqlbuilder/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparqlbuilder RDF4J: SparqlBuilder diff --git a/core/spin/pom.xml b/core/spin/pom.xml index 25d3bbfcdd9..b80e9d40e04 100644 --- a/core/spin/pom.xml +++ b/core/spin/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spin RDF4J: SPIN diff --git a/core/storage/pom.xml b/core/storage/pom.xml index a4b481f0172..6775e4bf837 100644 --- a/core/storage/pom.xml +++ b/core/storage/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-core - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-storage RDF4J: Storage Libraries diff --git a/examples/pom.xml b/examples/pom.xml index a51049eb8fd..5610e589454 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index dd4077e63df..8338a334348 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT pom Eclipse RDF4J An extensible Java framework for RDF and SPARQL diff --git a/spring-components/pom.xml b/spring-components/pom.xml index 441a9596b4c..571eebb5bce 100644 --- a/spring-components/pom.xml +++ b/spring-components/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT pom diff --git a/spring-components/rdf4j-spring-demo/pom.xml b/spring-components/rdf4j-spring-demo/pom.xml index f23b6c9ac8b..e3376a0dd51 100644 --- a/spring-components/rdf4j-spring-demo/pom.xml +++ b/spring-components/rdf4j-spring-demo/pom.xml @@ -7,7 +7,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/spring-components/rdf4j-spring/pom.xml b/spring-components/rdf4j-spring/pom.xml index cf865b77975..b3616e04951 100644 --- a/spring-components/rdf4j-spring/pom.xml +++ b/spring-components/rdf4j-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring RDF4J: Spring diff --git a/spring-components/spring-boot-sparql-web/pom.xml b/spring-components/spring-boot-sparql-web/pom.xml index 5921ad671e1..222e9020799 100644 --- a/spring-components/spring-boot-sparql-web/pom.xml +++ b/spring-components/spring-boot-sparql-web/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-spring-components - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-spring-boot-sparql-web RDF4J: Spring boot component for a HTTP sparql server diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml index 59499ed1d04..d2d51f0daa4 100644 --- a/testsuites/benchmark/pom.xml +++ b/testsuites/benchmark/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-benchmark RDF4J: benchmarks diff --git a/testsuites/geosparql/pom.xml b/testsuites/geosparql/pom.xml index 8a6e79b0418..3ebb0735c3e 100644 --- a/testsuites/geosparql/pom.xml +++ b/testsuites/geosparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-geosparql-testsuite RDF4J: GeoSPARQL compliance test suite diff --git a/testsuites/lucene/pom.xml b/testsuites/lucene/pom.xml index 113e851f5d6..cf0c02226d8 100644 --- a/testsuites/lucene/pom.xml +++ b/testsuites/lucene/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-lucene-testsuite RDF4J: Lucene Sail Tests diff --git a/testsuites/model/pom.xml b/testsuites/model/pom.xml index ba3b2faf790..cc4dc7ab767 100644 --- a/testsuites/model/pom.xml +++ b/testsuites/model/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-model-testsuite RDF4J: Model API testsuite diff --git a/testsuites/pom.xml b/testsuites/pom.xml index aa7cfc9660b..42088f21a4d 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-testsuites pom diff --git a/testsuites/queryresultio/pom.xml b/testsuites/queryresultio/pom.xml index 94c4c69e717..feaf586b953 100644 --- a/testsuites/queryresultio/pom.xml +++ b/testsuites/queryresultio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-queryresultio-testsuite RDF4J: QueryResultIO testsuite diff --git a/testsuites/repository/pom.xml b/testsuites/repository/pom.xml index 5082486510b..d58184a0a20 100644 --- a/testsuites/repository/pom.xml +++ b/testsuites/repository/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-repository-testsuite RDF4J: Repository API testsuite diff --git a/testsuites/rio/pom.xml b/testsuites/rio/pom.xml index 08f4cd67d84..8bab2f967d5 100644 --- a/testsuites/rio/pom.xml +++ b/testsuites/rio/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-rio-testsuite RDF4J: Rio compliance test suite diff --git a/testsuites/sail/pom.xml b/testsuites/sail/pom.xml index d6578b919b7..4b9b7d6c2d1 100644 --- a/testsuites/sail/pom.xml +++ b/testsuites/sail/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sail-testsuite RDF4J: Sail API testsuite diff --git a/testsuites/sparql/pom.xml b/testsuites/sparql/pom.xml index 60d84a1d341..6d81c721943 100644 --- a/testsuites/sparql/pom.xml +++ b/testsuites/sparql/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-testsuites - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-sparql-testsuite RDF4J: SPARQL compliance test suite diff --git a/tools/config/pom.xml b/tools/config/pom.xml index 1dda7ec834c..c6e819ebcc0 100644 --- a/tools/config/pom.xml +++ b/tools/config/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-config RDF4J: application configuration diff --git a/tools/console/pom.xml b/tools/console/pom.xml index 7f0d0deb5ee..a342f03ad96 100644 --- a/tools/console/pom.xml +++ b/tools/console/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-console RDF4J: Console diff --git a/tools/federation/pom.xml b/tools/federation/pom.xml index 6e1a74948b1..5430f89d375 100644 --- a/tools/federation/pom.xml +++ b/tools/federation/pom.xml @@ -8,7 +8,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index 9c3df6579ea..08778066c03 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-tools pom diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml index 782027a80f0..642959844af 100644 --- a/tools/runtime-osgi/pom.xml +++ b/tools/runtime-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime-osgi bundle diff --git a/tools/runtime/pom.xml b/tools/runtime/pom.xml index d7863b53e63..ccb07aa2992 100644 --- a/tools/runtime/pom.xml +++ b/tools/runtime/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-runtime RDF4J: Runtime diff --git a/tools/server-spring/pom.xml b/tools/server-spring/pom.xml index 2508a984f45..a3cba434f29 100644 --- a/tools/server-spring/pom.xml +++ b/tools/server-spring/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server-spring RDF4J: HTTP server - core diff --git a/tools/server/pom.xml b/tools/server/pom.xml index 8e98a26dbd1..5e6fc517570 100644 --- a/tools/server/pom.xml +++ b/tools/server/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-server war diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml index 9df0f339c8d..cabca3a9a48 100644 --- a/tools/workbench/pom.xml +++ b/tools/workbench/pom.xml @@ -4,7 +4,7 @@ org.eclipse.rdf4j rdf4j-tools - 5.0.3-SNAPSHOT + 5.1.0-SNAPSHOT rdf4j-http-workbench war From 20416e24196661d11637ce2d4f4ea5dfecebac5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Avard=20Ottestad?= Date: Fri, 13 Sep 2024 14:56:26 +0200 Subject: [PATCH 08/37] GH-5124 make the three main HttpClient timeouts configurable with sensible defaults. --- .../SharedHttpClientSessionManager.java | 213 +++++++++++++++++- .../federation/SPARQLServiceResolver.java | 15 +- .../provider/RemoteRepositoryProvider.java | 12 +- 3 files changed, 235 insertions(+), 5 deletions(-) diff --git a/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SharedHttpClientSessionManager.java b/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SharedHttpClientSessionManager.java index 43412f081f9..b5a2ff56505 100644 --- a/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SharedHttpClientSessionManager.java +++ b/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SharedHttpClientSessionManager.java @@ -34,6 +34,7 @@ import org.apache.http.client.utils.HttpClientUtils; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; import org.eclipse.rdf4j.http.client.util.HttpClientBuilders; import org.slf4j.Logger; @@ -53,6 +54,163 @@ public class SharedHttpClientSessionManager implements HttpClientSessionManager, private static final AtomicLong threadCount = new AtomicLong(); + // System property constants for regular timeouts + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.http.connectionTimeout} for specifying the HTTP + * connection timeout in milliseconds for general use. Default is 1 hour. + * + *

+ * The connection timeout determines the maximum time the client will wait to establish a TCP connection to the + * server. A default of 1 hour is set to allow for potential network delays without causing unnecessary timeouts. + *

+ */ + public static final String CONNECTION_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.http.connectionTimeout"; + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.http.connectionRequestTimeout} for specifying the + * HTTP connection request timeout in milliseconds for general use. Default is 10 days. + * + *

+ * The connection request timeout defines how long the client will wait for a connection from the connection pool. A + * longer timeout is acceptable here since operations like large file uploads may need to wait for an available + * connection. + *

+ */ + public static final String CONNECTION_REQUEST_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.http.connectionRequestTimeout"; + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.http.socketTimeout} for specifying the HTTP socket + * timeout in milliseconds for general use. Default is 10 days. + * + *

+ * The socket timeout controls the maximum period of inactivity between data packets during data transfer. A longer + * timeout is appropriate for large data transfers, ensuring that operations are not interrupted prematurely. + *

+ */ + public static final String SOCKET_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.http.socketTimeout"; + + // System property constants for SPARQL SERVICE timeouts + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.sparql.http.connectionTimeout} for specifying the + * HTTP connection timeout in milliseconds when used in SPARQL SERVICE calls. Default is 10 minutes. + * + *

+ * A shorter connection timeout is set for SPARQL SERVICE calls to quickly detect unresponsive endpoints in + * federated queries, improving overall query performance by avoiding long waits for unreachable servers. + *

+ */ + public static final String SPARQL_CONNECTION_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.sparql.http.connectionTimeout"; + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.sparql.http.connectionRequestTimeout} for specifying + * the HTTP connection request timeout in milliseconds when used in SPARQL SERVICE calls. Default is 6 hours. + * + *

+ * This timeout controls how long the client waits for a connection from the pool when making SPARQL SERVICE calls. + * A shorter timeout than general use ensures that queries fail fast if resources are constrained, maintaining + * responsiveness. + *

+ */ + public static final String SPARQL_CONNECTION_REQUEST_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.sparql.http.connectionRequestTimeout"; + + /** + * Configurable system property {@code org.eclipse.rdf4j.client.sparql.http.socketTimeout} for specifying the HTTP + * socket timeout in milliseconds when used in SPARQL SERVICE calls. Default is 6 hours. + * + *

+ * The socket timeout for SPARQL SERVICE calls is set to a shorter duration to detect unresponsive servers during + * data transfer, ensuring that the client does not wait indefinitely for data that may never arrive. + *

+ */ + public static final String SPARQL_SOCKET_TIMEOUT_PROPERTY = "org.eclipse.rdf4j.client.sparql.http.socketTimeout"; + + // Default timeout values for general use + + /** + * Default HTTP connection timeout in milliseconds for general use. Set to 1 hour. + */ + public static final int DEFAULT_CONNECTION_TIMEOUT = 60 * 60 * 1000; // 1 hour + + /** + * Default HTTP connection request timeout in milliseconds for general use. Set to 10 days. + */ + public static final int DEFAULT_CONNECTION_REQUEST_TIMEOUT = 10 * 24 * 60 * 60 * 1000; // 10 days + + /** + * Default HTTP socket timeout in milliseconds for general use. Set to 10 days. + */ + public static final int DEFAULT_SOCKET_TIMEOUT = 10 * 24 * 60 * 60 * 1000; // 10 days + + // Default timeout values for SPARQL SERVICE calls + + /** + * Default HTTP connection timeout in milliseconds for SPARQL SERVICE calls. Set to 10 minutes. + */ + public static final int DEFAULT_SPARQL_CONNECTION_TIMEOUT = 10 * 60 * 1000; // 10 minutes + + /** + * Default HTTP connection request timeout in milliseconds for SPARQL SERVICE calls. Set to 6 hours. + */ + public static final int DEFAULT_SPARQL_CONNECTION_REQUEST_TIMEOUT = 6 * 60 * 60 * 1000; // 6 hours + + /** + * Default HTTP socket timeout in milliseconds for SPARQL SERVICE calls. Set to 6 hours. + */ + public static final int DEFAULT_SPARQL_SOCKET_TIMEOUT = 6 * 60 * 60 * 1000; // 6 hours + + // Timeout values as read from system properties or defaults + + /** + * HTTP connection timeout in milliseconds for general use. + */ + public static final int CONNECTION_TIMEOUT = Integer.parseInt( + System.getProperty(CONNECTION_TIMEOUT_PROPERTY, String.valueOf(DEFAULT_CONNECTION_TIMEOUT)) + ); + + /** + * HTTP connection request timeout in milliseconds for general use. + */ + public static final int CONNECTION_REQUEST_TIMEOUT = Integer.parseInt( + System.getProperty(CONNECTION_REQUEST_TIMEOUT_PROPERTY, String.valueOf(DEFAULT_CONNECTION_REQUEST_TIMEOUT)) + ); + + /** + * HTTP socket timeout in milliseconds for general use. + */ + public static final int SOCKET_TIMEOUT = Integer.parseInt( + System.getProperty(SOCKET_TIMEOUT_PROPERTY, String.valueOf(DEFAULT_SOCKET_TIMEOUT)) + ); + + /** + * HTTP connection timeout in milliseconds for SPARQL SERVICE calls. + */ + public static final int SPARQL_CONNECTION_TIMEOUT = Integer.parseInt( + System.getProperty(SPARQL_CONNECTION_TIMEOUT_PROPERTY, String.valueOf(DEFAULT_SPARQL_CONNECTION_TIMEOUT)) + ); + + /** + * HTTP connection request timeout in milliseconds for SPARQL SERVICE calls. + */ + public static final int SPARQL_CONNECTION_REQUEST_TIMEOUT = Integer.parseInt( + System.getProperty(SPARQL_CONNECTION_REQUEST_TIMEOUT_PROPERTY, + String.valueOf(DEFAULT_SPARQL_CONNECTION_REQUEST_TIMEOUT)) + ); + + /** + * HTTP socket timeout in milliseconds for SPARQL SERVICE calls. + */ + public static final int SPARQL_SOCKET_TIMEOUT = Integer.parseInt( + System.getProperty(SPARQL_SOCKET_TIMEOUT_PROPERTY, String.valueOf(DEFAULT_SPARQL_SOCKET_TIMEOUT)) + ); + + // Variables for the currently used timeouts + + private int currentConnectionTimeout = CONNECTION_TIMEOUT; + private int currentConnectionRequestTimeout = CONNECTION_REQUEST_TIMEOUT; + private int currentSocketTimeout = SOCKET_TIMEOUT; + private final Logger logger = LoggerFactory.getLogger(SharedHttpClientSessionManager.class); /** @@ -267,6 +425,7 @@ public void close() { @Override public void shutDown() { try { + // Close open sessions openSessions.keySet().forEach(session -> { try { session.close(); @@ -280,11 +439,11 @@ public void shutDown() { HttpClientUtils.closeQuietly(toCloseDependentClient); } } finally { + // Shutdown the executor try { executor.shutdown(); executor.awaitTermination(10, TimeUnit.SECONDS); } catch (InterruptedException e) { - // Preserve the interrupt status so others can check it as necessary Thread.currentThread().interrupt(); } finally { if (!executor.isTerminated()) { @@ -314,17 +473,67 @@ protected final ExecutorService getExecutorService() { } private CloseableHttpClient createHttpClient() { + HttpClientBuilder nextHttpClientBuilder = httpClientBuilder; if (nextHttpClientBuilder != null) { return nextHttpClientBuilder.build(); } + RequestConfig requestConfig = getDefaultRequestConfig(); + return HttpClientBuilder.create() .evictExpiredConnections() + .evictIdleConnections(30, TimeUnit.MINUTES) .setRetryHandler(retryHandlerStale) .setServiceUnavailableRetryStrategy(serviceUnavailableRetryHandler) .useSystemProperties() - .setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build()) + .setDefaultRequestConfig(requestConfig) + .build(); + } + + /** + * Returns the default {@link RequestConfig} using the currently set timeout values. + * + * @return a configured {@link RequestConfig} with the current timeouts. + */ + public RequestConfig getDefaultRequestConfig() { + return RequestConfig.custom() + .setConnectTimeout(currentConnectionTimeout) + .setConnectionRequestTimeout(currentConnectionRequestTimeout) + .setSocketTimeout(currentSocketTimeout) + .setCookieSpec(CookieSpecs.STANDARD) .build(); } + + /** + * Switches the current timeout settings to use the SPARQL-specific timeouts. This method should be called when + * making SPARQL SERVICE calls to apply shorter timeout values. + * + *

+ * The SPARQL-specific timeouts are shorter to ensure that unresponsive or slow SPARQL endpoints do not cause long + * delays in federated query processing. Quick detection of such issues improves the responsiveness and reliability + * of SPARQL queries. + *

+ */ + public void setDefaultSparqlServiceTimeouts() { + this.currentConnectionTimeout = SPARQL_CONNECTION_TIMEOUT; + this.currentConnectionRequestTimeout = SPARQL_CONNECTION_REQUEST_TIMEOUT; + this.currentSocketTimeout = SPARQL_SOCKET_TIMEOUT; + } + + /** + * Resets the current timeout settings to the general timeouts. This method should be called to revert any changes + * made by {@link #setDefaultSparqlServiceTimeouts()} and apply the general timeout values. + * + *

+ * The general timeouts are longer to accommodate operations that may take more time, such as large data transfers + * or extensive processing, without causing premature timeouts. + *

+ */ + public void setDefaultTimeouts() { + this.currentConnectionTimeout = CONNECTION_TIMEOUT; + this.currentConnectionRequestTimeout = CONNECTION_REQUEST_TIMEOUT; + this.currentSocketTimeout = SOCKET_TIMEOUT; + } + } diff --git a/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/SPARQLServiceResolver.java b/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/SPARQLServiceResolver.java index 6165d2bd437..7cc7a29bd23 100644 --- a/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/SPARQLServiceResolver.java +++ b/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/SPARQLServiceResolver.java @@ -76,7 +76,19 @@ public void setHttpClientSessionManager(HttpClientSessionManager client) { @Override public HttpClient getHttpClient() { - return getHttpClientSessionManager().getHttpClient(); + HttpClientSessionManager httpClientSessionManager = getHttpClientSessionManager(); + + try { + if (httpClientSessionManager instanceof SharedHttpClientSessionManager) { + ((SharedHttpClientSessionManager) httpClientSessionManager).setDefaultSparqlServiceTimeouts(); + } + return getHttpClientSessionManager().getHttpClient(); + } finally { + if (httpClientSessionManager instanceof SharedHttpClientSessionManager) { + ((SharedHttpClientSessionManager) httpClientSessionManager).setDefaultTimeouts(); + } + } + } @Override @@ -86,6 +98,7 @@ public void setHttpClient(HttpClient httpClient) { getHttpClientSessionManager(); toSetDependentClient = dependentClient; } + // The strange lifecycle results in the possibility that the // dependentClient will be null due to a call to setSesameClient, so add // a null guard here for that possibility diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/endpoint/provider/RemoteRepositoryProvider.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/endpoint/provider/RemoteRepositoryProvider.java index 518a7b65234..52647021032 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/endpoint/provider/RemoteRepositoryProvider.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/endpoint/provider/RemoteRepositoryProvider.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.rdf4j.federated.endpoint.provider; +import org.apache.http.client.config.CookieSpecs; +import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.eclipse.rdf4j.federated.endpoint.Endpoint; @@ -40,13 +42,19 @@ public Endpoint loadEndpoint(RemoteRepositoryRepositoryInformation repoInfo) } try { + HTTPRepository repo = new HTTPRepository(repositoryServer, repositoryName); + SharedHttpClientSessionManager httpClientSessionManager = (SharedHttpClientSessionManager) repo + .getHttpClientSessionManager(); + HttpClientBuilder httpClientBuilder = HttpClients.custom() .useSystemProperties() + .setDefaultRequestConfig(httpClientSessionManager.getDefaultRequestConfig()) .setMaxConnTotal(20) .setMaxConnPerRoute(20); - ((SharedHttpClientSessionManager) repo.getHttpClientSessionManager()) - .setHttpClientBuilder(httpClientBuilder); + + httpClientSessionManager.setHttpClientBuilder(httpClientBuilder); + try { repo.init(); } finally { From 4eb14799a856807d3fdacc41e8d6b53be901d090 Mon Sep 17 00:00:00 2001 From: Andreas Schwarte Date: Fri, 6 Sep 2024 09:47:24 +0200 Subject: [PATCH 09/37] GH-5121: refactor the bind join logic into a reusable base class Refactor the existing logic for executing bind joins into a reusable base class. This change mostly moves the implementation logic from the existing ControlledWorkerBindJoin class to a new intermediate implementation (with the goal to make it reusable in a second step for left joins). Note that the new bind join implementation no longer uses the ControlledWorkerJoin as base class, i.e. the decision of which join implementation to use is moved to the strategy. For backwards code compatibility the "ControlledWorkerBoundJoin" is kept, but no longer used. Instead the new code is in ControlledWorkerBindJoin. --- .../federated/algebra/BoundJoinTupleExpr.java | 6 +- .../evaluation/FederationEvalStrategy.java | 17 +- .../SparqlFederationEvalStrategy.java | 29 +++- .../concurrent/ControlledWorkerScheduler.java | 4 +- .../join/ControlledWorkerBindJoin.java | 114 ++++++++++++ .../join/ControlledWorkerBindJoinBase.java | 163 ++++++++++++++++++ .../join/ControlledWorkerBoundJoin.java | 2 + 7 files changed, 319 insertions(+), 16 deletions(-) create mode 100644 tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoin.java create mode 100644 tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoinBase.java diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/algebra/BoundJoinTupleExpr.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/algebra/BoundJoinTupleExpr.java index 68b9ca6e4b0..24290ed89cd 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/algebra/BoundJoinTupleExpr.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/algebra/BoundJoinTupleExpr.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.rdf4j.federated.algebra; -import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; /** * Marker interface indicating that instances are applicable for bound join processing (see - * {@link ControlledWorkerBoundJoin} + * {@link ControlledWorkerBindJoin} * * @author Andreas Schwarte - * @see ControlledWorkerBoundJoin + * @see ControlledWorkerBindJoin */ public interface BoundJoinTupleExpr { diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java index a3e6237dac3..197e358b791 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java @@ -15,10 +15,8 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Supplier; import java.util.stream.Collectors; -import org.eclipse.rdf4j.collection.factory.api.CollectionFactory; import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.eclipse.rdf4j.common.iteration.EmptyIteration; import org.eclipse.rdf4j.common.iteration.SingletonIteration; @@ -56,6 +54,7 @@ import org.eclipse.rdf4j.federated.evaluation.iterator.FedXPathIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.FederatedDescribeIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerLeftJoin; @@ -108,12 +107,10 @@ import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; import org.eclipse.rdf4j.query.algebra.evaluation.federation.FederatedService; import org.eclipse.rdf4j.query.algebra.evaluation.federation.ServiceJoinIterator; -import org.eclipse.rdf4j.query.algebra.evaluation.impl.DefaultEvaluationStrategy; import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; import org.eclipse.rdf4j.query.algebra.evaluation.impl.QueryEvaluationContext; import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategy; import org.eclipse.rdf4j.query.algebra.evaluation.iterator.BadlyDesignedLeftJoinIterator; -import org.eclipse.rdf4j.query.algebra.evaluation.iterator.DescribeIteration; import org.eclipse.rdf4j.query.algebra.evaluation.iterator.HashJoinIteration; import org.eclipse.rdf4j.query.algebra.evaluation.optimizer.ConstantOptimizer; import org.eclipse.rdf4j.query.algebra.evaluation.optimizer.DisjunctiveConstraintOptimizer; @@ -815,8 +812,14 @@ public QueryEvaluationStep prepareNaryUnion(NUnion union, QueryEvaluationContext /** * Execute the join in a separate thread using some join executor. * - * Join executors are for instance: - {@link SynchronousJoin} - {@link SynchronousBoundJoin} - - * {@link ControlledWorkerJoin} - {@link ControlledWorkerBoundJoin} + * Join executors are for instance: + * + *
    + *
  • {@link SynchronousJoin}
    • + *
  • {@link SynchronousBoundJoin}
    • + *
  • {@link ControlledWorkerJoin}
    • + *
  • {@link ControlledWorkerBindJoin}
    • + *
* * For endpoint federation use controlled worker bound join, for local federation use controlled worker join. The * other operators are there for completeness. @@ -923,7 +926,7 @@ public abstract CloseableIteration evaluateGroupedCheck( /** * Evaluate a SERVICE using vectored evaluation, taking the provided bindings as input. * - * See {@link ControlledWorkerBoundJoin} and {@link FedXConfig#getEnableServiceAsBoundJoin()} + * See {@link ControlledWorkerBindJoin} and {@link FedXConfig#getEnableServiceAsBoundJoin()} * * @param service * @param bindings diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java index 0be9600d7c1..a65465ee4d1 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java @@ -17,8 +17,10 @@ import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.eclipse.rdf4j.common.iteration.EmptyIteration; import org.eclipse.rdf4j.federated.FederationContext; +import org.eclipse.rdf4j.federated.algebra.BoundJoinTupleExpr; import org.eclipse.rdf4j.federated.algebra.CheckStatementPattern; import org.eclipse.rdf4j.federated.algebra.ExclusiveGroup; +import org.eclipse.rdf4j.federated.algebra.FedXService; import org.eclipse.rdf4j.federated.algebra.FilterTuple; import org.eclipse.rdf4j.federated.algebra.FilterValueExpr; import org.eclipse.rdf4j.federated.algebra.StatementTupleExpr; @@ -29,7 +31,9 @@ import org.eclipse.rdf4j.federated.evaluation.iterator.GroupedCheckConversionIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.InsertBindingsIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration; -import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; +import org.eclipse.rdf4j.federated.evaluation.join.JoinExecutorBase; import org.eclipse.rdf4j.federated.exception.ExceptionUtil; import org.eclipse.rdf4j.federated.exception.IllegalQueryException; import org.eclipse.rdf4j.federated.structures.QueryInfo; @@ -45,7 +49,7 @@ * Implementation of a federation evaluation strategy which provides some special optimizations for SPARQL (remote) * endpoints. The most important optimization is to used prepared SPARQL Queries that are already created using Strings. *

- * Joins are executed using {@link ControlledWorkerBoundJoin}. + * Joins are executed using {@link ControlledWorkerBindJoin}. *

*

* This implementation uses the SPARQL 1.1 VALUES operator for the bound-join evaluation @@ -173,8 +177,25 @@ public CloseableIteration executeJoin( TupleExpr rightArg, Set joinVars, BindingSet bindings, QueryInfo queryInfo) throws QueryEvaluationException { - ControlledWorkerBoundJoin join = new ControlledWorkerBoundJoin(joinScheduler, this, leftIter, rightArg, - bindings, queryInfo); + // determine if we can execute the expr as bind join + boolean executeAsBindJoin = false; + if (rightArg instanceof BoundJoinTupleExpr) { + if (rightArg instanceof FedXService) { + executeAsBindJoin = queryInfo.getFederationContext().getConfig().getEnableServiceAsBoundJoin(); + } else { + executeAsBindJoin = true; + } + } + + JoinExecutorBase join; + if (executeAsBindJoin) { + join = new ControlledWorkerBindJoin(joinScheduler, this, leftIter, rightArg, + bindings, queryInfo); + } else { + join = new ControlledWorkerJoin(joinScheduler, this, leftIter, rightArg, bindings, + queryInfo); + } + join.setJoinVars(joinVars); executor.execute(join); return join; diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ControlledWorkerScheduler.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ControlledWorkerScheduler.java index f677ca46ea4..1060e86a2de 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ControlledWorkerScheduler.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ControlledWorkerScheduler.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.rdf4j.common.iteration.CloseableIteration; -import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; import org.eclipse.rdf4j.federated.evaluation.union.ControlledWorkerUnion; import org.eclipse.rdf4j.federated.exception.ExceptionUtil; @@ -34,7 +34,7 @@ * @author Andreas Schwarte * @see ControlledWorkerUnion * @see ControlledWorkerJoin - * @see ControlledWorkerBoundJoin + * @see ControlledWorkerBindJoin */ public class ControlledWorkerScheduler implements Scheduler, TaskWrapperAware { diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoin.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoin.java new file mode 100644 index 00000000000..17010b1e3c5 --- /dev/null +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoin.java @@ -0,0 +1,114 @@ +/******************************************************************************* + * Copyright (c) 2019 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 + *******************************************************************************/ +package org.eclipse.rdf4j.federated.evaluation.join; + +import java.util.List; + +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.federated.algebra.CheckStatementPattern; +import org.eclipse.rdf4j.federated.algebra.FedXService; +import org.eclipse.rdf4j.federated.algebra.StatementTupleExpr; +import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ControlledWorkerScheduler; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelExecutor; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelTask; +import org.eclipse.rdf4j.federated.structures.QueryInfo; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; + +/** + * Execution of a regular join as bind join. + * + * @author Andreas Schwarte + * @see ControlledWorkerBindJoinBase + */ +public class ControlledWorkerBindJoin extends ControlledWorkerBindJoinBase { + + public ControlledWorkerBindJoin(ControlledWorkerScheduler scheduler, FederationEvalStrategy strategy, + CloseableIteration leftIter, + TupleExpr rightArg, BindingSet bindings, QueryInfo queryInfo) + throws QueryEvaluationException { + super(scheduler, strategy, leftIter, rightArg, bindings, queryInfo); + } + + @Override + protected TaskCreator determineTaskCreator(TupleExpr expr, BindingSet bs) { + final TaskCreator taskCreator; + if (expr instanceof StatementTupleExpr) { + StatementTupleExpr stmt = (StatementTupleExpr) expr; + if (stmt.hasFreeVarsFor(bs)) { + taskCreator = new BoundJoinTaskCreator(strategy, stmt); + } else { + expr = new CheckStatementPattern(stmt, queryInfo); + taskCreator = new CheckJoinTaskCreator(strategy, (CheckStatementPattern) expr); + } + } else if (expr instanceof FedXService) { + taskCreator = new FedXServiceJoinTaskCreator(strategy, (FedXService) expr); + } else { + throw new RuntimeException("Expr is of unexpected type: " + expr.getClass().getCanonicalName() + + ". Please report this problem."); + } + return taskCreator; + } + + protected class BoundJoinTaskCreator implements TaskCreator { + protected final FederationEvalStrategy _strategy; + protected final StatementTupleExpr _expr; + + public BoundJoinTaskCreator( + FederationEvalStrategy strategy, StatementTupleExpr expr) { + super(); + _strategy = strategy; + _expr = expr; + } + + @Override + public ParallelTask getTask(ParallelExecutor control, List bindings) { + return new ParallelBoundJoinTask(control, _strategy, _expr, bindings); + } + } + + protected class CheckJoinTaskCreator implements TaskCreator { + protected final FederationEvalStrategy _strategy; + protected final CheckStatementPattern _expr; + + public CheckJoinTaskCreator( + FederationEvalStrategy strategy, CheckStatementPattern expr) { + super(); + _strategy = strategy; + _expr = expr; + } + + @Override + public ParallelTask getTask(ParallelExecutor control, List bindings) { + return new ParallelCheckJoinTask(control, _strategy, _expr, bindings); + } + } + + protected class FedXServiceJoinTaskCreator implements TaskCreator { + protected final FederationEvalStrategy _strategy; + protected final FedXService _expr; + + public FedXServiceJoinTaskCreator( + FederationEvalStrategy strategy, FedXService expr) { + super(); + _strategy = strategy; + _expr = expr; + } + + @Override + public ParallelTask getTask(ParallelExecutor control, List bindings) { + return new ParallelServiceJoinTask(control, _strategy, _expr, bindings); + } + } + +} diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoinBase.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoinBase.java new file mode 100644 index 00000000000..d00477a2adf --- /dev/null +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindJoinBase.java @@ -0,0 +1,163 @@ +/******************************************************************************* + * Copyright (c) 2024 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 + *******************************************************************************/ +package org.eclipse.rdf4j.federated.evaluation.join; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Phaser; +import java.util.concurrent.TimeUnit; + +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.federated.algebra.BoundJoinTupleExpr; +import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ControlledWorkerScheduler; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelExecutor; +import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelTask; +import org.eclipse.rdf4j.federated.structures.QueryInfo; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Base class for executing joins as bind joins (i.e., the bindings of a block are injected in the SPARQL query as + * VALUES clause). + * + * The number of concurrent threads is controlled by a {@link ControlledWorkerScheduler} which works according to the + * FIFO principle and uses worker threads. + * + * This join cursor blocks until all scheduled tasks are finished, however the result iteration can be accessed from + * different threads to allow for pipelining. + * + * @author Andreas Schwarte + * + */ +public abstract class ControlledWorkerBindJoinBase extends JoinExecutorBase { + + private static final Logger log = LoggerFactory.getLogger(ControlledWorkerBindJoinBase.class); + + protected final ControlledWorkerScheduler scheduler; + + protected final Phaser phaser = new Phaser(1); + + public ControlledWorkerBindJoinBase(ControlledWorkerScheduler scheduler, + FederationEvalStrategy strategy, + CloseableIteration leftIter, + TupleExpr rightArg, BindingSet bindings, QueryInfo queryInfo) + throws QueryEvaluationException { + super(strategy, leftIter, rightArg, bindings, queryInfo); + this.scheduler = scheduler; + } + + @Override + protected void handleBindings() throws Exception { + if (!(rightArg instanceof BoundJoinTupleExpr)) { + String msg = "Right argument is not an applicable expression for bind joins. Was: " + + rightArg.getClass().getCanonicalName(); + log.debug(msg); + throw new QueryEvaluationException(msg); + } + + int nBindingsCfg = this.queryInfo.getFederationContext().getConfig().getBoundJoinBlockSize(); + int totalBindings = 0; // the total number of bindings + TupleExpr expr = rightArg; + + TaskCreator taskCreator = null; + Phaser currentPhaser = phaser; + + int nBindings; + List bindings; + while (!isClosed() && leftIter.hasNext()) { + + // create a new phaser if there are more than 10000 parties + // note: a phaser supports only up to 65535 registered parties + if (currentPhaser.getRegisteredParties() >= 10000) { + currentPhaser = new Phaser(currentPhaser); + } + + // determine the bind join block size + nBindings = getNextBindJoinSize(nBindingsCfg, totalBindings); + + bindings = new ArrayList<>(nBindings); + + int count = 0; + while (!isClosed() && count < nBindings && leftIter.hasNext()) { + var bs = leftIter.next(); + if (taskCreator == null) { + taskCreator = determineTaskCreator(expr, bs); + } + bindings.add(bs); + count++; + } + + totalBindings += count; + + currentPhaser.register(); + scheduler.schedule(taskCreator.getTask(new PhaserHandlingParallelExecutor(this, currentPhaser), bindings)); + } + + leftIter.close(); + + scheduler.informFinish(this); + + if (log.isDebugEnabled()) { + log.debug("JoinStats: left iter of " + getDisplayId() + " had " + totalBindings + " results."); + } + + phaser.awaitAdvanceInterruptibly(phaser.arrive(), queryInfo.getMaxRemainingTimeMS(), TimeUnit.MILLISECONDS); + } + + @Override + public void handleClose() throws QueryEvaluationException { + try { + super.handleClose(); + } finally { + // signal the phaser to close (if currently being blocked) + phaser.forceTermination(); + } + } + + /** + * Return the {@link TaskCreator} for executing the bind join + * + * @param expr + * @param bs + * @return + */ + protected abstract TaskCreator determineTaskCreator(TupleExpr expr, BindingSet bs); + + /** + * Return the size of the next bind join block. + * + * @param configuredBindJoinSize the configured bind join size + * @param totalBindings the current process bindings from the intermediate result set + * @return + */ + protected int getNextBindJoinSize(int configuredBindJoinSize, int totalBindings) { + + /* + * XXX idea: + * + * make nBindings dependent on the number of intermediate results of the left argument. + * + * If many intermediate results, increase the number of bindings. This will result in less remote SPARQL + * requests. + * + */ + + return configuredBindJoinSize; + } + + protected interface TaskCreator { + ParallelTask getTask(ParallelExecutor control, List bindings); + } +} diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBoundJoin.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBoundJoin.java index db939175e6f..062be55ab75 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBoundJoin.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBoundJoin.java @@ -44,7 +44,9 @@ * * @author Andreas Schwarte * + * @deprecated replaced with {@link ControlledWorkerBindJoin}l */ +@Deprecated(forRemoval = true) public class ControlledWorkerBoundJoin extends ControlledWorkerJoin { private static final Logger log = LoggerFactory.getLogger(ControlledWorkerBoundJoin.class); From 2d86cd3f170b5d225c5d1d832d013958c335caef Mon Sep 17 00:00:00 2001 From: Andreas Schwarte Date: Fri, 6 Sep 2024 10:53:26 +0200 Subject: [PATCH 10/37] GH-5121: prepare execution of left joins in the federation strategy Prepare to execute a specific implementation of a left join implementation through the federation strategy. --- .../evaluation/FederationEvalStrategy.java | 22 ++++++++++++++----- .../SailFederationEvalStrategy.java | 12 ++++++++++ .../SparqlFederationEvalStrategy.java | 12 ++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java index 197e358b791..56693c02776 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java @@ -57,7 +57,6 @@ import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; -import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerLeftJoin; import org.eclipse.rdf4j.federated.evaluation.join.SynchronousBoundJoin; import org.eclipse.rdf4j.federated.evaluation.join.SynchronousJoin; import org.eclipse.rdf4j.federated.evaluation.union.ControlledWorkerUnion; @@ -96,6 +95,7 @@ import org.eclipse.rdf4j.query.QueryEvaluationException; import org.eclipse.rdf4j.query.algebra.DescribeOperator; import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; import org.eclipse.rdf4j.query.algebra.QueryRoot; import org.eclipse.rdf4j.query.algebra.Service; import org.eclipse.rdf4j.query.algebra.StatementPattern; @@ -745,10 +745,7 @@ public CloseableIteration evaluate(BindingSet bindings) { if (problemVars.containsAll(bindings.getBindingNames())) { var leftIter = leftPrepared.evaluate(bindings); - ControlledWorkerLeftJoin join = new ControlledWorkerLeftJoin(scheduler, FederationEvalStrategy.this, - leftIter, leftJoin, bindings, leftJoin.getQueryInfo()); - executor.execute(join); - return join; + return executeLeftJoin(scheduler, leftIter, leftJoin, bindings, leftJoin.getQueryInfo()); } else { Set problemVarsClone = new HashSet<>(problemVars); problemVarsClone.retainAll(bindings.getBindingNames()); @@ -839,6 +836,21 @@ protected abstract CloseableIteration executeJoin( CloseableIteration leftIter, TupleExpr rightArg, Set joinVariables, BindingSet bindings, QueryInfo queryInfo) throws QueryEvaluationException; + /** + * Execute the left join in a separate thread using some join executor. + * + * @param joinScheduler + * @param leftIter + * @param leftJoin + * @param bindings + * @return the result + * @throws QueryEvaluationException + */ + protected abstract CloseableIteration executeLeftJoin( + ControlledWorkerScheduler joinScheduler, + CloseableIteration leftIter, LeftJoin leftJoin, + BindingSet bindings, QueryInfo queryInfo) throws QueryEvaluationException; + public abstract CloseableIteration evaluateExclusiveGroup( ExclusiveGroup group, BindingSet bindings) throws RepositoryException, MalformedQueryException, QueryEvaluationException; diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java index dbe6cf8bfcc..9315a4b8feb 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java @@ -27,11 +27,13 @@ import org.eclipse.rdf4j.federated.evaluation.iterator.FilteringIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.GroupedCheckConversionIteration; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerLeftJoin; import org.eclipse.rdf4j.federated.structures.QueryInfo; import org.eclipse.rdf4j.federated.util.QueryAlgebraUtil; import org.eclipse.rdf4j.query.BindingSet; import org.eclipse.rdf4j.query.MalformedQueryException; import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.LeftJoin; import org.eclipse.rdf4j.query.algebra.StatementPattern; import org.eclipse.rdf4j.query.algebra.TupleExpr; import org.eclipse.rdf4j.repository.RepositoryException; @@ -119,6 +121,16 @@ public CloseableIteration executeJoin( return join; } + @Override + protected CloseableIteration executeLeftJoin(ControlledWorkerScheduler joinScheduler, + CloseableIteration leftIter, LeftJoin leftJoin, BindingSet bindings, QueryInfo queryInfo) + throws QueryEvaluationException { + ControlledWorkerLeftJoin join = new ControlledWorkerLeftJoin(joinScheduler, this, + leftIter, leftJoin, bindings, queryInfo); + executor.execute(join); + return join; + } + @Override public CloseableIteration evaluateExclusiveGroup( ExclusiveGroup group, BindingSet bindings) diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java index a65465ee4d1..234614402a3 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java @@ -33,6 +33,7 @@ import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerLeftJoin; import org.eclipse.rdf4j.federated.evaluation.join.JoinExecutorBase; import org.eclipse.rdf4j.federated.exception.ExceptionUtil; import org.eclipse.rdf4j.federated.exception.IllegalQueryException; @@ -41,6 +42,7 @@ import org.eclipse.rdf4j.query.BindingSet; import org.eclipse.rdf4j.query.MalformedQueryException; import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.LeftJoin; import org.eclipse.rdf4j.query.algebra.StatementPattern; import org.eclipse.rdf4j.query.algebra.TupleExpr; import org.eclipse.rdf4j.repository.RepositoryException; @@ -201,6 +203,16 @@ public CloseableIteration executeJoin( return join; } + @Override + protected CloseableIteration executeLeftJoin(ControlledWorkerScheduler joinScheduler, + CloseableIteration leftIter, LeftJoin leftJoin, BindingSet bindings, QueryInfo queryInfo) + throws QueryEvaluationException { + ControlledWorkerLeftJoin join = new ControlledWorkerLeftJoin(joinScheduler, this, + leftIter, leftJoin, bindings, queryInfo); + executor.execute(join); + return join; + } + @Override public CloseableIteration evaluateExclusiveGroup( ExclusiveGroup group, BindingSet bindings) throws RepositoryException, From 558a5952b9161ce97701914d1a6daebc6291f5e2 Mon Sep 17 00:00:00 2001 From: Andreas Schwarte Date: Fri, 6 Sep 2024 14:11:17 +0200 Subject: [PATCH 11/37] GH-5121: implementation of left bind join operator This change provides the implementation and activation for the left bind join operator. The algorithm is as follows: - execute left bind join using regular bound join query - process result iteration similar to BoundJoinVALUESConversionIteration - remember seen set of bindings (using index) and add original bindings to those, i.e. put to result return all non-seen bindings directly from the input Note that the terminology in literature has changed to "bind joins". Hence, for new classes and methods I try to follow that. Change is covered with some unit tests --- .../evaluation/FederationEvalStrategy.java | 57 +++++ .../SparqlFederationEvalStrategy.java | 25 +- .../iterator/BindLeftJoinIteration.java | 99 ++++++++ .../join/ControlledWorkerBindLeftJoin.java | 70 ++++++ .../join/ParallelBindLeftJoinTask.java | 53 +++++ .../rdf4j/federated/BindLeftJoinTests.java | 225 ++++++++++++++++++ 6 files changed, 527 insertions(+), 2 deletions(-) create mode 100644 tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/BindLeftJoinIteration.java create mode 100644 tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ControlledWorkerBindLeftJoin.java create mode 100644 tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/ParallelBindLeftJoinTask.java create mode 100644 tools/federation/src/test/java/org/eclipse/rdf4j/federated/BindLeftJoinTests.java diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java index 56693c02776..561a00bacbc 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java @@ -37,6 +37,7 @@ import org.eclipse.rdf4j.federated.algebra.FedXZeroLengthPath; import org.eclipse.rdf4j.federated.algebra.FederatedDescribeOperator; import org.eclipse.rdf4j.federated.algebra.FilterExpr; +import org.eclipse.rdf4j.federated.algebra.FilterTuple; import org.eclipse.rdf4j.federated.algebra.FilterValueExpr; import org.eclipse.rdf4j.federated.algebra.HolderNode; import org.eclipse.rdf4j.federated.algebra.NJoin; @@ -51,8 +52,10 @@ import org.eclipse.rdf4j.federated.endpoint.Endpoint; import org.eclipse.rdf4j.federated.evaluation.concurrent.ControlledWorkerScheduler; import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelServiceExecutor; +import org.eclipse.rdf4j.federated.evaluation.iterator.BindLeftJoinIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.FedXPathIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.FederatedDescribeIteration; +import org.eclipse.rdf4j.federated.evaluation.iterator.FilteringIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBoundJoin; @@ -66,6 +69,7 @@ import org.eclipse.rdf4j.federated.evaluation.union.ParallelUnionOperatorTask; import org.eclipse.rdf4j.federated.evaluation.union.SynchronousWorkerUnion; import org.eclipse.rdf4j.federated.evaluation.union.WorkerUnionBase; +import org.eclipse.rdf4j.federated.exception.ExceptionUtil; import org.eclipse.rdf4j.federated.exception.FedXRuntimeException; import org.eclipse.rdf4j.federated.exception.IllegalQueryException; import org.eclipse.rdf4j.federated.optimizer.DefaultFedXCostModel; @@ -935,6 +939,59 @@ public abstract CloseableIteration evaluateBoundJoinStatementPattern public abstract CloseableIteration evaluateGroupedCheck( CheckStatementPattern stmt, final List bindings) throws QueryEvaluationException; + /** + * Evaluate the left bind join for the given {@link StatementTupleExpr} and bindings at the relevant endpoints. + * + * @param stmt + * @param bindings + * @return the result iteration + * @throws QueryEvaluationException + * @see {@link BindLeftJoinIteration} + */ + public CloseableIteration evaluateLeftBoundJoinStatementPattern( + StatementTupleExpr stmt, final List bindings) throws QueryEvaluationException { + // we can omit the bound join handling + if (bindings.size() == 1) { + return evaluate(stmt, bindings.get(0)); + } + + FilterValueExpr filterExpr = null; + if (stmt instanceof FilterTuple) { + filterExpr = ((FilterTuple) stmt).getFilterExpr(); + } + + AtomicBoolean isEvaluated = new AtomicBoolean(false); + String preparedQuery = QueryStringUtil.selectQueryStringBoundJoinVALUES((StatementPattern) stmt, bindings, + filterExpr, isEvaluated, stmt.getQueryInfo().getDataset()); + + CloseableIteration result = null; + try { + result = evaluateAtStatementSources(preparedQuery, stmt.getStatementSources(), stmt.getQueryInfo()); + + // apply filter and/or convert to original bindings + if (filterExpr != null && !isEvaluated.get()) { + result = new BindLeftJoinIteration(result, bindings); // apply conversion + result = new FilteringIteration(filterExpr, result, this); // apply filter + if (!result.hasNext()) { + result.close(); + return new EmptyIteration<>(); + } + } else { + result = new BindLeftJoinIteration(result, bindings); + } + + return result; + } catch (Throwable t) { + if (result != null) { + result.close(); + } + if (t instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + throw ExceptionUtil.toQueryEvaluationException(t); + } + } + /** * Evaluate a SERVICE using vectored evaluation, taking the provided bindings as input. * diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java index 234614402a3..2018c762185 100644 --- a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java @@ -32,6 +32,7 @@ import org.eclipse.rdf4j.federated.evaluation.iterator.InsertBindingsIteration; import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin; +import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindLeftJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin; import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerLeftJoin; import org.eclipse.rdf4j.federated.evaluation.join.JoinExecutorBase; @@ -207,8 +208,28 @@ public CloseableIteration executeJoin( protected CloseableIteration executeLeftJoin(ControlledWorkerScheduler joinScheduler, CloseableIteration leftIter, LeftJoin leftJoin, BindingSet bindings, QueryInfo queryInfo) throws QueryEvaluationException { - ControlledWorkerLeftJoin join = new ControlledWorkerLeftJoin(joinScheduler, this, - leftIter, leftJoin, bindings, queryInfo); + + var rightArg = leftJoin.getRightArg(); + + // determine if we can execute the expr as bind join + boolean executeAsBindJoin = false; + if (rightArg instanceof BoundJoinTupleExpr) { + if (rightArg instanceof FedXService) { + executeAsBindJoin = false; + } else { + executeAsBindJoin = true; + } + } + + JoinExecutorBase join; + if (executeAsBindJoin) { + join = new ControlledWorkerBindLeftJoin(joinScheduler, this, leftIter, rightArg, + bindings, queryInfo); + } else { + join = new ControlledWorkerLeftJoin(joinScheduler, this, + leftIter, leftJoin, bindings, queryInfo); + } + executor.execute(join); return join; } diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/BindLeftJoinIteration.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/BindLeftJoinIteration.java new file mode 100644 index 00000000000..4b220db24b7 --- /dev/null +++ b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/BindLeftJoinIteration.java @@ -0,0 +1,99 @@ +/******************************************************************************* + * Copyright (c) 2024 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 + *******************************************************************************/ +package org.eclipse.rdf4j.federated.evaluation.iterator; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Set; + +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.LookAheadIteration; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; + +/** + * A {@link LookAheadIteration} for processing bind left join results (i.e., result of joining OPTIONAL clauses) + * + * Algorithm: + * + *