Commit dc3cef5
refactor: consolidate lib modules into four domain-cohesive libraries (#5844)
Implements the decision record 2026-06-18-lib-module-consolidation, the
companion to the SPI module consolidation: the ~42 fine-grained *-lib modules
are merged into four coarse, domain-cohesive implementation libraries and the
layout is flattened.
- jsonld-lib (json + json-ld + transform + validator)
- core-lib (generic, non-connector library code: query, crypto-common,
keys, token, encryption, auth-{authentication,authorization}-oauth2,
verifiable-credentials, decentralized-claims(+sts-remote),
jersey-providers, boot, http, nats, util, sql, api, management-api)
- control-plane-lib (connector-specific: policy-engine, policy-evaluator, store,
control-plane-policies, catalog-util,
control-plane-transfer-provision, state-machine)
- dsp-lib (collapses the 13 data-protocols/dsp/dsp-lib modules — the
{catalog,negotiation,transfer-process} x {http-api,transform,
validation} matrix, dsp-version-transform-lib, and three empty
meta modules — into a single library)
jws2020-lib is left standalone, as it is constrained by a dependency on
:extensions:common:json-ld; it can be folded into core-lib in a later iteration.
All ~150 consumer build files, the BOMs and settings.gradle.kts are rewritten to
the new module paths. A latent dead dependency in control-plane-spi (an unused
implementation dependency on the former util-lib, now part of core-lib) is
removed; it had no usages and would otherwise invert the spi<-lib layering into a
cycle.
The resulting libraries form an acyclic graph layered above the SPI modules:
jsonld-lib -> spi; core-lib -> jsonld-lib + spi; control-plane-lib -> core-lib +
spi; dsp-lib -> jsonld-lib + spi.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>1 parent baab7fd commit dc3cef5
661 files changed
Lines changed: 376 additions & 1520 deletions
File tree
- core
- catalog-crawler/catalog-crawler-core
- common
- boot
- cel-core
- connector-core
- edr-store-core
- junit
- lib
- api-lib
- boot-lib
- catalog-util-lib
- core-lib
- src
- main/java/org/eclipse/edc
- api
- authentication/filter
- authorization
- filter
- service
- management
- schema
- model
- transformer
- validation
- boot
- health
- vault
- encryption
- http/client
- iam
- decentralizedclaims
- lib
- sts/remote
- verifiablecredentials
- revocation
- bitstring
- statuslist2021
- rules
- keys
- keyparsers
- resolver
- nats
- subscriber
- tasks
- publisher
- subscriber
- query
- security/token/jwt
- sql
- datasource
- dialect
- pool
- statement
- store
- translation
- token
- rules
- util
- async
- collection
- concurrency
- configuration
- io
- reflection
- stream
- string
- types
- uri
- web/jersey/providers/jsonld
- testFixtures/java/org/eclipse/edc
- api/authentication
- http/client/testfixtures
- nats/testfixtures
- test
- java/org/eclipse/edc
- api
- authentication/filter
- authorization
- filter
- service
- management/schema
- model
- transformer
- validation
- boot
- health
- vault
- encryption
- http/client
- iam
- decentralizedclaims
- lib
- sts/remote
- verifiablecredentials
- revocation
- bitstring
- statuslist2021
- rules
- keys
- keyparsers
- resolver
- nats/tasks/publisher
- query
- security/token/jwt
- sql
- datasource
- statement
- translation
- token/rules
- util
- collection
- concurrency
- configuration
- io
- reflection
- stream
- string
- uri
- web/jersey/providers/jsonld
- resources
- crypto-common-lib
- encryption-lib
- http-lib
- json-lib
- jsonld-lib
- src
- main
- java/org/eclipse/edc
- jsonld
- document
- util
- json
- transform
- transformer
- dspace
- from
- to
- edc
- from
- to
- validator/jsonobject
- validators
- model
- resources/document
- testFixtures/java/org/eclipse/edc/jsonld/test
- test
- java/org/eclipse/edc
- jsonld
- document
- util
- json
- transform
- transformer
- dspace
- from
- to
- edc
- from
- to
- validator/jsonobject
- validators/model
- resources
- keys-lib
- nats-lib
- policy-engine-lib
- policy-evaluator-lib
- query-lib
- sql-lib
- state-machine-lib
- store-lib
- token-lib
- transform-lib
- util-lib
- validator-lib
- participant-context-config-core
- participant-context-core
- runtime-core
- task-core
- token-core
- control-plane
- control-plane-aggregate-services
- control-plane-catalog
- control-plane-contract-manager
- control-plane-contract-task-executor
- control-plane-contract
- control-plane-core
- control-plane-transfer-manager
- control-plane-transfer-task-executor
- control-plane-transfer
- control-plane-transform
- lib
- control-plane-lib
- src
- main/java/org/eclipse/edc
- connector/controlplane/policy/contract
- federatedcatalog/util
- policy
- engine
- plan
- validation
- evaluator
- statemachine
- retry
- processor
- store
- test/java/org/eclipse/edc
- connector/controlplane/policy/contract
- federatedcatalog/util
- policy
- engine
- evaluator
- statemachine
- retry
- processor
- store
- control-plane-policies-lib
- data-plane-selector/data-plane-selector-core
- data-plane
- data-plane-core
- data-plane-util
- policy-monitor/policy-monitor-core
- data-protocols
- data-plane-signaling
- data-plane-signaling-core
- data-plane-signaling-oauth2
- dsp
- dsp-2025
- dsp-catalog-2025
- dsp-catalog-http-api-2025
- dsp-catalog-transform-2025
- dsp-http-api-configuration-2025
- dsp-negotiation-2025
- dsp-negotiation-http-api-2025
- dsp-negotiation-transform-2025
- dsp-transfer-process-2025
- dsp-transfer-process-http-api-2025
- dsp-transfer-process-transform-2025
- dsp-core
- dsp-http-api-base-configuration
- dsp-http-core
- dsp-lib
- dsp-catalog-lib
- dsp-catalog-transform-lib
- dsp-catalog-validation-lib
- dsp-negotiation-lib
- dsp-negotiation-http-api-lib
- dsp-negotiation-transform-lib
- dsp-negotiation-validation-lib
- dsp-transfer-process-lib
- dsp-transfer-process-http-api-lib
- dsp-transfer-process-transform-lib
- dsp-transfer-process-validation-lib
- dsp-version-transform-lib
- src
- main/java/org/eclipse/edc/protocol/dsp
- catalog
- http/api
- controller
- decorator
- transform
- from
- to
- validation
- negotiation
- http/api
- controller
- transform
- from
- to
- validation
- transferprocess
- http/api
- controller
- transform/type
- from
- to
- validation
- version/transformer
- testFixtures/java/org/eclipse/edc/protocol/dsp
- catalog/http/api/controller
- negotiation/http/api/controller
- transferprocess/http/api/controller
- test/java/org/eclipse/edc/protocol/dsp
- catalog
- http/api/decorator
- transform
- from
- to
- validation
- negotiation
- transform
- from
- to
- validation
- transferprocess
- transform
- from
- to
- validation
- version/transformer
- dsp-version/dsp-version-http-api
- dsp-virtual
- dsp-2025-virtual
- dsp-catalog-http-api-2025-virtual
- dsp-http-api-configuration-2025-virtual
- dsp-negotiation-http-api-2025-virtual
- dsp-transfer-process-http-api-2025-virtual
- dsp-http-core-virtual
- dsp-metadata-http-api-virtual
- dist/bom
- controlplane-base-bom
- controlplane-virtual-base-bom
- federatedcatalog-base-bom
- extensions
- common
- api
- api-core
- api-observability
- control-api-configuration
- lib/management-api-lib
- management-api-authorization
- management-api-configuration
- management-api-oauth2-authentication
- management-api-schema-validator
- auth
- auth-authentication-oauth2-lib
- auth-authorization-oauth2-lib
- auth-delegated
- configuration/configuration-filesystem
- crypto
- jwt-verifiable-credentials
- ldp-verifiable-credentials
- lib/jws2020-lib
- http
- jersey-core
- lib/jersey-providers-lib
- iam
- decentralized-claims
- decentralized-claims-core
- decentralized-claims-service
- decentralized-claims-store-sql
- decentralized-claims-sts
- decentralized-claims-sts-remote-client
- lib/decentralized-claims-sts-remote-lib
- decentralized-claims-transform
- lib
- decentralized-claims-lib
- verifiable-credentials-lib
- decentralized-identity
- identity-did-core
- identity-did-web
- oauth2/oauth2-client
- verifiable-credentials
- json-ld
- sql
- sql-bootstrapper
- sql-core
- sql-lease-core
- sql-lease-spi
- sql-lease
- sql-pool/sql-pool-apache-commons
- sql-test-fixtures
- store/sql
- cel-store-sql
- edr-index-sql
- jti-validation-store-sql
- task-store-sql
- transaction/transaction-atomikos
- vault/vault-hashicorp
- control-plane
- api
- control-plane-api-client
- management-api-v5
- asset-api-v5
- catalog-api-v5
- cel-api-v5
- contract-agreement-api-v5
- contract-definition-api-v5
- contract-negotiation-api-v5
- dataspace-profile-context-api-v5
- discovery-api-v5
- participant-context-api-v5
- participant-context-config-api-v5
- policy-definition-api-v5
- transfer-process-api-v5
- management-api
- asset-api
- catalog-api
- contract-agreement-api
- contract-definition-api
- contract-negotiation-api
- edr-cache-api
- management-api-test-fixtures
- policy-definition-api
- secrets-api
- transfer-process-api
- callback/callback-event-dispatcher
- store/sql
- asset-index-sql
- contract-definition-store-sql
- contract-negotiation-store-sql
- participantcontext-config-store-sql
- participantcontext-store-sql
- policy-definition-store-sql
- transfer-process-store-sql
- tasks/nats
- publisher
- negotiation-tasks-publisher-nats
- transfer-tasks-publisher-nats
- subscriber
- negotiation-tasks-subscriber-nats
- transfer-tasks-subscriber-nats
- data-plane-selector
- data-plane-selector-api
- data-plane-selector-client
- data-plane-selector-control-api
- store/sql/data-plane-instance-store-sql
- data-plane
- data-plane-http-oauth2-core
- data-plane-http
- data-plane-iam
- data-plane-kafka
- data-plane-provision-http
- data-plane-signaling
- data-plane-signaling-api
- data-plane-signaling-client
- data-plane-signaling-transform
- store/sql
- accesstokendata-store-sql
- data-plane-store-sql
- federated-catalog
- api/federated-catalog-api
- store/sql
- federated-catalog-cache-sql
- target-node-directory-sql
- policy-monitor/store/sql/policy-monitor-store-sql
- spi
- control-plane-spi
- core-spi
- decentralized-claims-spi
- system-tests
- bom-tests
- e2e-dataplane-tests/tests
- e2e-federatedcatalog-tests
- component-tests
- end2end-test/e2e-junit-runner
- e2e-transfer-test/runner
- management-api/management-api-test-runner
- protocol-2025-test
- tck/dsp-tck-tests
- version-api/version-api-test-runner
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 6 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
29 | 27 | | |
30 | | - | |
| 28 | + | |
31 | 29 | | |
32 | | - | |
| 30 | + | |
33 | 31 | | |
34 | 32 | | |
35 | | - | |
| 33 | + | |
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
| 23 | + | |
| 24 | + | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | | - | |
30 | 29 | | |
31 | 30 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
| 26 | + | |
| 27 | + | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
35 | | - | |
| 34 | + | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
0 commit comments