refactor: consolidate SPI modules into five layer-oriented modules#5842
Merged
Conversation
Implements the decision record 2026-06-18-spi-module-consolidation: the 45
fine-grained modules under spi/ are merged into five coarse, layer-oriented
modules and the layout is flattened to spi/<name>-spi:
- core-spi (runtime primitives; absorbs boot/http/web/json-ld/
transform/validator/transaction(+datasource)/policy-model/
token/jwt/keys/encryption/oauth2/auth/identity-did/
verifiable-credentials/connector-participant-context/
vault-hashicorp/data-address-* spis)
- control-plane-spi (connector domain + stores; absorbs asset/catalog/contract/
transfer/policy/secrets/policy-engine/participant/
request-policy-context/cel/participant-context-*/edr-store/
task/policy-monitor/data-plane-selector/federated-catalog/
crawler spis)
- data-plane-spi (absorbs data-plane-http-spi)
- dcp-spi (renamed from decentralized-claims-spi)
- dataspace-protocol-spi (renamed from protocol-spi)
All ~257 consumer build files, the BOMs and settings.gradle.kts are rewritten to
the new paths. Surplus @SPI package-info annotations are reduced to one per merged
module (autodoc requires a single SPI definition per module). A latent unfinished
Mockito verify() in AbstractJsonLdTransformerReturnObjectTest is fixed; it only
surfaced once the transform-spi tests joined core-spi's test task.
The DR's layering diagram is updated to match the final mapping (federated-catalog
folded into control-plane-spi; dcp-spi -> control-plane-spi edge).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
5ef8d1d to
42074b4
Compare
Member
This was referenced Jun 24, 2026
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 this PR changes/adds
Implements the decision record
2026-06-18-spi-module-consolidation:the 45 fine-grained modules under
spi/are merged into five coarse, layer-oriented modules, and the layout isflattened to
spi/<name>-spi:core-spicontrol-plane-spidata-plane-spidcp-spidecentralized-claims-spidataspace-protocol-spiprotocol-spiAll ~257 consumer
build.gradle.kts, thedist/bom/BOMs andsettings.gradle.ktsare rewritten to the new paths.Why it does that
implements the D-R
Further notes
org.eclipse.edc:boot-spi,:transfer-spi,:asset-spi, …) disappear; their content now ships in one of the five modules above. The five newartifactIds are
core-spi,control-plane-spi,data-plane-spi,dcp-spi,dataspace-protocol-spi.@Spipackage-infoannotations are reduced to one per merged module (autodoc requires a single SPIdefinition per module); the package javadoc is preserved.
verify()inAbstractJsonLdTransformerReturnObjectTestthat only surfaced oncethe
transform-spitests joinedcore-spi's test task.git mvto preserve history.control-plane-spi;dcp-spi → control-plane-spiedge).Who will sponsor this feature?
TODO: @-mention the sponsoring committer.
Linked Issue(s)
n/a — tracked via the decision record.