Prepare for next major release by merging develop (5.3.0-SNAPSHOT) into the main branch by hmottestad · Pull Request #5636 · eclipse-rdf4j/rdf4j

hmottestad · 2025-12-23T09:23:01Z

GitHub issue resolved: #

Briefly describe the changes proposed in this PR:

PR Author Checklist (see the contributor guidelines for more details):

my pull request is self-contained
I've added tests for the changes I made
I've applied code formatting (you can use mvn process-resources to format from the command line)
I've squashed my commits where necessary
every commit message starts with the issue number (GH-xxxx) followed by a meaningful description of the change

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

…ing data in the workbench

…o be run from a single place (#5570)

fix server-boot pom

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

# Conflicts: # PLANS.md

fix PLANS.md

# 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/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/order/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/ods/pom.xml # core/queryresultio/pom.xml # core/queryresultio/sparqljson/pom.xml # core/queryresultio/sparqlxml/pom.xml # core/queryresultio/text/pom.xml # core/queryresultio/xlsx/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-legacy/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/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

…client in a future update

hmottestad added 30 commits October 5, 2025 11:41

Merge main into develop (#5483)

0f806f0

set correct version

a123f61

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

sync develop branch after release 5.2.0 (#5485)

9553040

Merge main into develop (#5488)

e10481f

Merge main into develop (#5492)

20d8e30

chore: bump snapshot version to 5.3.0 (#5495)

70b6093

Merge main into develop (#5497)

5ab846a

Merge main into develop (#5501)

64c8647

Merge main into develop (#5513)

d61fb7a

Merge main into develop (#5524)

40f3643

Merge main into develop (#5526)

471b03c

Merge main into develop (#5528)

c9688e1

Merge main into develop (#5555)

6c568ba

Merge main into develop (#5560)

6918302

Merge main into develop (#5568)

ded044c

GH-1502 add a spring-boot wrapper for server and workbench

6186610

bug fix

735d719

GH-5565 allow users to select transaction isolation level when upload…

8b52019

…ing data in the workbench

performance improvements

cbc265c

code cleanup

c5b7e27

GH-5520 WAL for values in the NativeStore and recovery options

2e5717f

GH-5520 WAL for ValueStore (#5522)

3a22f57

GH-1502 Add a spring-boot wrapper to allow the server and workbench t…

a12d9b1

…o be run from a single place (#5570)

Fix server-boot pom (#5576)

7410ce4

fix server-boot pom

Merge main into develop (#5589)

831139f

set correct version

0cec7fe

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

Merge main into develop (#5591)

758a9d3

sync develop branch after release 5.2.1 (#5593)

58714d6

Merge main into develop (#5595)

a666440

GH-5590 add isolation selection for console load

7986900

hmottestad added 29 commits December 15, 2025 14:05

Merge branch 'main' into merge-main-20251215

e4957a0

# Conflicts: # PLANS.md

Merge main into develop (#5616)

b58171d

GH-5608: Update Docker images to JDK 21/25 (#5610)

9d3a7fe

fix main/develop conflict (#5627)

1cf01cd

fix PLANS.md

merge main into develop (#5629)

4366a77

GH-5631 Deprecate Solr sail module

1384f4b

cleanup

3fde3b9

GH-5631 Deprecate solr integration and update documentation (#5632)

8b72792

GH-5590 add isolation level selection for console load (#5598)

8043b6d

GH-5498 initial test container commit

4700995

GH-5498 initial test container commit

089a4b0

GH-5498 initial test container commit

34627cb

GH-5498 initial test container commit

3ab8523

deprecate elasticsearch code to allow for changing the elasticsearch …

c259bde

…client in a future update

changed to approved version of testcontainers

3c68df8

code formatting

7c7b722

cleanup

243eaf4

cleanup

f3894f8

cleanup

9a98abf

cleanup

c82496e

GH-5498 migrate Elasticsearch tests to testcontainer (#5634)

b67a1a7

fix failing tests

3df8b9d

thread dump on github actions cancellation

b1d64d7

cleanup AGENTS.md

06dbdc4

code cleanup

a626c74

test

505429c

test

f46b037

Fix test 20251223 (#5637)

3bbede6

hmottestad merged commit d0723be into main Dec 23, 2025
12 of 13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepare for next major release by merging develop (5.3.0-SNAPSHOT) into the main branch#5636

Prepare for next major release by merging develop (5.3.0-SNAPSHOT) into the main branch#5636
hmottestad merged 67 commits intomainfrom
develop

hmottestad commented Dec 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hmottestad commented Dec 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants