Skip to content

Commit

Permalink
Merge branch 'main' into merge-main-2023-11-07-2
Browse files Browse the repository at this point in the history
# Conflicts:
#	assembly-descriptors/pom.xml
#	assembly/pom.xml
#	bom/pom.xml
#	compliance/elasticsearch/pom.xml
#	compliance/geosparql/pom.xml
#	compliance/lucene/pom.xml
#	compliance/model/pom.xml
#	compliance/pom.xml
#	compliance/repository/pom.xml
#	compliance/rio/pom.xml
#	compliance/shacl/pom.xml
#	compliance/solr/pom.xml
#	compliance/sparql/pom.xml
#	core/client/pom.xml
#	core/collection-factory/api/pom.xml
#	core/collection-factory/mapdb/pom.xml
#	core/collection-factory/mapdb3/pom.xml
#	core/collection-factory/pom.xml
#	core/common/annotation/pom.xml
#	core/common/exception/pom.xml
#	core/common/io/pom.xml
#	core/common/iterator/pom.xml
#	core/common/pom.xml
#	core/common/text/pom.xml
#	core/common/transaction/pom.xml
#	core/common/xml/pom.xml
#	core/http/client/pom.xml
#	core/http/pom.xml
#	core/http/protocol/pom.xml
#	core/model-api/pom.xml
#	core/model-vocabulary/pom.xml
#	core/model/pom.xml
#	core/pom.xml
#	core/query/pom.xml
#	core/queryalgebra/evaluation/pom.xml
#	core/queryalgebra/geosparql/pom.xml
#	core/queryalgebra/model/pom.xml
#	core/queryalgebra/pom.xml
#	core/queryparser/api/pom.xml
#	core/queryparser/pom.xml
#	core/queryparser/sparql/pom.xml
#	core/queryrender/pom.xml
#	core/queryresultio/api/pom.xml
#	core/queryresultio/binary/pom.xml
#	core/queryresultio/pom.xml
#	core/queryresultio/sparqljson/pom.xml
#	core/queryresultio/sparqlxml/pom.xml
#	core/queryresultio/text/pom.xml
#	core/repository/api/pom.xml
#	core/repository/contextaware/pom.xml
#	core/repository/dataset/pom.xml
#	core/repository/event/pom.xml
#	core/repository/http/pom.xml
#	core/repository/manager/pom.xml
#	core/repository/pom.xml
#	core/repository/sail/pom.xml
#	core/repository/sparql/pom.xml
#	core/rio/api/pom.xml
#	core/rio/binary/pom.xml
#	core/rio/datatypes/pom.xml
#	core/rio/hdt/pom.xml
#	core/rio/jsonld/pom.xml
#	core/rio/languages/pom.xml
#	core/rio/n3/pom.xml
#	core/rio/nquads/pom.xml
#	core/rio/ntriples/pom.xml
#	core/rio/pom.xml
#	core/rio/rdfjson/pom.xml
#	core/rio/rdfxml/pom.xml
#	core/rio/trig/pom.xml
#	core/rio/trix/pom.xml
#	core/rio/turtle/pom.xml
#	core/sail/api/pom.xml
#	core/sail/base/pom.xml
#	core/sail/elasticsearch-store/pom.xml
#	core/sail/elasticsearch/pom.xml
#	core/sail/extensible-store/pom.xml
#	core/sail/inferencer/pom.xml
#	core/sail/lmdb/pom.xml
#	core/sail/lucene-api/pom.xml
#	core/sail/lucene/pom.xml
#	core/sail/memory/pom.xml
#	core/sail/model/pom.xml
#	core/sail/nativerdf/pom.xml
#	core/sail/pom.xml
#	core/sail/shacl/pom.xml
#	core/sail/solr/pom.xml
#	core/sparqlbuilder/pom.xml
#	core/spin/pom.xml
#	core/storage/pom.xml
#	examples/pom.xml
#	pom.xml
#	spring-components/pom.xml
#	spring-components/rdf4j-spring-demo/pom.xml
#	spring-components/rdf4j-spring/pom.xml
#	spring-components/spring-boot-sparql-web/pom.xml
#	testsuites/benchmark/pom.xml
#	testsuites/geosparql/pom.xml
#	testsuites/lucene/pom.xml
#	testsuites/model/pom.xml
#	testsuites/pom.xml
#	testsuites/queryresultio/pom.xml
#	testsuites/repository/pom.xml
#	testsuites/rio/pom.xml
#	testsuites/sail/pom.xml
#	testsuites/shacl/pom.xml
#	testsuites/sparql/pom.xml
#	tools/config/pom.xml
#	tools/console/pom.xml
#	tools/federation/pom.xml
#	tools/pom.xml
#	tools/runtime-osgi/pom.xml
#	tools/runtime/pom.xml
#	tools/server-spring/pom.xml
#	tools/server/pom.xml
#	tools/workbench/pom.xml
  • Loading branch information
hmottestad committed Nov 7, 2023
2 parents c747cf8 + 77c5dec commit 56e5ea1
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 56e5ea1

Please sign in to comment.