Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
0f806f0
Merge main into develop (#5483)
hmottestad Oct 5, 2025
a123f61
set correct version
hmottestad Oct 5, 2025
9553040
sync develop branch after release 5.2.0 (#5485)
hmottestad Oct 5, 2025
e10481f
Merge main into develop (#5488)
hmottestad Oct 5, 2025
20d8e30
Merge main into develop (#5492)
hmottestad Oct 5, 2025
70b6093
chore: bump snapshot version to 5.3.0 (#5495)
hmottestad Oct 5, 2025
5ab846a
Merge main into develop (#5497)
hmottestad Oct 6, 2025
64c8647
Merge main into develop (#5501)
hmottestad Oct 7, 2025
d61fb7a
Merge main into develop (#5513)
hmottestad Oct 8, 2025
40f3643
Merge main into develop (#5524)
hmottestad Oct 13, 2025
471b03c
Merge main into develop (#5526)
hmottestad Oct 14, 2025
c9688e1
Merge main into develop (#5528)
hmottestad Nov 3, 2025
6c568ba
Merge main into develop (#5555)
hmottestad Nov 9, 2025
6918302
Merge main into develop (#5560)
hmottestad Nov 11, 2025
ded044c
Merge main into develop (#5568)
hmottestad Nov 17, 2025
6186610
GH-1502 add a spring-boot wrapper for server and workbench
hmottestad Nov 18, 2025
735d719
bug fix
hmottestad Nov 18, 2025
8b52019
GH-5565 allow users to select transaction isolation level when upload…
hmottestad Nov 18, 2025
cbc265c
performance improvements
hmottestad Nov 18, 2025
c5b7e27
code cleanup
hmottestad Nov 18, 2025
2e5717f
GH-5520 WAL for values in the NativeStore and recovery options
hmottestad Nov 18, 2025
3a22f57
GH-5520 WAL for ValueStore (#5522)
hmottestad Nov 19, 2025
a12d9b1
GH-1502 Add a spring-boot wrapper to allow the server and workbench t…
hmottestad Nov 19, 2025
7410ce4
Fix server-boot pom (#5576)
hmottestad Nov 26, 2025
831139f
Merge main into develop (#5589)
hmottestad Dec 5, 2025
0cec7fe
set correct version
hmottestad Dec 5, 2025
758a9d3
Merge main into develop (#5591)
hmottestad Dec 5, 2025
58714d6
sync develop branch after release 5.2.1 (#5593)
hmottestad Dec 5, 2025
a666440
Merge main into develop (#5595)
hmottestad Dec 5, 2025
7986900
GH-5590 add isolation selection for console load
hmottestad Dec 5, 2025
5dabe86
Merge main into develop (#5597)
hmottestad Dec 6, 2025
55e7827
Merge main into develop (#5600)
hmottestad Dec 8, 2025
dda6f6f
Merge main into develop (#5602)
hmottestad Dec 8, 2025
37c4f7a
remove unused imports (#5603)
hmottestad Dec 9, 2025
7ce9837
Add retry to ValueStoreWalSearchTest (#5605)
hmottestad Dec 9, 2025
1fd83f7
GH-5604 New Query Renderer implementation (#5601)
hmottestad Dec 10, 2025
4f37a2e
Update serverboot test to be more resilient (#5609)
hmottestad Dec 11, 2025
7efd7db
GH-5608: Update Docker images to JDK 21/25
Ostrzyciel Dec 10, 2025
e4957a0
Merge branch 'main' into merge-main-20251215
hmottestad Dec 15, 2025
b58171d
Merge main into develop (#5616)
hmottestad Dec 15, 2025
9d3a7fe
GH-5608: Update Docker images to JDK 21/25 (#5610)
hmottestad Dec 15, 2025
1cf01cd
fix main/develop conflict (#5627)
hmottestad Dec 17, 2025
b55502f
Merge branch 'main' into merge-main-20251219
hmottestad Dec 19, 2025
4366a77
merge main into develop (#5629)
hmottestad Dec 19, 2025
1384f4b
GH-5631 Deprecate Solr sail module
hmottestad Dec 19, 2025
3fde3b9
cleanup
hmottestad Dec 19, 2025
8b72792
GH-5631 Deprecate solr integration and update documentation (#5632)
hmottestad Dec 20, 2025
8043b6d
GH-5590 add isolation level selection for console load (#5598)
hmottestad Dec 21, 2025
4700995
GH-5498 initial test container commit
hmottestad Nov 28, 2025
089a4b0
GH-5498 initial test container commit
hmottestad Nov 28, 2025
34627cb
GH-5498 initial test container commit
hmottestad Nov 28, 2025
3ab8523
GH-5498 initial test container commit
hmottestad Nov 28, 2025
c259bde
deprecate elasticsearch code to allow for changing the elasticsearch …
hmottestad Dec 22, 2025
3c68df8
changed to approved version of testcontainers
hmottestad Dec 22, 2025
7c7b722
code formatting
hmottestad Dec 22, 2025
243eaf4
cleanup
hmottestad Dec 22, 2025
f3894f8
cleanup
hmottestad Dec 22, 2025
9a98abf
cleanup
hmottestad Dec 22, 2025
c82496e
cleanup
hmottestad Dec 22, 2025
b67a1a7
GH-5498 migrate Elasticsearch tests to testcontainer (#5634)
hmottestad Dec 22, 2025
3df8b9d
fix failing tests
hmottestad Dec 23, 2025
b1d64d7
thread dump on github actions cancellation
hmottestad Dec 23, 2025
06dbdc4
cleanup AGENTS.md
hmottestad Dec 23, 2025
a626c74
code cleanup
hmottestad Dec 23, 2025
505429c
test
hmottestad Dec 23, 2025
f46b037
test
hmottestad Dec 23, 2025
3bbede6
Fix test 20251223 (#5637)
hmottestad Dec 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/develop-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Build
run: mvn -B -U clean install -Pquick,\!formatting
- name: Verify
run: mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
- name: Publish Test Report
if: failure()
uses: scacap/action-surefire-report@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Build
run: mvn -B -U -T 2C clean install -DskipTests
- name: Run all tests
run: mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
- name: Publish Test Report
if: failure()
uses: scacap/action-surefire-report@v1
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/pr-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Build
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
- name: Test
run: mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
run: ./scripts/ci/run-with-thread-dump.sh mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
- name: Publish Test Report
if: failure()
uses: scacap/action-surefire-report@v1.9.0
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Build
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
- name: Verify
run: mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
- name: Publish Test Report
if: failure()
uses: scacap/action-surefire-report@v1.9.0
Expand All @@ -105,7 +105,7 @@ jobs:
- name: Build
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
- name: Verify
run: mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
- name: Publish Test Report
if: failure()
uses: scacap/action-surefire-report@v1.9.0
Expand Down Expand Up @@ -148,12 +148,11 @@ jobs:
node-version: 18
- name: Run end-to-end tests of RDF4J Server and Workbench
working-directory: ./e2e
run: ./run.sh
run: ../scripts/ci/run-with-thread-dump.sh ./run.sh

copyright-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: check copyright header present
run: scripts/checkCopyrightPresent.sh

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
**/.classpath
.settings
**/.settings
bin
**/bin
**/.factorypath

# Eclipse Plug-In Settings
Expand Down Expand Up @@ -56,3 +54,4 @@ e2e/test-results
/tools/server/.lwjgl/
.m2_repo/
.serena/
.vscode
50 changes: 6 additions & 44 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,48 +126,6 @@ When writing complex features or significant refactors, use an ExecPlan (as desc

When writing complex features or significant refactors, use an ExecPlan (as described in PLANS.md) from design to implementation.

## PIOSEE Decision Model (Adopted)

Use this as a compact, repeatable loop for anything from a one‑line bug fix to a multi‑quarter program.

### P — **Problem**

**Goal:** State the core problem and what “good” looks like.
**Ask:** Who’s affected? What outcome is required? What happens if we do nothing?
**Tip:** Include measurable target(s): error rate ↓, latency p95 ↓, revenue ↑, risk ↓.

### I — **Information**

**Goal:** Gather only the facts needed to move.
**Ask:** What do logs/metrics/user feedback say? What constraints (security, compliance, budget, SLA/SLO)? What assumptions must we test?

### O — **Options**

**Goal:** Generate viable ways forward, including “do nothing.”
**Ask:** What are 2–4 distinct approaches (patch, redesign, buy vs. build, defer)? What risks, costs, and second‑order effects?
**Tip:** Check guardrails: reliability, security/privacy, accessibility, performance, operability, unit economics.

### S — **Select**

**Goal:** Decide deliberately and document why.
**Ask:** Which option best meets the success criteria under constraints? Who is the decision owner? What’s the fallback/abort condition?
**Tip:** Use lightweight scoring (e.g., Impact×Confidence÷Effort) to avoid bike‑shedding.

### E — **Execute**

**Goal:** Ship safely and visibly.
**Ask:** What is the smallest safe slice? How do we de‑risk (feature flag, canary, dark launch, rollback)? Who owns what?
**Checklist:** Traces/logs/alerts; security & privacy checks; docs & changelog; incident plan if relevant.

### E — **Evaluate**

**Goal:** Verify outcomes and learn.
**Ask:** Did metrics hit targets? Any regressions or side effects? What will we keep/change next loop?
**Output:** Post‑release review (or retro), decision log entry, follow‑ups (tickets), debt captured.
**Tip:** If outcomes miss, either **iterate** (new Options) or **reframe** (back to Problem).

---

### Benchmarking workflow (repository-wide)

The `scripts/run-single-benchmark.sh` helper is the supported path for spot-checking performance optimisations. It builds the chosen module with the `benchmarks` profile, constrains the benchmark selection to a single `@Benchmark` method, and when `--enable-jfr` is supplied it enforces repeatable profiling defaults (no warmup, ten 10-second measurements, one fork) while clearly reporting the destination of the generated JFR recording. Lean on this script whenever you need a reproducible measurement harness.
Expand Down Expand Up @@ -361,6 +319,8 @@ Why this is mandatory
* `mvn -T 1C -o -Dmaven.repo.local=.m2_repo -Pquick clean install | tail -200`
3. **Format (Java, imports, XML)**
* `mvn -o -Dmaven.repo.local=.m2_repo -q -T 2C formatter:format impsort:sort xml-format:xml-format`
* Ensure every touched Java file has the correct agent signature comment (`// Some portions generated by Codex` for Codex, `// Some portions generated by Co-Pilot` for GitHub Co-Pilot) inserted immediately below the header before formatting.
* Before invoking the formatter, `cd scripts && ./checkCopyrightPresent.sh` (or use `pushd/popd`) to ensure every new or edited source file still carries the required header; fix any findings before formatting.
4. **Targeted tests (tight loops)**
* Module: `mvn -o -Dmaven.repo.local=.m2_repo -pl <module> verify | tail -500`
* Class: `mvn -o -Dmaven.repo.local=.m2_repo -pl <module> -Dtest=ClassName verify | tail -500`
Expand Down Expand Up @@ -464,7 +424,6 @@ When writing complex features or significant refactors, use an ExecPlan (as desc

## Working Loop

* **PIOSEE first:** restate Problem, gather Information, list Options; then Select, Execute, Evaluate.
* **Plan:** small, verifiable steps; keep one `in_progress`, or follow PLANS.md (ExecPlans)
* **Change:** minimal, surgical edits; keep style/structure consistent.
* **Format:** `mvn -o -Dmaven.repo.local=.m2_repo -q -T 2C formatter:format impsort:sort xml-format:xml-format`
Expand Down Expand Up @@ -570,6 +529,10 @@ Hint: get the current year with `date +%Y`.

Do **not** modify existing headers’ years.

Right below the header block, insert an agent signature comment: Codex agents must add `// Some portions generated by Codex`, and GitHub Co-Pilot agents must add `// Some portions generated by Co-Pilot`. Align the wording with whatever agent name you are currently operating under.

Immediately after creating any new Java source file, add the signature comment (per rule above) and run `cd scripts && ./checkCopyrightPresent.sh` (or an equivalent pushd/popd invocation) so you catch missing copyright/SPDX lines before moving on.

---

## Pre‑Commit Checklist
Expand Down Expand Up @@ -651,7 +614,6 @@ Do **not** modify existing headers’ years.
* **Files touched:** list file paths.
* **Commands run:** key build/test commands.
* **Verification:** which tests passed, where you checked reports.
* **PIOSEE trace (concise):** P/I/O summary, selected option/routine, key evaluate outcomes.
* **Evidence:**
*Routine A:* failing output (pre‑fix) and passing output (post‑fix).
*Routine B:* pre‑ and post‑green snippets from the **same selection** + **Hit Proof**.
Expand Down
2 changes: 1 addition & 1 deletion assembly-descriptors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.2.3-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly-descriptors</artifactId>
<name>RDF4J: Assembly Descriptors</name>
Expand Down
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.2.3-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.2.3-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-bom</artifactId>
<packaging>pom</packaging>
Expand Down
60 changes: 31 additions & 29 deletions compliance/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,31 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.2.3-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-elasticsearch-compliance</artifactId>
<name>RDF4J: Elasticsearch Sail Tests</name>
<description>Tests for Elasticsearch.</description>
<!-- disable the Java security manager for elasticsearch tests -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<elasticsearch.docker.version>${elasticsearch.version}</elasticsearch.docker.version>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<forkCount>0</forkCount>
<systemPropertyVariables>
<tests.security.manager>false</tests.security.manager>
<elasticsearch.docker.version>${elasticsearch.version}</elasticsearch.docker.version>
</systemPropertyVariables>
</configuration>
</plugin>
Expand All @@ -37,34 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${lucene.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch.test</groupId>
<artifactId>framework</artifactId>
<version>${elasticsearch.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand Down Expand Up @@ -105,12 +87,32 @@
<version>${elasticsearch.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>jna</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
Loading
Loading