#6067 - Upgrade to RDF4J 6.x#6074
Open
reckart wants to merge 2 commits into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
Upgrades the project’s RDF4J dependency line to 6.x and adapts INCEpTION’s KB module to RDF4J 6’s HTTP client SPI changes, including updates to query-building behavior and related tests.
Changes:
- Bump RDF4J version to
6.0.0-M1and addrdf4j-http-client-apito dependency management and the KB module. - Replace Apache HttpClient-based per-thread SSL-check toggling with an
RDF4JHttpClientimplementation that switches between strict and trust-all clients. - Adjust SPARQL query generation to avoid “FILTER-only” primary queries by introducing/promoting a
FILTER EXISTSwrapper, and add a test covering “too old” Lucene index version reporting.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
pom.xml |
Updates the global RDF4J version property to 6.0.0-M1. |
inception/inception-dependencies/pom.xml |
Adds RDF4J HTTP client API to centralized dependency management. |
inception/inception-kb/pom.xml |
Adds rdf4j-http-client-api and scopes Apache HttpClient deps to tests. |
inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/http/PerThreadSslCheckingHttpClientUtils.java |
Reimplements per-thread SSL verification switching using RDF4J’s HTTP client SPI. |
inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/KnowledgeBaseServiceImpl.java |
Wires the new RDF4J HTTP client into the repository manager. |
inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java |
Wraps certain restrictions to allow promotion from FILTER EXISTS into WHERE patterns when needed. |
inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/FullTextIndexUpgradeTest.java |
Adds a test ensuring “too old” index versions are detected and reported. |
inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/util/TestFixtures.java |
Updates tests to use the new RDF4J HTTP client factory method. |
inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderLocalTestScenarios.java |
Updates local test scenarios to use the new RDF4J HTTP client factory method. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
72e40c1 to
7bde38a
Compare
- RDFJ4 -> 6.0.0-SNAPSHOT - Java 21 -> 25
- Strip URL-embedded credentials before reaching Apache HttpClient 5 (used by RDF4J 6, which rejects URIs with a userinfo component) - Sanitize incoming SPARQL URLs in getRemoteConfig(url) — userinfo is stripped at config-creation time and a warning is logged - Add eager startup migration: walk every REMOTE KB at onContextRefreshed, split any embedded user:pass into a clean URL plus BasicAuthenticationTraits (only when the KB has no explicit auth traits yet), persist via updateKnowledgeBase - Factor out splitUrlUserInfo helper and refactor applyBasicHttpAuthenticationConfigurationFromUrl to share it as a runtime safety net - buildSparqlRepository test helper splits userinfo and applies credentials via setUsernameAndPassword so existing test fixtures keep passing URLs with embedded credentials
7bde38a to
95640db
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What's in the PR
How to test manually
Automatic testing
Documentation