You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2025/12/06 08:14:51 UTC

(unomi) branch merge/manual-merge created (now 83f0d79e3)

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a change to branch merge/manual-merge
in repository https://gitbox.apache.org/repos/asf/unomi.git


      at 83f0d79e3 chore: Update Java version in CI workflow and adjust serialVersionUIDs

This branch includes the following new commits:

     new 41d73aa2e feat: Major refactoring and enhancements across codebase
     new 83f0d79e3 chore: Update Java version in CI workflow and adjust serialVersionUIDs

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(unomi) 01/02: feat: Major refactoring and enhancements across codebase

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch merge/manual-merge
in repository https://gitbox.apache.org/repos/asf/unomi.git

commit 41d73aa2e92c1fc1161adbe001805e673c9c9703
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Sat Dec 6 09:05:53 2025 +0100

    feat: Major refactoring and enhancements across codebase
    
    This commit includes comprehensive improvements to persistence layer,
    service architecture, testing infrastructure, and build system.
    
    ## Core Infrastructure
    - Add BOM (Bill of Materials) for centralized dependency management
    - Implement ResolverService for centralized type resolution
    - Add InvalidObjectInfo API for validation and debugging
    - Enhance shutdown handling with timeout management in ClusterService and SchedulerService
    
    ## Persistence Layer
    - Major enhancement to InMemoryPersistenceServiceImpl with refresh delay simulation,
      optimistic concurrency control, and comprehensive test coverage (+2993 test lines)
    - Refactor Elasticsearch persistence with factory pattern (ElasticsearchClientFactory)
    - Enhance OpenSearch persistence implementation
    - Reorganize condition evaluator classes into evaluator subpackage
    - Add ConditionQueryBuilderDispatcherSupport for better query builder management
    - Change query builder names from ES-specific to generic (propertyConditionQueryBuilder)
    
    ## Service Layer
    - Enhance all core services (Definitions, Events, Goals, Profiles, Rules, Segments, Queries)
    - Improve error handling and validation across services
    - Add comprehensive test coverage for all services
    - Remove @PostConstruct/@PreDestroy annotations in favor of Blueprint XML lifecycle
    
    ## Testing Infrastructure
    - Add comprehensive test utilities (retryQueryUntilAvailable, retryUntil)
    - Enhance TestHelper with robust cleanup and service creation helpers
    - Add extensive test coverage (+5000+ test lines across all services)
    - Add LogChecker utility for test log analysis
    - Add legacy query builder mapping integration tests
    
    ## Plugin & Extension Refactoring
    - Reorganize condition evaluators (PastEventConditionEvaluator, SourceEventPropertyConditionEvaluator)
    - Move plugins to better organized structure (past-event, advanced-conditions)
    - Add InMemoryLogAppender for testing
    - Enhance health check providers with PersistenceEngineHealthProvider
    
    ## Web Layer
    - Create new web-servlets module separating servlets from WAB bundle
    - Move servlets from wab/ to web-servlets/ module
    - Enhance REST API endpoints with better error handling
    - Add TestEndPoint for testing
    - Improve GraphQL implementation with GraphQLServletActivator
    
    ## Migration & Shell Commands
    - Update migration scripts to 3.1.0 version
    - Add migrate-3.1.0-05-fixSystemItemIds.groovy
    - Enhance MigrationUtils with better error handling
    - Add ListInvalidObjects shell command
    
    ## Documentation
    - Add comprehensive coding guidelines (CODING_GUIDELINES.md)
    - Add in-memory persistence requirements and analysis documents
    - Add configuration update analysis
    - Add dependency organization report
    - Update all migration documentation
    - Add code review rules and test generation guidelines
    
    ## Build & Infrastructure
    - Enhance build scripts (build.sh, build.ps1)
    - Add setup scripts for Elasticsearch and OpenSearch
    - Add utility scripts (shell-utils.sh, setup-utils.sh)
    - Add clear scripts for ES/OS cleanup
    - Add docker-compose-cluster.yml
    - Update all Maven POMs with BOM integration
    - Update GitHub workflows
    
    ## Configuration
    - Update all Blueprint XML files with timeout configurations
    - Remove OGNL configuration files (no longer needed)
    - Update system properties and configuration files
    - Enhance logging configuration
    
    ## Removed/Deprecated
    - Remove create_unomi_prs.py (no longer needed)
    - Remove generate-site scripts (replaced with generate-manual.sh)
    - Remove custom client classes (replaced with factory pattern)
    - Remove @PostConstruct/@PreDestroy annotations (using Blueprint XML)
    
    ## Statistics
    - 441 files changed
    - +27,670 insertions, -10,180 deletions
    - Net: +17,490 lines
    - Comprehensive test coverage added
    - All tests passing
    
    BREAKING CHANGES:
    - Condition evaluator classes moved to evaluator subpackage
    - Web servlets moved from wab to web-servlets module
    - Query builder names changed (backward compatible via dispatcher)
---
 .github/workflows/codeql-analysis-java.yml         |    4 +-
 .github/workflows/unomi-ci-build-tests.yml         |   36 +-
 .github/workflows/unomi-ci-docs-deploy.yml         |    8 +-
 .gitignore                                         |    3 +
 BUILDING                                           |    4 +-
 CODING_GUIDELINES.md                               |  630 ++++
 CONFIGURATION_UPDATE_ANALYSIS.md                   |  504 ++++
 INMEMORY_PERSISTENCE_REQUIREMENTS.md               | 1024 +++++++
 api/pom.xml                                        |   26 +-
 .../java/org/apache/unomi/api/ClusterNode.java     |   10 +-
 .../java/org/apache/unomi/api/ContextRequest.java  |    1 -
 .../main/java/org/apache/unomi/api/GeoPoint.java   |    1 +
 api/src/main/java/org/apache/unomi/api/Item.java   |    2 -
 .../org/apache/unomi/api/conditions/Condition.java |    2 +-
 .../exceptions/BadSegmentConditionException.java   |   51 +
 .../apache/unomi/api/services/ClusterService.java  |    1 -
 .../unomi/api/services/InvalidObjectInfo.java      |  166 ++
 .../apache/unomi/api/services/ResolverService.java |  203 ++
 .../org/apache/unomi/api/utils/ParserHelper.java   |   58 +-
 .../apache/unomi/api/utils/ParserHelperTest.java   |  177 ++
 bom/artifacts/pom.xml                              |  295 ++
 bom/pom.xml                                        |  559 ++++
 build.ps1                                          |   87 +-
 build.sh                                           |  117 +
 clear-elasticsearch.sh                             |   59 +
 clear-opensearch.sh                                |   60 +
 common/pom.xml                                     |   21 +-
 .../java/org/apache/unomi/common/DataTable.java    |    1 -
 create_unomi_prs.py                                | 1088 -------
 docker/README.md                                   |   16 +-
 docker/pom.xml                                     |   14 +-
 docker/src/main/docker/Dockerfile                  |    2 +-
 docker/src/main/docker/docker-compose-build-es.yml |   28 +-
 docker/src/main/docker/docker-compose-build-os.yml |    6 +-
 ...r-compose-es.yml => docker-compose-cluster.yml} |   69 +-
 docker/src/main/docker/docker-compose-es.yml       |   28 +-
 docker/src/main/docker/docker-compose-os.yml       |    6 +-
 extensions/geonames/pom.xml                        |   12 +-
 extensions/geonames/rest/pom.xml                   |   43 +-
 .../unomi/geonames/rest/GeonamesEndPoint.java      |    4 -
 extensions/geonames/services/pom.xml               |   27 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    5 +-
 extensions/groovy-actions/karaf-kar/pom.xml        |   45 +-
 .../karaf-kar/src/main/feature/feature.xml         |    7 +-
 extensions/groovy-actions/pom.xml                  |    1 -
 extensions/groovy-actions/rest/pom.xml             |   61 +-
 .../groovy/actions/rest/GroovyActionsEndPoint.java |   11 +-
 extensions/groovy-actions/services/pom.xml         |  105 +-
 .../unomi/groovy/actions/ScriptMetadata.java       |   62 +-
 .../services/impl/GroovyActionsServiceImpl.java    |    3 +-
 .../impl/GroovyActionsServiceImplTest.java         |   10 +-
 extensions/healthcheck/pom.xml                     |   44 +-
 .../unomi/healthcheck/HealthCheckProvider.java     |   23 +-
 .../unomi/healthcheck/HealthCheckService.java      |    6 +-
 .../provider/ElasticSearchHealthCheckProvider.java |   57 +-
 .../provider/OpenSearchHealthCheckProvider.java    |   55 +-
 .../provider/PersistenceEngineHealthProvider.java  |   23 +-
 .../provider/PersistenceHealthCheckProvider.java   |   66 +
 .../healthcheck/servlet/HealthCheckServlet.java    |   12 +-
 extensions/json-schema/rest/pom.xml                |   62 +-
 .../unomi/schema/rest/JsonSchemaEndPoint.java      |   14 +-
 extensions/json-schema/services/pom.xml            |   75 +-
 .../apache/unomi/schema/api/ValidationError.java   |    2 -
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    5 +-
 .../unomi/schema/impl/SchemaServiceImplTest.java   |    2 +-
 extensions/json-schema/shell-commands/pom.xml      |   29 +-
 extensions/lists-extension/actions/pom.xml         |   19 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 extensions/lists-extension/pom.xml                 |   13 +-
 extensions/lists-extension/rest/pom.xml            |   40 +-
 .../unomi/lists/rest/UserListServiceEndPoint.java  |    4 -
 extensions/lists-extension/services/pom.xml        |   18 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 extensions/log4j-extension/pom.xml                 |   26 +-
 .../extensions/log4j/InMemoryLogAppender.java      |  290 ++
 extensions/pom.xml                                 |   16 -
 extensions/privacy-extension/pom.xml               |   13 +-
 extensions/privacy-extension/rest/pom.xml          |   66 +-
 .../unomi/privacy/rest/PrivacyServiceEndPoint.java |    4 -
 extensions/privacy-extension/services/pom.xml      |   34 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    9 +-
 extensions/router/pom.xml                          |    3 -
 extensions/router/router-api/pom.xml               |   16 +-
 extensions/router/router-core/pom.xml              |   54 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    7 +-
 extensions/router/router-karaf-feature/pom.xml     |  138 +-
 .../src/main/feature/feature.xml                   |    3 +-
 extensions/router/router-rest/pom.xml              |   74 +-
 .../rest/ExportConfigurationServiceEndPoint.java   |    6 -
 .../rest/ImportConfigurationServiceEndPoint.java   |    5 -
 extensions/router/router-service/pom.xml           |   70 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 extensions/salesforce-connector/actions/pom.xml    |   18 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 extensions/salesforce-connector/karaf-kar/pom.xml  |   73 +-
 .../karaf-kar/src/main/feature/feature.xml         |    6 +-
 extensions/salesforce-connector/pom.xml            |    1 -
 extensions/salesforce-connector/rest/pom.xml       |   86 +-
 .../org/apache/unomi/sfdc/rest/SFDCEndPoint.java   |    4 -
 extensions/salesforce-connector/services/pom.xml   |   49 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    5 +-
 extensions/weather-update/core/pom.xml             |   20 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    5 +-
 extensions/weather-update/karaf-kar/pom.xml        |   64 +-
 .../karaf-kar/src/main/feature/feature.xml         |    6 +-
 extensions/web-tracker/pom.xml                     |    1 -
 extensions/web-tracker/wab/pom.xml                 |   22 +-
 extensions/web-tracker/wab/yarn.lock               |  444 +--
 generate-manual-config.sh                          |   98 +
 generate-manual.sh                                 |  684 +++++
 generate-site-and-upload.sh                        |   64 -
 generate-site.sh                                   |   67 -
 graphql/cxs-impl/pom.xml                           |  132 +-
 .../graphql/actions/CDPConsentUpdateAction.java    |    4 +
 .../unomi/graphql/actions/CDPSessionAction.java    |    6 +-
 .../graphql/actions/CDPUpdateListsAction.java      |    4 +
 .../graphql/activator/GraphQLServletActivator.java |   90 +
 .../converters/UnomiToGraphQLConverter.java        |    1 +
 .../graphql/schema/GraphQLSchemaProvider.java      |    3 +-
 .../unomi/graphql/servlet/GraphQLServlet.java      |   31 +-
 .../auth/GraphQLServletSecurityValidator.java      |    4 +-
 .../cxs/conditions/userListPropertyCondition.json  |    4 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   56 -
 graphql/graphql-ui/pom.xml                         |   19 +-
 graphql/graphql-ui/yarn.lock                       |  886 +++---
 graphql/karaf-feature/pom.xml                      |   80 +-
 graphql/karaf-feature/src/main/feature/feature.xml |   59 +-
 graphql/pom.xml                                    |   12 -
 itests/README.md                                   |   52 +-
 itests/pom.xml                                     |  169 +-
 .../test/java/org/apache/unomi/itests/AllITs.java  |    7 +-
 .../test/java/org/apache/unomi/itests/BaseIT.java  |  431 ++-
 .../test/java/org/apache/unomi/itests/BasicIT.java |    9 +
 .../apache/unomi/itests/ConditionEvaluatorIT.java  |   12 +-
 .../org/apache/unomi/itests/ContextServletIT.java  |   75 +-
 .../org/apache/unomi/itests/EventServiceIT.java    |   33 +-
 .../org/apache/unomi/itests/HealthCheckIT.java     |   91 +-
 .../java/org/apache/unomi/itests/JSONSchemaIT.java |   16 +-
 .../unomi/itests/LegacyQueryBuilderMappingIT.java  |  174 ++
 .../test/java/org/apache/unomi/itests/PatchIT.java |    6 +
 .../apache/unomi/itests/ProfileImportActorsIT.java |    7 +-
 .../org/apache/unomi/itests/ProfileMergeIT.java    |   56 +-
 .../org/apache/unomi/itests/ProfileServiceIT.java  |    4 +-
 .../org/apache/unomi/itests/RuleServiceIT.java     |   13 +-
 .../java/org/apache/unomi/itests/SegmentIT.java    |   57 +-
 .../apache/unomi/itests/V2CompatibilityModeIT.java |   20 +-
 .../apache/unomi/itests/graphql/BaseGraphQLIT.java |   13 +-
 .../unomi/itests/graphql/GraphQLEventIT.java       |   56 +-
 .../itests/graphql/GraphQLServletSecurityIT.java   |    1 -
 ...6xIT.java => Migrate16xToCurrentVersionIT.java} |  253 +-
 .../apache/unomi/itests/migration/MigrationIT.java |   31 +-
 .../org/apache/unomi/itests/tools/LogChecker.java  |  808 ++++++
 .../conditions/testBooleanConditionLegacy.json     |   21 +-
 .../conditions/testIdsConditionLegacy.json         |   26 +
 .../resources/conditions/testIdsConditionNew.json  |   26 +
 .../conditions/testPropertyConditionLegacy.json    |   19 +-
 .../src/test/resources/etc/users.properties        |   22 +-
 .../resources/migration/snapshots_repository.zip   |  Bin 7743842 -> 3252696 bytes
 .../resources/org.apache.unomi.healthcheck.cfg     |    6 +-
 kar/pom.xml                                        |  153 +-
 kar/src/main/feature/feature.xml                   |  231 +-
 lifecycle-watcher/pom.xml                          |   30 +-
 .../org/apache/unomi/lifecycle/BundleWatcher.java  |   24 +
 .../apache/unomi/lifecycle/BundleWatcherImpl.java  |   14 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    8 +-
 manual/pom.xml                                     |    5 -
 manual/src/main/asciidoc/5-min-quickstart.adoc     |   13 +-
 .../src/main/asciidoc/building-and-deploying.adoc  |   62 +-
 .../src/main/asciidoc/builtin-condition-types.adoc |    6 +-
 manual/src/main/asciidoc/clustering.adoc           |   19 +-
 manual/src/main/asciidoc/configuration.adoc        |  327 ++-
 manual/src/main/asciidoc/getting-started.adoc      |    8 +-
 manual/src/main/asciidoc/index.adoc                |    2 +
 .../asciidoc/migrations/migrate-1.4-to-1.5.adoc    |    5 +-
 .../asciidoc/migrations/migrate-1.6-to-2.0.adoc    |    4 +-
 .../asciidoc/migrations/migrate-2.x-to-3.0.adoc    |  296 ++
 ...ate-2.0-to-3.0.adoc => migrate-3.0-to-3.1.adoc} |  118 +-
 .../migrate-elasticsearch-to-opensearch.adoc       |    2 +-
 .../src/main/asciidoc/migrations/migrations.adoc   |   10 +-
 .../asciidoc/migrations/v2-compatibility-mode.adoc |    6 +-
 .../asciidoc/migrations/v2-v3-compatibility.adoc   |    2 +-
 .../src/main/asciidoc/past-event-conditions.adoc   |   18 +-
 manual/src/main/asciidoc/request-examples.adoc     |   16 +-
 manual/src/main/asciidoc/shell-commands.adoc       |    6 +-
 manual/src/main/asciidoc/whats-new.adoc            |  184 +-
 manual/src/main/asciidoc/writing-plugins.adoc      |  344 ++-
 metrics/pom.xml                                    |   45 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    8 +-
 package/pom.xml                                    |  176 +-
 package/src/main/resources/BUILD                   |    3 +
 .../main/resources/etc/custom.system.properties    |   72 +-
 package/src/main/resources/etc/ognl-allow.json     |    1 -
 package/src/main/resources/etc/ognl-forbid.json    |   19 -
 .../src/main/resources/etc/org.apache.cxf.osgi.cfg |    2 +-
 .../main/resources/etc/org.ops4j.pax.logging.cfg   |    5 +
 persistence-elasticsearch/conditions/pom.xml       |   81 +-
 ...ationByPointSessionConditionESQueryBuilder.java |   23 +-
 .../advanced/IdsConditionESQueryBuilder.java       |   21 +-
 .../advanced/PastEventConditionESQueryBuilder.java |   19 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   15 +-
 persistence-elasticsearch/core/pom.xml             |  192 +-
 .../elasticsearch/ChildFirstClassLoader.java       |   63 -
 .../elasticsearch/ConditionESQueryBuilder.java     |   29 +-
 .../ConditionESQueryBuilderDispatcher.java         |   81 +-
 .../elasticsearch/ESCustomObjectMapper.java        |   10 +-
 .../persistence/elasticsearch/ESItemMixIn.java     |    1 -
 .../ElasticSearchPersistenceServiceImpl.java       | 2671 ++++++++---------
 .../elasticsearch/ElasticsearchClientFactory.java  |  112 +
 .../core/BooleanConditionESQueryBuilder.java       |   29 +-
 .../core/MatchAllConditionESQueryBuilder.java      |    7 +-
 .../core/NestedConditionESQueryBuilder.java        |   13 +-
 .../core/NotConditionESQueryBuilder.java           |    7 +-
 .../core/PropertyConditionESQueryBuilder.java      |  504 +++-
 ...SourceEventPropertyConditionESQueryBuilder.java |   37 +-
 .../client/CustomRestHighLevelClient.java          |   76 -
 .../resources/OSGI-INF/blueprint/blueprint.xml     |  176 +-
 .../org.apache.unomi.persistence.elasticsearch.cfg |   53 +-
 .../elasticsearch/geo/DistanceUnitTest.java        |  121 -
 .../elasticsearch/geo/GeoDistanceTest.java         |   59 -
 persistence-elasticsearch/pom.xml                  |    6 +
 persistence-opensearch/conditions/pom.xml          |   73 +-
 .../advanced/IdsConditionOSQueryBuilder.java       |    2 +-
 .../advanced/PastEventConditionOSQueryBuilder.java |   15 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    6 +-
 persistence-opensearch/core/pom.xml                |   84 +-
 .../opensearch/ConditionOSQueryBuilder.java        |   25 +
 .../ConditionOSQueryBuilderDispatcher.java         |   56 +-
 .../OpenSearchPersistenceServiceImpl.java          |  479 ++--
 .../core/PropertyConditionOSQueryBuilder.java      |    6 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   47 +-
 .../org.apache.unomi.persistence.opensearch.cfg    |   22 +-
 persistence-spi/pom.xml                            |  164 +-
 .../unomi/persistence/spi/CustomObjectMapper.java  |    5 +-
 .../unomi/persistence/spi/PersistenceService.java  |   17 -
 .../unomi/persistence/spi/PropertyHelper.java      |   14 +-
 .../persistence/spi/aggregate/BaseAggregate.java   |   18 +
 .../persistence/spi/aggregate/DateAggregate.java   |  146 +-
 .../spi/aggregate/DateRangeAggregate.java          |   23 +
 .../spi/aggregate/IpRangeAggregate.java            |   15 +
 .../spi/aggregate/NumericRangeAggregate.java       |   15 +
 .../persistence/spi/aggregate/TermsAggregate.java  |   10 +
 .../spi/conditions/ConditionContextHelper.java     |  115 +-
 .../conditions/ConditionEvaluatorDispatcher.java   |   32 -
 .../persistence/spi/conditions/DateUtils.java      |   94 +-
 .../PastEventConditionPersistenceQueryBuilder.java |   57 +-
 .../datemath/DateMathParseException.java           |    3 +
 .../spi/conditions/datemath/DateMathParser.java    |   10 +
 .../spi/conditions/datemath/JavaDateFormatter.java |   10 +
 .../ConditionQueryBuilderDispatcherSupport.java    |  111 +
 .../{ => evaluator}/ConditionEvaluator.java        |    2 +-
 .../evaluator/ConditionEvaluatorDispatcher.java    |   87 +
 .../impl}/ConditionEvaluatorDispatcherImpl.java    |   73 +-
 .../spi/conditions/geo/DistanceUnit.java           |   10 +
 .../spi/conditions/geo/GeoDistance.java            |   11 +
 .../spi/config/ConfigurationUpdateHelper.java      |    2 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   50 -
 .../src/main/resources/mapping-FoldToASCII.txt     |    6 +-
 .../unomi/persistence/spi/PropertyHelperTest.java  |    1 +
 .../conditions/datemath/DateMathParserTest.java    |    5 +
 .../conditions/datemath/JavaDateFormatterTest.java |   12 +-
 .../advanced-conditions}/pom.xml                   |   46 +-
 .../conditions/PastEventConditionEvaluator.java    |   13 +-
 .../SourceEventPropertyConditionEvaluator.java     |   14 +-
 .../conditions/sourceEventPropertyCondition.json   |    4 +-
 .../src/main/resources/messages_en.properties      |    0
 plugins/baseplugin/pom.xml                         |   87 +-
 .../conditions/BooleanConditionEvaluator.java      |    4 +-
 ...eoLocationByPointSessionConditionEvaluator.java |    4 +-
 .../conditions/IdsConditionEvaluator.java          |    6 +-
 .../conditions/MatchAllConditionEvaluator.java     |    4 +-
 .../conditions/NestedConditionEvaluator.java       |    4 +-
 .../conditions/NotConditionEvaluator.java          |    6 +-
 .../conditions/PropertyConditionEvaluator.java     |  155 +-
 .../META-INF/cxs/conditions/IdsCondition.json      |    4 +-
 .../META-INF/cxs/conditions/booleanCondition.json  |    4 +-
 .../cxs/conditions/eventPropertyCondition.json     |    4 +-
 .../geoLocationByPointSessionCondition.json        |    2 +-
 .../META-INF/cxs/conditions/matchAllCondition.json |    4 +-
 .../META-INF/cxs/conditions/nestedCondition.json   |    4 +-
 .../META-INF/cxs/conditions/notCondition.json      |    4 +-
 .../cxs/conditions/pastEventCondition.json         |    2 +-
 .../profileAliasesPropertyCondition.json           |    2 +-
 .../cxs/conditions/profilePropertyCondition.json   |    2 +-
 .../cxs/conditions/sessionPropertyCondition.json   |    2 +-
 .../cxs/conditions/topicPropertyCondition.json     |    2 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   45 +-
 .../conditions/PropertyConditionEvaluatorTest.java |   96 -
 plugins/hover-event/pom.xml                        |   37 +-
 .../HoverEventConditionESQueryBuilder.java         |   58 -
 .../cxs/conditions/hoverEventCondition.json        |   43 +-
 .../META-INF/cxs/schemas/hover-event.json          |   25 +
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   29 -
 .../src/main/resources/messages_en.properties      |   20 -
 .../src/main/resources/messages_fr.properties      |   20 -
 plugins/kafka-injector/pom.xml                     |   52 +-
 plugins/mail/pom.xml                               |   22 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    7 +-
 plugins/optimization-test/pom.xml                  |   30 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 plugins/past-event/pom.xml                         |   49 -
 .../conditions/PastEventConditionEvaluator.java    |   13 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   26 -
 plugins/pom.xml                                    |   27 +-
 plugins/request/pom.xml                            |   38 +-
 .../request/actions/SetRemoteHostInfoAction.java   |    2 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    6 +-
 plugins/tracked-event/pom.xml                      |   31 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 pom.xml                                            |  753 +++--
 rest/pom.xml                                       |  150 +-
 .../rest/authentication/AuthenticationFilter.java  |   18 +-
 .../SecurityContextCleanupFilter.java              |    2 +-
 .../impl/DefaultRestAuthenticationConfig.java      |   38 +-
 .../EventsCollectorRequestDeserializer.java        |    4 +
 .../rest/endpoints/CampaignsServiceEndPoint.java   |    4 -
 .../unomi/rest/endpoints/ClientEndpoint.java       |    9 +-
 .../rest/endpoints/ClusterServiceEndPoint.java     |    5 -
 .../unomi/rest/endpoints/ContextJsonEndpoint.java  |    2 -
 .../rest/endpoints/DefinitionsServiceEndPoint.java |    6 -
 .../unomi/rest/endpoints/EventServiceEndpoint.java |    4 -
 .../rest/endpoints/EventsCollectorEndpoint.java    |    4 +-
 .../unomi/rest/endpoints/GoalsServiceEndPoint.java |    4 -
 .../unomi/rest/endpoints/PatchServiceEndPoint.java |    2 -
 .../rest/endpoints/ProfileServiceEndPoint.java     |   15 +-
 .../unomi/rest/endpoints/QueryServiceEndPoint.java |    6 -
 .../unomi/rest/endpoints/RulesServiceEndPoint.java |    4 -
 .../unomi/rest/endpoints/ScopeServiceEndPoint.java |   12 +-
 .../rest/endpoints/ScoringServiceEndPoint.java     |    4 -
 .../rest/endpoints/SegmentServiceEndPoint.java     |    4 -
 .../apache/unomi/rest/endpoints/TestEndPoint.java  |   50 +
 .../rest/endpoints/UserListServiceEndPoint.java    |    4 -
 .../rest/exception/RuntimeExceptionMapper.java     |    2 +-
 .../apache/unomi/rest/scheduler/TaskEndpoint.java  |    2 -
 .../apache/unomi/rest/security/SecurityFilter.java |    2 +-
 .../org/apache/unomi/rest/server/RestServer.java   |   56 +-
 .../apache/unomi/rest/tenants/TenantEndpoint.java  |    2 -
 .../org.apache.unomi.rest.authentication.cfg       |    4 +-
 samples/graphql-providers-feature/pom.xml          |   34 +-
 samples/graphql-providers/pom.xml                  |   35 +-
 samples/groovy-actions/pom.xml                     |   18 +-
 samples/login-integration/pom.xml                  |   18 +-
 samples/pom.xml                                    |    9 +-
 samples/trainingplugin/pom.xml                     |   20 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 samples/tweet-button-plugin/pom.xml                |   18 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    2 +-
 scripting/pom.xml                                  |   55 +-
 .../scripting/SecureFilteringClassLoader.java      |    4 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |    4 +-
 services-common/pom.xml                            |   46 +-
 .../cache/AbstractMultiTypeCachingService.java     |   53 +-
 services/pom.xml                                   |  111 +-
 .../unomi/services/impl/ResolverServiceImpl.java   |  363 +++
 .../services/impl/cluster/ClusterServiceImpl.java  |   54 +-
 .../configsharing/ConfigSharingServiceImpl.java    |    6 +
 .../impl/definitions/DefinitionsServiceImpl.java   |  138 +-
 .../services/impl/events/EventServiceImpl.java     |    9 +-
 .../services/impl/goals/GoalsServiceImpl.java      |  105 +-
 .../services/impl/profiles/ProfileServiceImpl.java |   21 +-
 .../services/impl/queries/QueryServiceImpl.java    |   13 +-
 .../services/impl/rules/RulesServiceImpl.java      |   70 +-
 .../scheduler/PersistenceSchedulerProvider.java    |   24 +-
 .../impl/scheduler/SchedulerConstants.java         |    4 +-
 .../impl/scheduler/SchedulerServiceImpl.java       |   54 +-
 .../impl/scheduler/TaskExecutionManager.java       |   23 +-
 .../services/impl/segments/SegmentServiceImpl.java |   90 +-
 .../impl/tenants/TenantMonitoringService.java      |   28 +-
 .../services/impl/topics/TopicServiceImpl.java     |    1 +
 .../validators/DateValueTypeValidator.java         |   16 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   30 +-
 .../main/resources/org.apache.unomi.cluster.cfg    |    2 +-
 .../java/org/apache/unomi/services/TestHelper.java |  122 +-
 .../impl/ExecutionContextManagerImplTest.java      |   34 +-
 .../impl/InMemoryPersistenceServiceImpl.java       |  995 ++++++-
 .../impl/InMemoryPersistenceServiceImplTest.java   | 2993 ++++++++++++++++++--
 .../services/impl/ResolverServiceImplTest.java     |  841 ++++++
 .../services/impl/TestConditionEvaluators.java     |   29 +-
 .../unomi/services/impl/TestTenantServiceTest.java |   77 +-
 .../impl/cache/MultiTypeCacheServiceImplTest.java  |  125 +-
 .../impl/cluster/ClusterServiceImplTest.java       |  135 +-
 .../definitions/DefinitionsServiceImplTest.java    | 1179 +++++++-
 .../services/impl/events/EventServiceImplTest.java |  219 +-
 .../services/impl/goals/GoalsServiceImplTest.java  |   42 +-
 .../impl/profiles/ProfileServiceImplTest.java      |   94 +-
 .../services/impl/rules/RulesServiceImplTest.java  |  152 +-
 .../impl/scheduler/SchedulerServiceImplTest.java   |  721 +++--
 .../impl/scheduler/TaskExecutorRegistryTest.java   |   20 +-
 .../impl/segments/SegmentServiceImplTest.java      |  259 +-
 .../ConditionValidationServiceImplTest.java        |   76 +-
 setenv.sh                                          |    4 +-
 setup-elasticsearch.sh                             |  114 +
 setup-opensearch.sh                                |  107 +
 setup-utils.sh                                     |  117 +
 shell-utils.sh                                     |  368 +++
 tools/pom.xml                                      |    4 +-
 tools/shell-commands/pom.xml                       |  103 +-
 .../java/org/apache/unomi/shell/actions/Start.java |   16 +-
 .../shell/migration/service/MigrationContext.java  |    2 +-
 .../shell/migration/utils/MigrationUtils.java      |  482 +++-
 .../shell/services/UnomiManagementService.java     |   12 +-
 .../UnomiManagementServiceConfiguration.java       |   20 +-
 .../internal/UnomiManagementServiceImpl.java       |   38 +-
 ...-2.2.0-10-rolloverAndMigrateEventSession.groovy |    4 +
 ...te-2.5.0-00-cleanPastEventProfileSession.groovy |   13 +-
 .../migrate-2.5.0-10-loginEventScope.groovy        |    1 -
 ...y => migrate-3.1.0-00-tenantDocumentIds.groovy} |  135 +-
 .../migrate-3.1.0-05-fixSystemItemIds.groovy       |   85 +
 ...> migrate-3.1.0-10-tenantInitialization.groovy} |   14 +-
 .../src/main/resources/org.apache.unomi.start.cfg  |    4 +-
 .../requestBody/2.0.0/base_reindex_request.json    |    3 +-
 .../2.2.0/base_index_withRollover_request.json     |    4 +-
 .../requestBody/2.2.0/base_reindex_request.json    |    3 +-
 .../requestBody/2.2.0/configure_alias_body.json    |   11 +
 .../requestBody/2.2.0/suffix_ids.painless          |    7 +-
 .../base_update_by_query_request.json              |    0
 .../requestBody/3.1.0/fix_system_item_ids.painless |   71 +
 .../3.1.0/fix_system_item_ids_update_request.json  |   12 +
 .../{3.0.0 => 3.1.0}/get_item_types_query.json     |    0
 .../initialize_tenant_and_audit_fields.painless    |   11 +-
 tools/shell-dev-commands/pom.xml                   |   70 +-
 .../shell/dev/commands/ListInvalidObjects.java     |   94 +
 tracing/tracing-api/pom.xml                        |   16 +-
 tracing/tracing-impl/pom.xml                       |   17 +-
 wab/pom.xml                                        |  118 +-
 .../java/org/apache/unomi/web/ContextServlet.java  |   94 -
 .../unomi/web/UnomiAuthenticationFilter.java       |  170 --
 .../main/java/org/apache/unomi/web/WebConfig.java  |  116 +
 .../resources/OSGI-INF/blueprint/blueprint.xml     |  107 -
 {wab => web-servlets}/pom.xml                      |  157 +-
 .../apache/unomi/web/servlets}/ClientServlet.java  |   27 +-
 .../apache/unomi/web/servlets/ContextServlet.java  |   46 +-
 .../web/servlets}/EventsCollectorServlet.java      |   14 +-
 .../HttpServletRequestForwardWrapper.java          |    2 +-
 .../org/apache/unomi/web/servlets}/HttpUtils.java  |    2 +-
 .../org/apache/unomi/web/servlets/WebConfig.java   |  116 +
 .../src/main/resources/org.apache.unomi.web.cfg    |    0
 436 files changed, 25713 insertions(+), 10425 deletions(-)

diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml
index 546e91b17..5fd21511c 100644
--- a/.github/workflows/codeql-analysis-java.yml
+++ b/.github/workflows/codeql-analysis-java.yml
@@ -39,10 +39,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - run: mvn -U -ntp -e clean install -DskipTests
 
     - name: Perform CodeQL Analysis
diff --git a/.github/workflows/unomi-ci-build-tests.yml b/.github/workflows/unomi-ci-build-tests.yml
index d4ba4418a..1a6e9e5ee 100644
--- a/.github/workflows/unomi-ci-build-tests.yml
+++ b/.github/workflows/unomi-ci-build-tests.yml
@@ -16,10 +16,12 @@ jobs:
     timeout-minutes: 15
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'maven'
     - name: Install GraphViz
       run: |
         sudo apt-get update
@@ -33,6 +35,7 @@ jobs:
     needs: unit-tests
     runs-on: ubuntu-latest
     strategy:
+      max-parallel: 1
       matrix:
         include:
           - search-engine: elasticsearch
@@ -42,26 +45,33 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
       - name: Integration tests
         run: |
-          mvn -ntp clean install -Pintegration-tests,${{ matrix.search-engine }} \
-          -Dopensearch.port=${{ matrix.port }} \
-          -Delasticsearch.port=${{ matrix.port }}
+          FLAGS="-Pintegration-tests"
+          if [ "${{ matrix.search-engine }}" = "opensearch" ]; then
+            # Trigger OpenSearch profile activation via property; do not pass any -P profile toggles
+            FLAGS="$FLAGS -Duse.opensearch=true"
+          fi
+          mvn -ntp clean install $FLAGS \
+            -Dopensearch.port=${{ matrix.port }} \
+            -Delasticsearch.port=${{ matrix.port }}
       - name: Archive code coverage logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: false # UNOMI-746 Reactivate if necessary
         with:
-          name: unomi-code-coverage-jdk11-${{ matrix.search-engine }}-${{ github.run_number }}
+          name: unomi-code-coverage-jdk17-${{ matrix.search-engine }}-${{ github.run_number }}
           path: itests/target/site/jacoco
       - name: Archive unomi logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: unomi-log-jdk11-${{ matrix.search-engine }}-${{ github.run_number }}
+          name: unomi-log-jdk17-${{ matrix.search-engine }}-${{ github.run_number }}
           path: |
             itests/target/exam/**/data/log
             itests/target/elasticsearch0/data
diff --git a/.github/workflows/unomi-ci-docs-deploy.yml b/.github/workflows/unomi-ci-docs-deploy.yml
index 528afb3b0..286404e0b 100644
--- a/.github/workflows/unomi-ci-docs-deploy.yml
+++ b/.github/workflows/unomi-ci-docs-deploy.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: apache.snapshots.https
           server-username: NEXUS_USER
           server-password: NEXUS_PW
@@ -38,10 +38,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: apache.snapshots.https
           server-username: NEXUS_USER
           server-password: NEXUS_PW
diff --git a/.gitignore b/.gitignore
index ab65e4fd2..d2a8b60d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ rest/.miredot-offline.json
 /extensions/salesforce-connector/test.properties
 **/*.versionsBackup
 itests/src/main
+dependency_tree.txt
 /.cursor/rules/always-read-existing-code.mdc
 /.cursor/rules/avoid-code-duplication.mdc
 /.cursor/rules/osgi-injection-frameworks.mdc
@@ -24,3 +25,5 @@ itests/src/main
 /extensions/json-schema/services/data/
 # Ignore all data directories used by InMemoryPersistenceServiceImpl and integration tests
 **/data/persistence/
+itests/snapshots_repository/
+.env.local
diff --git a/BUILDING b/BUILDING
index c1ae7757d..1d460d507 100644
--- a/BUILDING
+++ b/BUILDING
@@ -21,8 +21,7 @@ Building Apache Unomi
 Initial Setup
 -------------
 
-1) Install J2SE 8.0 SDK (or later), which can be downloaded from
-   http://www.oracle.com/technetwork/java/javase/downloads/index.html
+1) Install J2SE 17 SDK (or later), which can be downloaded from http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 2) Make sure that your JAVA_HOME environment variable is set to the newly installed
    JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
@@ -70,6 +69,7 @@ as the Unix shell script with a more Windows-native experience.
    - -Debug                  Run Karaf in debug mode
    - -UseOpenSearch         Use OpenSearch instead of ElasticSearch
    - -KarafHome <path>       Set Karaf home directory
+   - -ResolverDebug          Enable Karaf Resolver debug logging for integration tests
 
    Examples:
    - Build with integration tests:
diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md
new file mode 100644
index 000000000..747caaab9
--- /dev/null
+++ b/CODING_GUIDELINES.md
@@ -0,0 +1,630 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+# Apache Unomi Coding Guidelines
+
+This document outlines coding conventions and guidelines for the Apache Unomi project. It covers both standard Java best practices and project-specific conventions.
+
+## Table of Contents
+
+1. [Quick Reference](#quick-reference)
+2. [Naming Conventions](#naming-conventions)
+3. [Code Patterns](#code-patterns)
+4. [OSGi Service Implementation](#osgi-service-implementation)
+5. [Maven POM Organization](#maven-pom-organization)
+6. [Testing Guidelines](#testing-guidelines)
+7. [Project Goals](#project-goals)
+
+---
+
+## Quick Reference
+
+### Standard Java Best Practices
+
+This project follows standard Java best practices. For comprehensive guidelines, refer to:
+- [Oracle Java Code Conventions](https://www.oracle.com/java/technologies/javase/codeconventions-contents.html)
+- [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
+- **Effective Java** by Joshua Bloch
+- [Java Platform Documentation](https://docs.oracle.com/javase/)
+
+**Key Principles**: Code clarity, consistency, documentation, proper error handling, resource management, immutability, thread safety.
+
+### Checkstyle Rules
+
+Key rules: JavaDoc for public classes/methods, remove unused imports, UPPER_CASE constants, no magic numbers (exceptions: -1, 0, 1, 2, 3, 17, 24, 31, 37, 60, 255, 256, 1000), always use braces, equals/hashCode together.
+
+Run: `mvn clean install -P checkstyle`
+
+---
+
+## Naming Conventions
+
+### Item Classes
+
+All classes extending `org.apache.unomi.api.Item` **must** define:
+```java
+public static final String ITEM_TYPE = "myItem";
+```
+
+**Example**:
+```java
+public class Profile extends Item {
+    public static final String ITEM_TYPE = "profile";
+}
+```
+
+### Package Structure
+
+- **API**: `org.apache.unomi.api.*` - Public APIs
+- **Services**: `org.apache.unomi.services.impl.*` - Internal implementations
+- **Extensions**: `org.apache.unomi.*.services.*` - Extension-specific services
+- **Plugins**: `org.apache.unomi.plugin.*` - Plugin implementations
+
+### Class Naming
+
+- **Services**: `*Service` (interface), `*ServiceImpl` (implementation)
+- **Actions**: `*ActionExecutor`
+- **Conditions**: `*ConditionEvaluator`
+- **Queries**: `*QueryBuilder`
+
+---
+
+## Code Patterns
+
+### Logging
+
+Use SLF4J with `LoggerFactory.getLogger(ClassName.class)` (not `.getName()`):
+
+```java
+private static final Logger LOGGER = LoggerFactory.getLogger(MyClass.class);
+
+LOGGER.info("Processing item: {}", itemId);  // Parameterized logging
+LOGGER.error("Error processing item: {}", itemId, exception);  // Exception last
+```
+
+**Best Practices**: Include context (itemId, tenantId, eventType), use parameterized logging, pass exceptions as last parameter.
+
+### Collections
+
+- **Thread-safe**: `ConcurrentHashMap`, `ConcurrentLinkedQueue`, `AtomicBoolean/Integer/Long`
+- **Immutable**: `Collections.emptyList()`, `Collections.singletonList()`, `Collections.unmodifiableList()`
+- **Lazy init**: `map.computeIfAbsent(key, k -> new ArrayList<>()).add(value)`
+- **Initialization**: Use explicit constructors, set initial capacity when known
+
+### Exception Handling
+
+```java
+try {
+    // operation
+} catch (Exception e) {
+    LOGGER.error("Error processing item: {}", itemId, e);
+    throw new ProcessingException("Failed to process item: " + itemId, e);
+}
+```
+
+- Create custom exceptions for domain errors
+- Always log with context
+- Use `ExceptionMapper` for REST endpoints
+
+### Null Checks and Validation
+
+```java
+Objects.requireNonNull(item, "Item cannot be null");
+if (collection.isEmpty()) { /* ... */ }  // Not size() == 0
+```
+
+- Validate early (fail-fast)
+- Use `Objects.requireNonNull()` for required parameters
+- Check collections with `isEmpty()`
+
+### Resource Management
+
+```java
+try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
+    // use resource
+}
+```
+
+- Always use try-with-resources for `AutoCloseable`
+- Clean up in `@Deactivate`/`preDestroy()`: close trackers, shutdown executors, cancel timers
+
+### Concurrency
+
+- Use `ExecutorService` for async operations (shutdown in `@Deactivate`)
+- Prefer `ConcurrentHashMap` over `synchronizedMap`
+- Use `volatile` for simple flags, `AtomicReference` for object references
+- Document thread-safety guarantees
+
+### Execution Context
+
+```java
+contextManager.executeAsSystem(() -> { /* system operation */ });
+contextManager.executeAsTenant(tenantId, () -> { /* tenant operation */ });
+```
+
+- Contexts are `ThreadLocal` - don't share across threads
+- Always restore in `finally` blocks
+
+### Service Lifecycle
+
+**OSGi DS (preferred)**:
+```java
+@Component(service = MyService.class, configurationPid = "org.apache.unomi.myservice")
+public class MyServiceImpl implements MyService {
+    @Activate
+    public void activate(MyServiceConfig config) { /* init */ }
+    
+    @Deactivate
+    public void deactivate() { /* cleanup */ }
+    
+    @Modified
+    public void modified(MyServiceConfig config) { /* config change */ }
+}
+```
+
+**Blueprint (legacy)**: Use `postConstruct()` and `preDestroy()`.
+
+### REST API Endpoints
+
+```java
+@Path("/profiles")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Component(service = ProfileEndpoint.class, property = "osgi.jaxrs.resource=true")
+public class ProfileEndpoint {
+    @Reference
+    private ProfileService profileService;
+    
+    @GET
+    @Path("/{id}")
+    public Profile getProfile(@PathParam("id") String id) {
+        return profileService.load(id);
+    }
+}
+```
+
+### OSGi Service References
+
+```java
+@Reference(cardinality = ReferenceCardinality.MANDATORY)
+private PersistenceService persistenceService;
+
+@Reference(cardinality = ReferenceCardinality.OPTIONAL)
+private MetricsService metricsService;
+
+@Reference(cardinality = ReferenceCardinality.MULTIPLE)
+private List<ActionExecutor> actionExecutors;
+```
+
+**Dynamic binding**: Use `bind`/`unbind` methods with `CopyOnWriteArrayList` or `ConcurrentHashMap`.
+
+**Service Trackers**: Always close in `@Deactivate`:
+```java
+@Deactivate
+public void deactivate() {
+    if (serviceTracker != null) {
+        serviceTracker.close();
+        serviceTracker = null;
+    }
+}
+```
+
+### Serialization
+
+- All `Item` subclasses must be `Serializable`
+- Use `serialVersionUID` for version control
+- Use `CustomObjectMapper` for Unomi-specific serialization
+- Use `ItemDeserializer` for polymorphic Item deserialization
+
+### Builder Patterns
+
+- Use `ConditionBuilder` for complex condition trees
+- Use `TaskBuilder` for scheduled tasks
+- Return `this` from builder methods for chaining
+
+### Metrics
+
+```java
+int result = new MetricAdapter<Integer>(metricsService, "ClassName.operation") {
+    @Override
+    public Integer execute(Object... args) throws Exception {
+        return performOperation();
+    }
+}.runWithTimer();
+```
+
+- Check `metricsService != null && metricsService.isActivated()` before updating
+- Use descriptive names: `ClassName.operationName`
+
+### Validation Patterns
+
+Use `ValidationError` with context (parameter name, condition ID, etc.):
+```java
+errors.add(new ValidationError(
+    param.getId(),
+    "Required parameter is missing",
+    ValidationErrorType.MISSING_REQUIRED_PARAMETER,
+    condition.getConditionTypeId(),
+    type.getItemId(),
+    context,
+    null
+));
+```
+
+### Query Building
+
+- Register query builders with dispatcher
+- Handle null conditions and missing builders gracefully
+- Use thread-safe collections for query builder maps
+
+### Graceful Shutdown
+
+```java
+private volatile boolean shutdownNow = false;
+
+public void preDestroy() {
+    shutdownNow = true;  // Set flag first
+    // Cancel tasks, close trackers, shutdown executors
+}
+
+public void processItems() {
+    while (!shutdownNow) {
+        if (shutdownNow) return;  // Check flag in loop
+        processItem(getNextItem());
+    }
+}
+```
+
+**Shutdown sequence**: Set flag → Cancel tasks → Close trackers → Shutdown executors → Release references → Clear collections.
+
+---
+
+## OSGi Service Implementation
+
+### Migrate from Blueprint to DS Annotations
+
+**Goal**: Use OSGi Declarative Services (DS) annotations instead of Blueprint XML.
+
+**Benefits**: Type-safe references, better IDE support, reduced boilerplate, compile-time validation.
+
+**Strategy**: New services use DS; migrate existing services gradually when modifying.
+
+### Configuration Management
+
+**CRITICAL**: Use OSGi Managed Services with `@Modified` for real-time updates (no restart required).
+
+**Example**:
+```java
+@Component(service = WebConfig.class, configurationPid = "org.apache.unomi.web")
+@Designate(ocd = WebConfig.Config.class)
+public class WebConfig {
+    @ObjectClassDefinition(name = "Apache Unomi Web Configuration")
+    public @interface Config {
+        @AttributeDefinition(name = "Context Server Domain")
+        String contextserver_domain() default "";
+    }
+    
+    @Activate
+    public void activate(Config config) { modified(config); }
+    
+    @Modified
+    public void modified(Config config) {
+        // Configuration updated in real-time without restart
+        this.contextserverDomain = config.contextserver_domain();
+    }
+}
+```
+
+### Environment Variables
+
+**CRITICAL**: All configuration must be wired to environment variables for Docker.
+
+**Pattern** in `custom.system.properties`:
+```properties
+org.apache.unomi.my.property=${env:UNOMI_MY_PROPERTY:-defaultValue}
+```
+
+**Naming**: `UNOMI_{CATEGORY}_{PROPERTY_NAME}` (uppercase, underscores, replace dots with underscores).
+
+**Example**:
+```properties
+org.osgi.service.http.port=${env:UNOMI_HTTP_PORT:-8181}
+org.apache.unomi.elasticsearch.addresses=${env:UNOMI_ELASTICSEARCH_ADDRESSES:-localhost:9200}
+```
+
+**Docker**:
+```bash
+docker run -e UNOMI_HTTP_PORT=8080 -e UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200 apache/unomi:latest
+```
+
+**Priority** (highest to lowest): Environment variables → Custom config files → Default config files.
+
+**Real-time updates**: Environment variables set initial state; `@Modified` allows runtime changes without restart (for tests, future UI, operational flexibility).
+
+**Adding new property**:
+1. Add to `custom.system.properties` with `${env:UNOMI_*:-default}`
+2. Add to OSGi service `@ObjectClassDefinition` interface
+3. Document in user docs
+
+---
+
+## Maven POM Organization
+
+### Dependency Order
+
+1. **Unomi dependencies** (`org.apache.unomi.*`)
+2. **Standard API Dependencies** (Java/Jakarta EE, OSGi, JSR/JCP specs)
+3. **Libraries** (all other third-party)
+4. **Test dependencies** (scope=test)
+
+**Standard API Dependencies**: `javax.*`, `jakarta.*`, `org.osgi.*` packages (typically `scope=provided`).
+
+**Example**:
+```xml
+<dependencies>
+    <!-- Unomi dependencies -->
+    <dependency>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-api</artifactId>
+    </dependency>
+    
+    <!-- Standard API Dependencies -->
+    <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.core</artifactId>
+        <scope>provided</scope>
+    </dependency>
+    
+    <!-- Libraries -->
+    <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+    </dependency>
+    
+    <!-- Test dependencies -->
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <scope>test</scope>
+    </dependency>
+</dependencies>
+```
+
+### Dependency Version Management
+
+**CRITICAL**: Do NOT hardcode versions. All versions managed through:
+1. **BOM** (`unomi-bom`) - third-party dependencies
+2. **Root POM** - additional dependencies and properties
+3. **BOM Artifacts** (`unomi-bom-artifacts`) - Unomi internal dependencies
+
+**Adding a dependency**:
+1. Check if managed in `bom/pom.xml` or `bom/artifacts/pom.xml`
+2. If not, add version property to root `pom.xml`, then add to appropriate BOM
+3. Use in module `pom.xml` **without** `<version>` tag
+
+**Example**:
+```xml
+<!-- Root pom.xml -->
+<properties>
+    <my-library.version>1.2.3</my-library.version>
+</properties>
+
+<!-- bom/pom.xml -->
+<dependencyManagement>
+    <dependency>
+        <groupId>com.example</groupId>
+        <artifactId>my-library</artifactId>
+        <version>${my-library.version}</version>
+    </dependency>
+</dependencyManagement>
+
+<!-- Module pom.xml -->
+<dependency>
+    <groupId>com.example</groupId>
+    <artifactId>my-library</artifactId>
+    <!-- NO <version> tag -->
+</dependency>
+```
+
+**Exceptions**: Versions allowed only in root `pom.xml` properties, BOM files, and parent POM references.
+
+**See also**: `DEPENDENCY_ORGANIZATION_REPORT.md`
+
+---
+
+## Testing Guidelines
+
+### Unit Tests (JUnit 5)
+
+**Framework**: JUnit 5 (Jupiter), Mockito with `@ExtendWith(MockitoExtension.class)`
+
+**Conventions**:
+- Use `org.junit.jupiter.api.*` exclusively
+- Use `@BeforeEach`/`@AfterEach` for lifecycle
+- Use `@Tag` instead of `@Category`
+- Use `assertThrows()` instead of `@Test(expected = ...)`
+- Assertions: message as last parameter, include context (itemId, tenantId, etc.)
+
+**Example**:
+```java
+@ExtendWith(MockitoExtension.class)
+class MyServiceTest {
+    @Mock
+    private PersistenceService persistenceService;
+    
+    @Test
+    void testMethod() {
+        String itemId = "test-item-123";
+        when(persistenceService.load(itemId, MyItem.class)).thenReturn(new MyItem(itemId));
+        
+        MyItem result = myService.loadItem(itemId);
+        
+        assertNotNull(result, "Should load item with id: " + itemId);
+        assertEquals(itemId, result.getItemId(), "Item ID should match");
+    }
+}
+```
+
+### Integration Tests (JUnit 4)
+
+**Framework**: JUnit 4 (Pax Exam)
+
+**Conventions**:
+- Extend `org.apache.unomi.itests.BaseIT`
+- **NEVER** create dependencies between tests
+- Use `getOsgiService(ServiceClass.class, timeout)` for OSGi services
+- Clean up test data in `@After`
+
+**Example**:
+```java
+public class MyServiceIT extends BaseIT {
+    private String testItemId;
+    
+    @Before
+    public void setUp() {
+        testItemId = "test-item-" + System.currentTimeMillis();
+    }
+    
+    @Test
+    public void testMyService() throws Exception {
+        // Test implementation
+    }
+    
+    @After
+    public void tearDown() {
+        if (testItemId != null) {
+            try {
+                persistenceService.remove(testItemId, MyItem.class);
+            } catch (Exception e) {
+                // Log but don't fail
+            }
+        }
+    }
+}
+```
+
+**Running**: `mvn clean install -P integration-tests` (or `-Duse.opensearch=true` for OpenSearch)
+
+### Test Best Practices
+
+**AVOID `Thread.sleep()`** - Use:
+- **Awaitility** (unit tests): `await().atMost(10, TimeUnit.SECONDS).until(() -> condition)`
+- **BaseIT helpers** (integration): `keepTrying("message", supplier, predicate, timeout, retries)`
+- **CountDownLatch/CyclicBarrier** (thread synchronization)
+
+**When `Thread.sleep()` is acceptable**: Only in helper methods implementing retry logic, testing time-based behavior, or as last resort (< 100ms with justification).
+
+**Test Execution Time**:
+- **Targets**: Unit tests < 1s (most < 100ms), Integration tests < 10s (most < 5s)
+- **Strategies**: Use mocks, in-memory implementations, efficient waits, minimize I/O, parallelize when possible
+- **Long tests**: Document reason, consider splitting, use `@Tag("slow")`, ensure value justifies time
+
+**Performance and Reliability**:
+- Use `ExecutorService` for concurrency tests (shutdown in teardown)
+- Use fixed seeds for randomness: `new Random(42)`
+- Use `@TempDir` (JUnit 5) or `Files.createTempDirectory()` (integration), always clean up
+- Aggregate exceptions in concurrency tests, assert emptiness with list in message
+- Use `TimeUnit` constants, not raw millisecond literals
+- Assert on structured fields, not `toString()` (unless that's the behavior)
+- Assert collection size before contents
+- Compile regex patterns as `static final`
+- No static mutable state (or reset in `@BeforeEach`/`@AfterEach`)
+- Generate unique IDs per test, clean up data
+- Prefer condition-based waits over global timeouts
+- Isolate state for parallel execution
+
+**See also**: `itests/README.md`
+
+### JUnit 4 to JUnit 5 Migration Plan
+
+**Status**: **NOT YET STARTED** - Planned migration for consistency.
+
+**Key Differences**:
+- Package: `org.junit.*` → `org.junit.jupiter.api.*`
+- Lifecycle: `@Before`/`@After` → `@BeforeEach`/`@AfterEach`
+- Assertions: Message first → Message last parameter
+- Exceptions: `@Test(expected = ...)` → `assertThrows(...)`
+- Categories: `@Category` → `@Tag`
+- Runner: `@RunWith` → `@ExtendWith`
+
+**Strategy**: Verify Pax Exam JUnit 5 support, migrate incrementally in separate branch/PR.
+
+---
+
+## Project Goals
+
+### 1. Migrate from Blueprint to DS Annotations
+
+**Goal**: All services use OSGi DS annotations.
+
+**Strategy**: New services use DS; migrate existing when modifying.
+
+### 2. Merge Plugins and Extensions
+
+**Goal**: Consolidate `plugins/` and `extensions/` into unified extension mechanism.
+
+**Rationale**: Reduces confusion, simplifies structure, easier to understand.
+
+### 3. Prefer Plugins Over New Services
+
+**Goal**: Use plugins for new functionality instead of core services.
+
+**When to use plugins**: Custom actions/conditions, external integrations, domain-specific features, optional functionality.
+
+**When to use core services**: Fundamental persistence, core event processing, essential profile/segment management, critical infrastructure.
+
+### 4. Migrate Integration Tests to JUnit 5
+
+**Status**: **NOT YET STARTED** - See [JUnit 4 to JUnit 5 Migration Plan](#junit-4-to-junit-5-migration-plan).
+
+### 5. Increase Unit Test Coverage
+
+**Focus**: Service implementations, complex business logic, utility classes, error handling paths.
+
+**Strategy**: Add tests when modifying code, require tests for new features, use JaCoCo to track progress.
+
+### 6. Standardize Logger Initialization
+
+**Goal**: Use `LoggerFactory.getLogger(ClassName.class)` (not `.getName()`).
+
+**Strategy**: New code uses standard form; update existing when modifying.
+
+### 7. Code Quality and Maintainability
+
+**Ongoing**: Reduce duplication, improve documentation, refactor complex methods, follow SOLID principles, keep dependencies updated, address technical debt incrementally.
+
+---
+
+## Additional Resources
+
+- **Apache Unomi Website**: https://unomi.apache.org
+- **Contribution Guidelines**: https://unomi.apache.org/contribute.html
+- **JIRA Issue Tracker**: https://issues.apache.org/jira/browse/UNOMI
+- **Integration Test README**: `itests/README.md`
+- **Dependency Organization Report**: `DEPENDENCY_ORGANIZATION_REPORT.md`
+
+---
+
+## Questions or Suggestions?
+
+1. Open a discussion on the Apache Unomi developer mailing list
+2. Create a JIRA issue
+3. Submit a pull request with proposed changes
+
+---
+
+*Last updated: November 2025*
diff --git a/CONFIGURATION_UPDATE_ANALYSIS.md b/CONFIGURATION_UPDATE_ANALYSIS.md
new file mode 100644
index 000000000..71eaa74f7
--- /dev/null
+++ b/CONFIGURATION_UPDATE_ANALYSIS.md
@@ -0,0 +1,504 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+
+# Configuration Update Analysis: ElasticSearch and OpenSearch Persistence
+
+## Problem Statement
+
+The current `updated()` method in both `ElasticSearchPersistenceServiceImpl` and `OpenSearchPersistenceServiceImpl` only updates in-memory configuration values. It does **not** update the corresponding infrastructure components (index templates, rollover policies, lifecycle policies, etc.) that were created during initialization based on these configuration values.
+
+### Example: rollover.indices Change
+
+When `rollover.indices` changes (e.g., from `"event,session"` to `"event,session,profile"`), the system needs to:
+1. **Create Index Templates**: New rollover templates must be created for newly added item types (e.g., `profile`)
+2. **Update OpenSearch ISM Policy**: The ISM policy's `ism_template.index_patterns` must be updated to include patterns for new item types
+3. **Handle Removed Item Types**: Templates for removed item types may need cleanup (though existing indices will continue to work)
+
+However, the current `updated()` method only calls `setRolloverIndices()`, which updates the in-memory value but does not:
+- Create rollover templates for newly added item types
+- Update the OpenSearch ISM policy template patterns
+- Remove templates for item types no longer in the list (optional)
+
+## Configuration Properties Analysis
+
+### Infrastructure-Affecting Properties
+
+These properties affect infrastructure components that need to be updated when changed:
+
+#### 1. `indexPrefix`
+**Used in:**
+- Rollover alias: `indexPrefix + "-" + itemName`
+- Index names: `indexPrefix + "-" + itemType`
+- Rollover index patterns: `indexPrefix + "-" + itemType + "-*"`
+- Lifecycle policy name: `indexPrefix + "-" + ROLLOVER_LIFECYCLE_NAME` (ES) or `indexPrefix + "-rollover-lifecycle-policy"` (OS)
+- Index template names: `rolloverAlias + "-rollover-template"`
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Template names and index patterns depend on `indexPrefix`
+- ✅ **Rollover Lifecycle Policies**: Policy names depend on `indexPrefix`
+- ✅ **Existing Indices**: Index names depend on `indexPrefix` (but existing indices cannot be renamed)
+- ⚠️ **Note**: Changing `indexPrefix` effectively creates a new namespace. Existing indices won't be affected, but new operations will use the new prefix.
+
+**Update Required:**
+- Re-register rollover lifecycle policy (with new name)
+- Recreate index templates for rollover indices (with new names/patterns)
+- Update rollover alias references in template settings
+
+#### 2. `rolloverIndexNumberOfShards`
+**Used in:**
+- Index template settings for rollover indices
+- New rollover index creation
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Settings contain `number_of_shards`
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices created from template)
+
+**Update Required:**
+- Update index template settings for all rollover item types
+
+#### 3. `rolloverIndexNumberOfReplicas`
+**Used in:**
+- Index template settings for rollover indices
+- New rollover index creation
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Settings contain `number_of_replicas`
+- ⚠️ **Existing Indices**: Can be updated via index settings API (affects existing indices)
+
+**Update Required:**
+- Update index template settings for all rollover item types
+- Optionally update existing rollover indices (if desired)
+
+#### 4. `rolloverIndexMappingTotalFieldsLimit`
+**Used in:**
+- Index template settings for rollover indices
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Settings contain `mapping.total_fields.limit`
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices)
+
+**Update Required:**
+- Update index template settings for all rollover item types
+
+#### 5. `rolloverIndexMaxDocValueFieldsSearch`
+**Used in:**
+- Index template settings for rollover indices
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Settings contain `max_docvalue_fields_search`
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices)
+
+**Update Required:**
+- Update index template settings for all rollover item types
+
+#### 6. `rolloverMaxSize`
+**Used in:**
+- Rollover lifecycle policy rollover action
+
+**Infrastructure Impact:**
+- ✅ **Rollover Lifecycle Policy**: Policy contains rollover action with `maxSize`
+
+**Update Required:**
+- Re-register rollover lifecycle policy
+
+#### 7. `rolloverMaxAge`
+**Used in:**
+- Rollover lifecycle policy rollover action
+
+**Infrastructure Impact:**
+- ✅ **Rollover Lifecycle Policy**: Policy contains rollover action with `maxAge`
+
+**Update Required:**
+- Re-register rollover lifecycle policy
+
+#### 8. `rolloverMaxDocs`
+**Used in:**
+- Rollover lifecycle policy rollover action
+
+**Infrastructure Impact:**
+- ✅ **Rollover Lifecycle Policy**: Policy contains rollover action with `maxDocs`
+
+**Update Required:**
+- Re-register rollover lifecycle policy
+
+#### 9. `rolloverIndices` (Configuration: `rollover.indices`)
+**Used in:**
+- Determines which item types use rollover (checked via `isItemTypeRollingOver(itemType)`)
+- Controls whether `internalCreateRolloverTemplate()` is called during index creation
+- **OpenSearch only**: ISM policy's `ism_template.index_patterns` contains patterns for each item type in the list
+
+**Infrastructure Impact:**
+- ✅ **Index Templates**: Templates are only created for item types in `rolloverIndices` list
+  - When an item type is added: A rollover template must be created for that item type
+  - When an item type is removed: The template may remain but won't be used for new indices
+- ✅ **OpenSearch ISM Policy**: The `ism_template.index_patterns` array must match the current `rolloverIndices` list
+  - Each item type in the list should have a corresponding pattern: `indexPrefix + "-" + itemType + "-*"`
+- ⚠️ **Existing Indices**: Existing indices are not affected, but new indices will follow the new configuration
+
+**Update Required:**
+- **For newly added item types:**
+  - Create rollover index template (call `internalCreateRolloverTemplate(itemType)`)
+  - Ensure mapping exists for the item type
+- **For OpenSearch:**
+  - Re-register rollover lifecycle policy to update `ism_template.index_patterns`
+- **For removed item types (optional):**
+  - Optionally remove rollover templates (though keeping them doesn't cause issues)
+
+**Example Scenario:**
+- **Before**: `rollover.indices = "event,session"`
+- **After**: `rollover.indices = "event,session,profile"`
+- **Required Actions:**
+  1. Create rollover template for `profile` item type
+  2. Update OpenSearch ISM policy to include pattern for `profile` indices
+  3. When `profile` index is first created, it will use rollover instead of regular index creation
+
+#### 10. `numberOfShards` (non-rollover)
+**Used in:**
+- Non-rollover index creation
+
+**Infrastructure Impact:**
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices)
+
+**Update Required:**
+- None (only affects new indices created after change)
+
+#### 11. `numberOfReplicas` (non-rollover)
+**Used in:**
+- Non-rollover index creation
+
+**Infrastructure Impact:**
+- ✅ **Existing Indices**: Can be updated via index settings API
+
+**Update Required:**
+- Optionally update existing non-rollover indices (if desired)
+
+#### 12. `indexMappingTotalFieldsLimit` (non-rollover)
+**Used in:**
+- Non-rollover index creation
+
+**Infrastructure Impact:**
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices)
+
+**Update Required:**
+- None (only affects new indices created after change)
+
+#### 13. `indexMaxDocValueFieldsSearch` (non-rollover)
+**Used in:**
+- Non-rollover index creation
+
+**Infrastructure Impact:**
+- ⚠️ **Existing Indices**: Cannot be changed on existing indices (only affects new indices)
+
+**Update Required:**
+- None (only affects new indices created after change)
+
+### Non-Infrastructure Properties
+
+These properties only affect runtime behavior and don't require infrastructure updates:
+- `throwExceptions`
+- `alwaysOverwrite`
+- `useBatchingForSave`
+- `useBatchingForUpdate`
+- `aggQueryThrowOnMissingDocs`
+- `logLevelRestClient`
+- `clientSocketTimeout`
+- `taskWaitingTimeout`
+- `taskWaitingPollingInterval`
+- `aggQueryMaxResponseSizeHttp`
+- `aggregateQueryBucketSize`
+- `itemTypeToRefreshPolicy`
+
+## Current Initialization Flow
+
+### ElasticSearch
+1. `start()` method calls:
+   - `registerRolloverLifecyclePolicy()` - Creates ILM policy with name `indexPrefix + "-" + ROLLOVER_LIFECYCLE_NAME`
+   - `loadPredefinedMappings()` - For each mapping:
+     - If item type is in `rolloverIndices`: calls `internalCreateRolloverTemplate()` and `internalCreateRolloverIndex()`
+     - Otherwise: calls `internalCreateIndex()`
+
+### OpenSearch
+1. `start()` method calls:
+   - `registerRolloverLifecyclePolicy()` - Creates ISM policy with name `indexPrefix + "-rollover-lifecycle-policy"`
+   - `loadPredefinedMappings()` - For each mapping:
+     - If item type is in `rolloverIndices`: calls `internalCreateRolloverTemplate()` and `internalCreateRolloverIndex()`
+     - Otherwise: calls `internalCreateIndex()`
+
+## Required Updates for Configuration Changes
+
+### Minimal Change Solution Approach
+
+The solution should:
+1. **Track previous configuration values** to detect what changed
+2. **Identify affected infrastructure** based on changed properties
+3. **Update infrastructure components** only when necessary
+4. **Minimize disruption** by only updating what's needed
+
+### Update Strategy by Property
+
+#### For `indexPrefix`:
+- **Action**: Re-register lifecycle policy, recreate all rollover templates
+- **Reason**: Policy and template names depend on prefix
+- **Note**: Existing indices keep old prefix (cannot rename indices)
+
+#### For `rolloverIndexNumberOfShards`, `rolloverIndexNumberOfReplicas`, `rolloverIndexMappingTotalFieldsLimit`, `rolloverIndexMaxDocValueFieldsSearch`:
+- **Action**: Update index template settings for all rollover item types
+- **Method**: Use `PutIndexTemplateRequest` with updated settings
+- **Note**: Only affects new indices created from template
+
+#### For `rolloverMaxSize`, `rolloverMaxAge`, `rolloverMaxDocs`:
+- **Action**: Re-register rollover lifecycle policy
+- **Method**: Call `registerRolloverLifecyclePolicy()` again
+- **Note**: Policy is updated in-place (same name)
+
+#### For `rolloverIndices`:
+- **Action**: 
+  - **Detect changes**: Compare old and new lists to find added/removed item types
+  - **For newly added item types**:
+    - Verify mapping exists for the item type
+    - Create rollover index template (call `internalCreateRolloverTemplate(itemType)`)
+  - **For OpenSearch**: Re-register lifecycle policy to update `ism_template.index_patterns`
+  - **For removed item types** (optional):
+    - Optionally remove rollover templates (though keeping them doesn't cause issues)
+- **Method**: 
+  - Parse comma-separated list and compare with previous list
+  - For each new item type: `internalCreateRolloverTemplate(itemType)` (if mapping exists)
+  - For OpenSearch: `registerRolloverLifecyclePolicy()` (updates ISM template patterns)
+  - Optionally: `removeIndexTemplate()` for removed types
+- **Note**: This is one of the most complex updates because it requires:
+  - List comparison (added/removed items)
+  - Access to mappings to verify item types are valid
+  - Different handling for ElasticSearch vs OpenSearch (ISM policy update)
+
+#### For `numberOfReplicas` (non-rollover):
+- **Action**: Optionally update existing non-rollover indices
+- **Method**: Use index settings update API
+- **Note**: This is optional - only affects existing indices, not templates
+
+## Implementation Requirements
+
+### 1. Configuration Change Detection
+- Store previous configuration values (or use OSGi Configuration Admin to detect changes)
+- Compare old vs new values to determine what changed
+
+### 2. Infrastructure Update Methods
+- **Update index template**: The existing `internalCreateRolloverTemplate()` method can be reused - `putIndexTemplate`/`putTemplate` operations are idempotent and will update existing templates
+- **Re-register lifecycle policy**: Already exists (`registerRolloverLifecyclePolicy()`) - policy updates are also idempotent
+- **Update existing indices**: Method to update index settings (for `numberOfReplicas`) - requires separate index settings update API call
+
+### 3. Rollover Item Type Discovery
+- Need to know which item types use rollover (from `rolloverIndices`)
+- Need access to mappings for those item types
+
+### 4. Error Handling
+- Handle cases where templates/policies don't exist
+- Handle partial failures gracefully
+- Log warnings for properties that can't be updated on existing indices
+
+## Minimal Change Implementation Strategy
+
+### Option 1: Extend `updated()` Method (Recommended)
+1. Add property change detection
+2. For each changed infrastructure-affecting property:
+   - Determine affected components
+   - Call appropriate update methods
+3. Keep existing simple property updates for non-infrastructure properties
+
+**Pros:**
+- Minimal code changes
+- Reuses existing methods
+- Clear separation of concerns
+
+**Cons:**
+- `updated()` method becomes more complex
+- Need to track previous values
+
+### Option 2: Separate Update Handler
+1. Create `InfrastructureUpdateHandler` class
+2. `updated()` method delegates infrastructure updates to handler
+3. Handler manages change detection and updates
+
+**Pros:**
+- Better separation of concerns
+- Easier to test
+- More maintainable
+
+**Cons:**
+- More code changes
+- Additional class to maintain
+
+### Recommended Approach: Option 1 with Helper Methods
+
+1. **Add configuration tracking**: Store previous values in instance variables
+2. **Create helper methods**:
+   - `updateRolloverTemplatesForAllItemTypes()` - Updates all rollover templates
+   - `updateRolloverTemplate(String itemType)` - Updates single template
+   - `updateExistingRolloverIndices(String itemType, String setting, Object value)` - Updates existing indices (optional)
+3. **Extend `updated()` method**:
+   - Detect changes by comparing old vs new values
+   - For each changed property, call appropriate update methods
+   - Update stored previous values after successful updates
+
+## Code Structure Changes Required
+
+### ElasticSearchPersistenceServiceImpl
+```java
+// Add fields to track previous values
+private String previousIndexPrefix;
+private String previousRolloverIndexNumberOfShards;
+private List<String> previousRolloverIndices;
+// ... etc for all infrastructure-affecting properties
+
+@Override
+public void updated(Dictionary<String, ?> properties) {
+    // Existing simple property mappings
+    Map<String, ConfigurationUpdateHelper.PropertyMapping> propertyMappings = new HashMap<>();
+    // ... existing mappings ...
+    
+    // Detect infrastructure-affecting changes
+    String newIndexPrefix = (String) properties.get("indexPrefix");
+    if (newIndexPrefix != null && !newIndexPrefix.equals(previousIndexPrefix)) {
+        updateInfrastructureForIndexPrefixChange(newIndexPrefix);
+        previousIndexPrefix = newIndexPrefix;
+    }
+    
+    // Handle rolloverIndices change (most complex)
+    String newRolloverIndicesStr = (String) properties.get("rolloverIndices");
+    if (newRolloverIndicesStr != null) {
+        List<String> newRolloverIndices = StringUtils.isNotEmpty(newRolloverIndicesStr) 
+            ? Arrays.asList(newRolloverIndicesStr.split(",")) 
+            : null;
+        if (!Objects.equals(newRolloverIndices, previousRolloverIndices)) {
+            updateInfrastructureForRolloverIndicesChange(newRolloverIndices);
+            previousRolloverIndices = newRolloverIndices;
+        }
+    }
+    
+    // Similar for other infrastructure properties...
+    
+    // Process simple property updates
+    ConfigurationUpdateHelper.processConfigurationUpdates(properties, LOGGER, "ElasticSearch persistence", propertyMappings);
+}
+
+private void updateInfrastructureForIndexPrefixChange(String newIndexPrefix) {
+    // Re-register lifecycle policy
+    registerRolloverLifecyclePolicy();
+    
+    // Recreate all rollover templates
+    if (rolloverIndices != null) {
+        for (String itemType : rolloverIndices) {
+            if (mappings.containsKey(itemType)) {
+                internalCreateRolloverTemplate(itemType);
+            }
+        }
+    }
+}
+
+private void updateRolloverTemplatesForSettingsChange() {
+    if (rolloverIndices != null) {
+        for (String itemType : rolloverIndices) {
+            if (mappings.containsKey(itemType)) {
+                updateRolloverTemplate(itemType);
+            }
+        }
+    }
+}
+
+private void updateInfrastructureForRolloverIndicesChange(List<String> newRolloverIndices) {
+    // Find added and removed item types
+    Set<String> previousSet = previousRolloverIndices != null 
+        ? new HashSet<>(previousRolloverIndices) 
+        : Collections.emptySet();
+    Set<String> newSet = newRolloverIndices != null 
+        ? new HashSet<>(newRolloverIndices) 
+        : Collections.emptySet();
+    
+    // Find newly added item types
+    Set<String> added = new HashSet<>(newSet);
+    added.removeAll(previousSet);
+    
+    // Find removed item types
+    Set<String> removed = new HashSet<>(previousSet);
+    removed.removeAll(newSet);
+    
+    // Create templates for newly added item types
+    for (String itemType : added) {
+        if (mappings.containsKey(itemType)) {
+            LOGGER.info("Creating rollover template for newly added item type: {}", itemType);
+            internalCreateRolloverTemplate(itemType);
+        } else {
+            LOGGER.warn("Cannot create rollover template for item type {}: mapping not found", itemType);
+        }
+    }
+    
+    // Optionally remove templates for removed item types
+    // (Keeping them doesn't cause issues, so this is optional)
+    for (String itemType : removed) {
+        String templateName = buildRolloverAlias(itemType) + "-rollover-template";
+        LOGGER.info("Removing rollover template for item type no longer in rollover list: {}", itemType);
+        // Note: This would require a removeIndexTemplate method or similar
+    }
+    
+    // For OpenSearch, also need to update ISM policy template patterns
+    // This is handled in OpenSearchPersistenceServiceImpl
+}
+```
+
+### OpenSearchPersistenceServiceImpl
+Similar structure, but with OpenSearch-specific API calls.
+
+## Testing Considerations
+
+1. **Unit Tests**: Test change detection logic
+2. **Integration Tests**: Test infrastructure updates with real ES/OS clusters
+3. **Edge Cases**:
+   - Template doesn't exist
+   - Policy doesn't exist
+   - Multiple properties change simultaneously
+   - Rollover indices list changes
+
+## Migration Notes
+
+- Existing deployments: First update will detect all properties as "changed" (no previous values)
+- Consider adding a flag to skip infrastructure updates on first update (only update in-memory values)
+- Or, always perform infrastructure updates (idempotent operations should be safe)
+
+## Summary
+
+The current `updated()` method is incomplete for infrastructure-affecting configuration properties. A minimal-change solution would:
+
+1. Track previous configuration values
+2. Detect changes in infrastructure-affecting properties
+3. Update corresponding infrastructure components:
+   - Index templates (for rollover settings)
+   - Lifecycle policies (for rollover parameters)
+   - Existing indices (optionally, for `numberOfReplicas`)
+4. Maintain backward compatibility with existing simple property updates
+
+The most critical properties requiring infrastructure updates are:
+- `rolloverIndices` (affects which templates exist, requires list comparison and template creation/removal)
+- `indexPrefix` (affects policy names, template names, aliases)
+- Rollover settings (`rolloverIndexNumberOfShards`, `rolloverIndexNumberOfReplicas`, etc.)
+- Rollover policy parameters (`rolloverMaxSize`, `rolloverMaxAge`, `rolloverMaxDocs`)
+
+**Note**: The `rolloverIndices` property is particularly important because:
+- It requires comparing old and new lists to detect added/removed item types
+- Newly added item types need rollover templates created immediately
+- OpenSearch requires ISM policy template patterns to be updated
+- This is a common configuration change scenario (e.g., adding `profile` to rollover list)
+
diff --git a/INMEMORY_PERSISTENCE_REQUIREMENTS.md b/INMEMORY_PERSISTENCE_REQUIREMENTS.md
new file mode 100644
index 000000000..2f0e87c62
--- /dev/null
+++ b/INMEMORY_PERSISTENCE_REQUIREMENTS.md
@@ -0,0 +1,1024 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+# Requirements: Making InMemoryPersistenceServiceImpl a Production-Ready Persistence Manager
+
+## Overview
+
+This document outlines what it would take to make `InMemoryPersistenceServiceImpl` (currently in `services/src/test/java/`) a full-blown persistence manager available as an alternative to Elasticsearch and OpenSearch persistence managers, while maintaining the ability for unit tests to instantiate it directly.
+
+## Current State
+
+- **Location**: `services/src/test/java/org/apache/unomi/services/impl/InMemoryPersistenceServiceImpl.java`
+- **Status**: Test-only implementation
+- **Implements**: `PersistenceService` interface
+- **Key Features**: Already implements most PersistenceService methods, includes refresh delay simulation, tenant transformations, file storage
+
+## Required Changes
+
+### 1. Project Structure & Module Organization
+
+#### 1.1 Create New Module Structure
+```
+persistence-inmemory/
+├── pom.xml (parent)
+├── core/
+│   ├── pom.xml
+│   ├── src/
+│   │   ├── main/
+│   │   │   ├── java/
+│   │   │   │   └── org/apache/unomi/persistence/inmemory/
+│   │   │   │       └── InMemoryPersistenceServiceImpl.java
+│   │   │   └── resources/
+│   │   │       └── org.apache.unomi.persistence.inmemory.cfg
+│   │   └── test/
+│   │       └── java/ (test utilities if needed)
+└── target/
+```
+
+#### 1.2 Move Implementation Class
+- Move `InMemoryPersistenceServiceImpl.java` from `services/src/test/java/` to `persistence-inmemory/core/src/main/java/org/apache/unomi/persistence/inmemory/`
+- Update package name from `org.apache.unomi.services.impl` to `org.apache.unomi.persistence.inmemory`
+
+#### 1.3 Keep Test Access
+- **Option A (Recommended)**: Keep a test helper class in `services/src/test/java` that can instantiate the moved class directly
+- **Option B**: Make the constructor public and accessible from tests
+- **Option C**: Create a test-specific factory class
+
+### 2. OSGi Service Registration with Declarative Services (DS) Annotations
+
+#### 2.1 Implement OSGi DS Annotations
+Use OSGi Declarative Services annotations instead of Blueprint XML for type-safe, modern OSGi integration.
+
+**Required annotations:**
+- `@Component` - Declares the component and its service interfaces
+- `@Reference` - Declares service dependencies
+- `@ReferenceCardinality` - For optional/multiple references
+- `@Activate` - Component activation lifecycle
+- `@Deactivate` - Component deactivation lifecycle
+- `@Modified` - Configuration update handling
+- `@Designate` - Links to configuration metadata
+- `@ObjectClassDefinition` - Defines configuration properties
+
+**Implementation:**
+```java
+package org.apache.unomi.persistence.inmemory;
+
+import org.apache.unomi.api.services.ExecutionContextManager;
+import org.apache.unomi.api.tenants.TenantTransformationListener;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluatorDispatcher;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.osgi.service.component.annotations.*;
+import org.osgi.service.metatype.annotations.*;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@Component(
+    service = {PersistenceService.class, SynchronousBundleListener.class},
+    configurationPid = "org.apache.unomi.persistence.inmemory",
+    immediate = true
+)
+@Designate(ocd = InMemoryPersistenceServiceImpl.Config.class)
+public class InMemoryPersistenceServiceImpl 
+    implements PersistenceService, SynchronousBundleListener {
+    
+    @ObjectClassDefinition(
+        name = "Apache Unomi In-Memory Persistence Configuration",
+        description = "Configuration for the in-memory persistence service"
+    )
+    public @interface Config {
+        @AttributeDefinition(
+            name = "Storage Directory",
+            description = "Directory where persisted items are stored (if file storage is enabled)"
+        )
+        String storage_dir() default "data/persistence";
+        
+        @AttributeDefinition(
+            name = "File Storage Enabled",
+            description = "Whether to persist items to disk"
+        )
+        boolean fileStorage_enabled() default true;
+        
+        @AttributeDefinition(
+            name = "Clear Storage on Init",
+            description = "Whether to clear storage directory on initialization"
+        )
+        boolean clearStorage_onInit() default false;
+        
+        @AttributeDefinition(
+            name = "Pretty Print JSON",
+            description = "Whether to pretty print JSON in stored files"
+        )
+        boolean prettyPrintJson() default true;
+        
+        @AttributeDefinition(
+            name = "Simulate Refresh Delay",
+            description = "Whether to simulate Elasticsearch refresh delay behavior"
+        )
+        boolean simulateRefreshDelay() default true;
+        
+        @AttributeDefinition(
+            name = "Refresh Interval (ms)",
+            description = "Refresh interval in milliseconds when simulating refresh delay"
+        )
+        int refreshIntervalMs() default 1000;
+        
+        @AttributeDefinition(
+            name = "Default Query Limit",
+            description = "Default limit for queries"
+        )
+        int defaultQueryLimit() default 10;
+        
+        @AttributeDefinition(
+            name = "Item Type to Refresh Policy",
+            description = "Map of item types to refresh policies (JSON format)"
+        )
+        String itemTypeToRefreshPolicy() default "";
+    }
+    
+    private ConditionEvaluatorDispatcher conditionEvaluatorDispatcher;
+    private volatile ExecutionContextManager executionContextManager;
+    private BundleContext bundleContext;
+    
+    // Configuration properties
+    private String storageDir;
+    private boolean fileStorageEnabled;
+    private boolean clearStorageOnInit;
+    private boolean prettyPrintJson;
+    private boolean simulateRefreshDelay;
+    private int refreshIntervalMs;
+    private int defaultQueryLimit;
+    private String itemTypeToRefreshPolicy;
+    
+    // Reference to ConditionEvaluatorDispatcher (required)
+    @Reference
+    public void setConditionEvaluatorDispatcher(ConditionEvaluatorDispatcher dispatcher) {
+        this.conditionEvaluatorDispatcher = dispatcher;
+    }
+    
+    public void unsetConditionEvaluatorDispatcher(ConditionEvaluatorDispatcher dispatcher) {
+        this.conditionEvaluatorDispatcher = null;
+    }
+    
+    // Reference to ExecutionContextManager (optional)
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL)
+    public void setExecutionContextManager(ExecutionContextManager manager) {
+        this.executionContextManager = manager;
+    }
+    
+    public void unsetExecutionContextManager(ExecutionContextManager manager) {
+        this.executionContextManager = null;
+    }
+    
+    // Reference list for TenantTransformationListeners (optional, multiple)
+    private final List<TenantTransformationListener> transformationListeners = 
+        new CopyOnWriteArrayList<>();
+    
+    @Reference(
+        cardinality = ReferenceCardinality.MULTIPLE,
+        policy = ReferencePolicy.DYNAMIC
+    )
+    public void bindTransformationListener(TenantTransformationListener listener) {
+        transformationListeners.add(listener);
+        addTransformationListener(listener);
+    }
+    
+    public void unbindTransformationListener(TenantTransformationListener listener) {
+        transformationListeners.remove(listener);
+        removeTransformationListener(listener);
+    }
+    
+    // Component activation
+    @Activate
+    public void activate(BundleContext bundleContext, Config config) {
+        this.bundleContext = bundleContext;
+        modified(config);
+        start();
+    }
+    
+    // Configuration update
+    @Modified
+    public void modified(Config config) {
+        this.storageDir = config.storage_dir();
+        this.fileStorageEnabled = config.fileStorage_enabled();
+        this.clearStorageOnInit = config.clearStorage_onInit();
+        this.prettyPrintJson = config.prettyPrintJson();
+        this.simulateRefreshDelay = config.simulateRefreshDelay();
+        this.refreshIntervalMs = config.refreshIntervalMs();
+        this.defaultQueryLimit = config.defaultQueryLimit();
+        this.itemTypeToRefreshPolicy = config.itemTypeToRefreshPolicy();
+        
+        // Reinitialize if needed
+        if (isActive()) {
+            // Handle configuration changes at runtime
+        }
+    }
+    
+    // Component deactivation
+    @Deactivate
+    public void deactivate() {
+        stop();
+        this.bundleContext = null;
+    }
+    
+    // Bundle lifecycle (SynchronousBundleListener)
+    @Override
+    public void bundleChanged(BundleEvent event) {
+        // Handle bundle lifecycle events if needed
+    }
+    
+    // Existing implementation methods...
+    // (keep all existing PersistenceService implementation methods)
+    
+    private void start() {
+        // Initialize service
+        if (simulateRefreshDelay) {
+            startRefreshThread();
+        }
+        if (fileStorageEnabled) {
+            loadPersistedItems();
+        }
+    }
+    
+    private void stop() {
+        shutdown();
+    }
+    
+    private boolean isActive() {
+        return bundleContext != null;
+    }
+}
+```
+
+#### 2.2 Maven Bundle Plugin Configuration
+The Maven Bundle Plugin must be configured to process DS annotations:
+
+**persistence-inmemory/core/pom.xml:**
+```xml
+<plugin>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>maven-bundle-plugin</artifactId>
+    <configuration>
+        <instructions>
+            <Export-Package>
+                org.apache.unomi.persistence.inmemory
+            </Export-Package>
+            <_dsannotations>*</_dsannotations>
+            <_dsannotations-options>inherit</_dsannotations-options>
+            <_metatypeannotations>*</_metatypeannotations>
+            <_metatypeannotations-options>version;nested</_metatypeannotations-options>
+        </instructions>
+    </configuration>
+</plugin>
+```
+
+### 3. Configuration Management
+
+#### 3.1 Configuration File (Optional)
+Create `persistence-inmemory/core/src/main/resources/org.apache.unomi.persistence.inmemory.cfg` for default configuration:
+```
+storage.dir=data/persistence
+fileStorage.enabled=true
+clearStorage.onInit=false
+prettyPrintJson=true
+simulateRefreshDelay=true
+refreshIntervalMs=1000
+defaultQueryLimit=10
+itemTypeToRefreshPolicy=
+```
+
+**Note**: With DS annotations, configuration is primarily managed through the `@ObjectClassDefinition` interface. The `.cfg` file provides default values that can be overridden via Configuration Admin or environment variables.
+
+#### 3.2 Configuration Update Support
+The `@Modified` annotation method handles runtime configuration changes automatically:
+
+```java
+@Modified
+public void modified(Config config) {
+    // Configuration is automatically injected as Config object
+    this.storageDir = config.storage_dir();
+    this.fileStorageEnabled = config.fileStorage_enabled();
+    // ... update all properties
+    
+    // Handle runtime configuration changes
+    if (isActive()) {
+        // Reinitialize components that depend on configuration
+        if (simulateRefreshDelay && refreshThread == null) {
+            startRefreshThread();
+        } else if (!simulateRefreshDelay && refreshThread != null) {
+            stopRefreshThread();
+        }
+    }
+}
+```
+
+**Benefits of DS annotations for configuration:**
+- Type-safe configuration (no Dictionary casting)
+- Compile-time validation
+- IDE autocomplete support
+- Automatic property name mapping (underscores to dots)
+- Real-time updates via `@Modified` without restart
+
+### 4. OSGi Service Dependencies
+
+#### 4.1 ExecutionContextManager Integration
+With DS annotations, service binding is handled automatically via `@Reference`:
+
+```java
+@Reference(cardinality = ReferenceCardinality.OPTIONAL)
+public void setExecutionContextManager(ExecutionContextManager manager) {
+    this.executionContextManager = manager;
+}
+
+public void unsetExecutionContextManager(ExecutionContextManager manager) {
+    this.executionContextManager = null;
+}
+```
+
+**Benefits:**
+- Automatic service tracking (no manual ServiceTracker needed)
+- Thread-safe binding/unbinding
+- Optional cardinality allows service to start even if ExecutionContextManager is unavailable
+
+#### 4.2 Tenant Transformation Listeners
+Multiple listeners are handled via `@Reference` with `MULTIPLE` cardinality:
+
+```java
+@Reference(
+    cardinality = ReferenceCardinality.MULTIPLE,
+    policy = ReferencePolicy.DYNAMIC
+)
+public void bindTransformationListener(TenantTransformationListener listener) {
+    transformationListeners.add(listener);
+    addTransformationListener(listener);
+}
+
+public void unbindTransformationListener(TenantTransformationListener listener) {
+    transformationListeners.remove(listener);
+    removeTransformationListener(listener);
+}
+```
+
+**Benefits:**
+- Automatic tracking of multiple services
+- Dynamic policy allows services to be added/removed at runtime
+- No manual ServiceTracker or ServiceListener needed
+
+### 5. Lifecycle Management
+
+#### 5.1 Component Lifecycle with DS Annotations
+With DS annotations, lifecycle is managed through `@Activate`, `@Modified`, and `@Deactivate`:
+
+```java
+@Activate
+public void activate(BundleContext bundleContext, Config config) {
+    this.bundleContext = bundleContext;
+    modified(config);  // Apply configuration
+    start();  // Initialize service
+}
+
+@Modified
+public void modified(Config config) {
+    // Update configuration properties
+    // Handle runtime configuration changes
+}
+
+@Deactivate
+public void deactivate() {
+    stop();  // Cleanup and shutdown
+    this.bundleContext = null;
+}
+
+private void start() {
+    // Initialize service
+    if (simulateRefreshDelay) {
+        startRefreshThread();
+    }
+    if (fileStorageEnabled) {
+        loadPersistedItems();
+    }
+}
+
+private void stop() {
+    // Shutdown refresh thread
+    shutdown();
+    // Optionally persist state
+}
+```
+
+**Lifecycle sequence:**
+1. `@Activate` called when component becomes satisfied (all required references available)
+2. `@Modified` called when configuration changes (runtime updates)
+3. `@Deactivate` called when component becomes unsatisfied or bundle stops
+
+#### 5.2 Bundle Listener Implementation
+The component implements `SynchronousBundleListener` as a service interface:
+
+```java
+@Override
+public void bundleChanged(BundleEvent event) {
+    // Handle bundle lifecycle events if needed
+    // Typically used for cleanup or re-initialization
+    // Note: This is registered as a service, not via manual registration
+}
+```
+
+**Note**: With DS annotations, the component is automatically registered as a `SynchronousBundleListener` service (as declared in `@Component`), so no manual bundle context registration is needed.
+
+### 6. Maven Configuration
+
+#### 6.1 Parent POM
+Create `persistence-inmemory/pom.xml`:
+```xml
+<project>
+    <parent>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-root</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>unomi-persistence-inmemory</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>core</module>
+    </modules>
+</project>
+```
+
+#### 6.2 Core Module POM
+Create `persistence-inmemory/core/pom.xml` with DS annotation dependencies:
+
+```xml
+<project>
+    <parent>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-persistence-inmemory</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>unomi-persistence-inmemory-core</artifactId>
+    <packaging>bundle</packaging>
+    
+    <dependencies>
+        <!-- Unomi dependencies -->
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- OSGi Declarative Services -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.apache.unomi.persistence.inmemory
+                        </Export-Package>
+                        <Import-Package>
+                            org.apache.unomi.*;resolution:=optional,
+                            org.osgi.*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <_dsannotations>*</_dsannotations>
+                        <_dsannotations-options>inherit</_dsannotations-options>
+                        <_metatypeannotations>*</_metatypeannotations>
+                        <_metatypeannotations-options>version;nested</_metatypeannotations-options>
+                        <Provide-Capability>
+                            unomi.persistence;type=inmemory
+                        </Provide-Capability>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+```
+
+**Key dependencies:**
+- `org.osgi.service.component.annotations` - DS annotations (@Component, @Reference, @Activate, etc.)
+- `org.osgi.service.metatype.annotations` - Metatype annotations (@ObjectClassDefinition, @AttributeDefinition, etc.)
+- `org.osgi.service.component` - DS runtime API (provided by OSGi runtime)
+
+**Maven Bundle Plugin configuration:**
+- `_dsannotations=*` - Process all DS annotations
+- `_metatypeannotations=*` - Process all metatype annotations
+- These generate the component XML descriptor automatically
+
+### 7. Constructor Refactoring
+
+#### 7.1 Support Both Direct Instantiation and OSGi
+The class needs to support:
+- **Direct instantiation** (for tests): Keep existing constructors
+- **OSGi DS injection** (for production): Configuration via `@Activate`/`@Modified`, services via `@Reference`
+
+**Solution**: Keep constructors for tests, use DS annotations for OSGi:
+
+```java
+// Keep existing constructors for test instantiation
+public InMemoryPersistenceServiceImpl(
+    ExecutionContextManager executionContextManager, 
+    ConditionEvaluatorDispatcher conditionEvaluatorDispatcher) {
+    this.executionContextManager = executionContextManager;
+    this.conditionEvaluatorDispatcher = conditionEvaluatorDispatcher;
+    // Initialize with defaults for testing
+    this.storageDir = "data/persistence";
+    this.fileStorageEnabled = true;
+    // ... etc
+}
+
+// For OSGi, configuration is injected via @Activate/@Modified methods
+// Service dependencies are injected via @Reference methods
+// No need for setter methods for configuration properties
+```
+
+**Key points:**
+- **Configuration properties**: Handled via `@Activate`/`@Modified` methods with `Config` parameter (no setters needed)
+- **Service dependencies**: Handled via `@Reference` methods (setter/unsetter pattern)
+- **Test constructors**: Keep existing constructors for direct instantiation in tests
+- **No Blueprint-style setters**: DS annotations eliminate the need for property setters
+
+### 8. Missing PersistenceService Methods
+
+Review and implement any missing methods from `PersistenceService` interface:
+- `calculateStorageSize(String tenantId)` - Currently throws `UnsupportedOperationException`
+- `getApiCallCount(String tenantId)` - Currently throws `UnsupportedOperationException`
+- `migrateTenantData(...)` - Currently throws `UnsupportedOperationException`
+
+**Decision needed**: Implement these methods or document why they're not applicable for in-memory storage.
+
+### 9. Testing Considerations & Test Dependencies
+
+#### 9.1 Test Dependencies Analysis
+
+The test file `InMemoryPersistenceServiceImplTest.java` has several dependencies that need to be handled when moving the implementation to a new module:
+
+**Direct Dependencies:**
+1. **TestHelper** (`org.apache.unomi.services.TestHelper`)
+   - Location: `services/src/test/java/org/apache/unomi/services/TestHelper.java`
+   - Used by: Many test files across the services module
+   - **Critical Issue**: Has hard dependency on `InMemoryPersistenceServiceImpl` (import, constant references, type checking)
+
+2. **TestConditionEvaluators** (`org.apache.unomi.services.impl.TestConditionEvaluators`)
+   - Location: `services/src/test/java/org/apache/unomi/services/impl/TestConditionEvaluators.java`
+   - Used by: Multiple test files (EventServiceImplTest, RulesServiceImplTest, etc.)
+
+3. **Test Item Classes**:
+   - `SimpleItem` - `services/src/test/java/org/apache/unomi/services/impl/SimpleItem.java`
+   - `NestedItem` - `services/src/test/java/org/apache/unomi/services/impl/NestedItem.java`
+   - `TestMetadataItem` - Inner class in test file itself
+
+4. **Test Infrastructure**:
+   - `TestRequestTracer`, `TestTenantService`, `TestActionExecutorDispatcher`
+   - `ExecutionContextManagerImpl` from `services-common` module
+
+#### 9.2 Circular Dependency Problem
+
+**Critical Issue**: `TestHelper` has hard references to `InMemoryPersistenceServiceImpl`:
+- Direct import: `import org.apache.unomi.services.impl.InMemoryPersistenceServiceImpl;`
+- Constant reference: `InMemoryPersistenceServiceImpl.DEFAULT_STORAGE_DIR`
+- Type checking: `instanceof InMemoryPersistenceServiceImpl`
+
+If we move `InMemoryPersistenceServiceImpl` to `persistence-inmemory`, this creates a circular dependency:
+- `services` tests → `persistence-inmemory` (for TestHelper)
+- `persistence-inmemory` tests → `services` (for TestHelper)
+
+**Solution**: Create a shared test utilities module that both can depend on, with refactored `TestHelper` that removes hard dependencies.
+
+#### 9.3 Recommended Solution: Create Test Utilities Module
+
+Create a new `test-utilities` module that both `services` and `persistence-inmemory` can depend on.
+
+**Structure:**
+```
+test-utilities/
+├── pom.xml
+├── src/
+│   ├── main/
+│   │   └── java/
+│   │       └── org/apache/unomi/test/
+│   │           ├── TestHelper.java (refactored)
+│   │           ├── TestConstants.java
+│   │           ├── TestConditionEvaluators.java
+│   │           ├── TestRequestTracer.java
+│   │           ├── TestTenantService.java
+│   │           ├── TestActionExecutorDispatcher.java
+│   │           └── items/
+│   │               ├── SimpleItem.java
+│   │               ├── NestedItem.java
+│   │               └── TestMetadataItem.java
+│   └── test/
+│       └── java/ (if needed)
+```
+
+**Key Refactoring Changes:**
+
+1. **Extract Constants**:
+   Create `org.apache.unomi.test.TestConstants.java`:
+   ```java
+   public class TestConstants {
+       public static final String DEFAULT_STORAGE_DIR = "data/persistence";
+   }
+   ```
+
+2. **Refactor TestHelper**:
+   - Remove `import org.apache.unomi.services.impl.InMemoryPersistenceServiceImpl;`
+   - Replace `InMemoryPersistenceServiceImpl.DEFAULT_STORAGE_DIR` with `TestConstants.DEFAULT_STORAGE_DIR`
+   - Change type checks from `instanceof InMemoryPersistenceServiceImpl` to interface-based checks:
+     ```java
+     // Before:
+     if (persistenceService instanceof InMemoryPersistenceServiceImpl) {
+         ((InMemoryPersistenceServiceImpl) persistenceService).purge((Date)null);
+     }
+     
+     // After:
+     if (persistenceService != null) {
+         persistenceService.purge((Date)null);
+     }
+     ```
+
+3. **Move Test Item Classes**:
+   - Move `SimpleItem`, `NestedItem` to `test-utilities`
+   - Extract `TestMetadataItem` from inner class to separate file
+   - Update package to `org.apache.unomi.test.items`
+
+4. **Update Package Names**:
+   - `org.apache.unomi.services.TestHelper` → `org.apache.unomi.test.TestHelper`
+   - `org.apache.unomi.services.impl.TestConditionEvaluators` → `org.apache.unomi.test.TestConditionEvaluators`
+   - Update all imports in test files
+
+#### 9.4 Maven Configuration for Test Utilities
+
+**test-utilities/pom.xml:**
+```xml
+<project>
+    <parent>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-root</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>unomi-test-utilities</artifactId>
+    <packaging>jar</packaging>
+    
+    <dependencies>
+        <!-- Core dependencies -->
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-services-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-tracing-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Utilities -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
+```
+
+**Update Root POM:**
+Add to root `pom.xml`:
+```xml
+<modules>
+    ...
+    <module>test-utilities</module>
+    <module>persistence-inmemory</module>
+    ...
+</modules>
+```
+
+**Update Services Module (test scope):**
+```xml
+<dependency>
+    <groupId>org.apache.unomi</groupId>
+    <artifactId>unomi-test-utilities</artifactId>
+    <version>${project.version}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+**Update Persistence-InMemory Module (test scope):**
+```xml
+<dependency>
+    <groupId>org.apache.unomi</groupId>
+    <artifactId>unomi-test-utilities</artifactId>
+    <version>${project.version}</version>
+    <scope>test</scope>
+</dependency>
+<dependency>
+    <groupId>org.apache.unomi</groupId>
+    <artifactId>unomi-services-common</artifactId>
+    <scope>test</scope>
+</dependency>
+```
+
+#### 9.5 Test File Migration
+
+**Move Test File:**
+- Move `InMemoryPersistenceServiceImplTest.java` from `services/src/test/java/` to `persistence-inmemory/core/src/test/java/org/apache/unomi/persistence/inmemory/`
+- Update package to `org.apache.unomi.persistence.inmemory`
+- Update imports to use `org.apache.unomi.test.*` instead of `org.apache.unomi.services.*`
+
+**Update All Test Files:**
+Update all test files that use TestHelper:
+- `EventServiceImplTest`
+- `RulesServiceImplTest`
+- `SegmentServiceImplTest`
+- `GoalsServiceImplTest`
+- `ClusterServiceImplTest`
+- `ConditionValidationServiceImplTest`
+- `SchedulerServiceImplTest`
+- And any others
+
+#### 9.6 Dependency Graph (No Circular Dependencies)
+
+```
+services (main)
+  └─> test-utilities (test) [uses interfaces only]
+  
+persistence-inmemory (main)
+  └─> test-utilities (test) [uses interfaces only]
+  └─> services-common (test) [for ExecutionContextManagerImpl]
+  
+test-utilities (main)
+  └─> api (provided)
+  └─> persistence-spi (provided)
+  └─> services-common (provided)
+  └─> tracing-api (provided)
+```
+
+**No circular dependencies!** Test-utilities only uses interfaces, not implementations.
+
+#### 9.7 Alternative: Minimal Refactoring Approach
+
+If creating a new module is too much work initially:
+
+1. **Keep test utilities in services** (temporarily)
+2. **Use test-jar** to make them available to persistence-inmemory
+3. **Refactor TestHelper** to remove hard dependency on InMemoryPersistenceServiceImpl
+4. **Move test file** to persistence-inmemory but keep utilities in services
+
+**Pros:**
+- Less initial work
+- Can migrate to test-utilities module later
+
+**Cons:**
+- Creates dependency: persistence-inmemory → services (test scope)
+- Test utilities conceptually in wrong place
+- Harder to reuse in other modules
+
+### 10. Feature Integration
+
+#### 10.1 Karaf Feature
+Add to `kar/src/main/feature/feature.xml`:
+```xml
+<feature name="unomi-persistence-inmemory" version="${project.version}">
+    <feature>unomi-persistence-spi</feature>
+    <bundle>mvn:org.apache.unomi/unomi-persistence-inmemory-core/${project.version}</bundle>
+</feature>
+```
+
+#### 10.2 Documentation
+- Update README with in-memory persistence option
+- Document configuration properties
+- Document use cases (development, testing, small deployments)
+
+### 11. Code Quality & Production Readiness
+
+#### 11.1 Error Handling
+- Add proper exception handling for file operations
+- Add validation for configuration values
+- Add logging for important operations
+
+#### 11.2 Thread Safety
+- Verify all concurrent operations are thread-safe
+- Review `ConcurrentHashMap` usage
+- Ensure refresh thread synchronization is correct
+
+#### 11.3 Resource Management
+- Ensure proper cleanup in `stop()` method
+- Handle file locks properly
+- Clean up temporary resources
+
+### 12. Optional Enhancements
+
+#### 12.1 Metrics Integration
+Consider integrating with `MetricsService` (like ES/OS implementations):
+```java
+private MetricsService metricsService;
+
+public void setMetricsService(MetricsService metricsService) {
+    this.metricsService = metricsService;
+}
+```
+
+#### 12.2 Health Check Integration
+Implement health check support for monitoring.
+
+## Implementation Checklist
+
+### Test Utilities Module
+- [ ] Create `test-utilities` module structure
+- [ ] Create `pom.xml` with dependencies
+- [ ] Extract `TestConstants` class
+- [ ] Refactor `TestHelper` to remove `InMemoryPersistenceServiceImpl` dependency
+- [ ] Move `TestConditionEvaluators` to test-utilities
+- [ ] Move `TestRequestTracer` to test-utilities
+- [ ] Move `TestTenantService` to test-utilities
+- [ ] Move `TestActionExecutorDispatcher` to test-utilities
+- [ ] Move `SimpleItem` to test-utilities
+- [ ] Move `NestedItem` to test-utilities
+- [ ] Extract `TestMetadataItem` from inner class
+- [ ] Update package names
+- [ ] Add to root POM
+
+### Services Module Updates
+- [ ] Add `unomi-test-utilities` dependency (test scope)
+- [ ] Update all test file imports
+- [ ] Update `TestHelper` usage in tests
+- [ ] Remove old test utility files
+- [ ] Verify all tests still pass
+
+### Persistence-InMemory Module
+- [ ] Create `persistence-inmemory` module structure
+- [ ] Move implementation class to new location
+- [ ] Update package name
+- [ ] Add OSGi DS annotation dependencies to POM
+- [ ] Add `@Component` annotation with service interfaces
+- [ ] Add `@ObjectClassDefinition` interface for configuration
+- [ ] Add `@Designate` annotation linking to config
+- [ ] Add `@Reference` annotations for service dependencies
+- [ ] Add `@Activate` method for component initialization
+- [ ] Add `@Modified` method for configuration updates
+- [ ] Add `@Deactivate` method for component cleanup
+- [ ] Implement `SynchronousBundleListener` interface
+- [ ] Create configuration file (`.cfg`) - optional defaults
+- [ ] Configure Maven Bundle Plugin for DS annotations
+- [ ] Create Maven POMs (parent + core) with DS dependencies
+- [ ] Update root POM to include new module
+- [ ] Add `unomi-test-utilities` dependency (test scope)
+- [ ] Add `unomi-services-common` dependency (test scope)
+- [ ] Move test file to new location
+- [ ] Update package and imports in test file
+- [ ] Add to Karaf feature
+- [ ] Implement missing PersistenceService methods (or document why not)
+- [ ] Add comprehensive error handling
+- [ ] Review thread safety
+- [ ] Add documentation
+- [ ] Test OSGi deployment
+- [ ] Test direct instantiation (for unit tests)
+- [ ] Verify all tests pass
+
+## Key Design Decisions
+
+1. **Dual Mode Support**: The class must support both direct instantiation (tests) and OSGi DS injection (production). This is achieved by keeping constructors for tests and using DS annotations (`@Activate`, `@Modified`, `@Reference`) for OSGi.
+
+2. **Package Location**: Move from `services.impl` to `persistence.inmemory` to match the pattern of ES/OS implementations.
+
+3. **OSGi Declarative Services**: Use DS annotations instead of Blueprint XML for modern, type-safe OSGi integration. Benefits include compile-time validation, better IDE support, and reduced boilerplate.
+
+4. **Test Utilities Module**: Create a shared `test-utilities` module to avoid circular dependencies. This module contains refactored `TestHelper` (without hard dependencies on `InMemoryPersistenceServiceImpl`), test item classes, and other shared test utilities. Both `services` and `persistence-inmemory` modules depend on it at test scope.
+
+5. **TestHelper Refactoring**: Remove hard dependency on `InMemoryPersistenceServiceImpl` by:
+   - Extracting constants to `TestConstants` class
+   - Using `PersistenceService` interface instead of concrete class
+   - Removing type-specific checks that require concrete class
+
+6. **Test Access**: Maintain test access through direct instantiation (tests can still instantiate the class directly) and shared test utilities, ensuring tests don't break.
+
+7. **Configuration**: Use OSGi Configuration Admin with `@ObjectClassDefinition` and `@Modified` for type-safe, runtime configuration updates without restart.
+
+8. **Service Registration**: Register as OSGi service via `@Component` annotation with proper service interfaces and properties to allow selection between persistence implementations.
+
+## Estimated Effort
+
+- **Test Utilities Module**: 4-6 hours
+  - Create module structure and POM
+  - Refactor TestHelper to remove hard dependencies
+  - Move test utility classes
+  - Update package names
+- **Refactoring TestHelper**: 2-3 hours
+  - Extract constants
+  - Remove InMemoryPersistenceServiceImpl dependencies
+  - Update type checks
+- **Updating All Test Files**: 3-4 hours
+  - Update imports across all test files
+  - Verify tests still pass
+- **Persistence-InMemory Module Structure**: 2-4 hours
+- **OSGi Integration**: 4-6 hours
+- **Configuration Management**: 2-3 hours
+- **Testing & Validation**: 4-6 hours
+- **Documentation**: 2-3 hours
+- **Total**: ~23-35 hours
+
+## Risks & Considerations
+
+1. **Breaking Tests**: Moving the class will break existing tests. Mitigation: Create test utilities module and update tests incrementally.
+
+2. **Circular Dependency Risk**: `TestHelper` has hard dependency on `InMemoryPersistenceServiceImpl`. Mitigation: Refactor `TestHelper` to use interfaces and extract constants to shared `TestConstants` class.
+
+3. **Test Utilities Migration**: Many test files depend on shared test utilities. Mitigation: Create `test-utilities` module that both `services` and `persistence-inmemory` can depend on, migrate incrementally.
+
+4. **OSGi DS Annotations**: Using DS annotations is newer than Blueprint (used by ES/OS). Mitigation: Follow coding guidelines and existing DS annotation examples in the codebase. DS annotations provide better type safety and IDE support.
+
+5. **Configuration Management**: Need to handle configuration updates at runtime. Mitigation: Use `@Modified` annotation method to handle configuration changes. DS annotations provide type-safe configuration via `@ObjectClassDefinition`.
+
+6. **Performance**: In-memory storage may not scale for production. Mitigation: Document use cases clearly.
+
+7. **Data Persistence**: File storage option exists but may not be as robust as ES/OS. Mitigation: Document limitations.
+
+## Conclusion
+
+Making `InMemoryPersistenceServiceImpl` a production-ready persistence manager is feasible and follows modern OSGi patterns. The main work involves:
+1. Moving to proper module structure
+2. Adding OSGi DS annotation-based service registration (modern approach)
+3. Implementing lifecycle management with `@Activate`/`@Modified`/`@Deactivate`
+4. Maintaining test compatibility
+
+The implementation is already quite complete - it mainly needs OSGi DS integration and proper packaging. Using DS annotations instead of Blueprint provides better type safety, IDE support, and aligns with the project's coding guidelines for new services.
+
+
diff --git a/api/pom.xml b/api/pom.xml
index 41406ecaf..5b0072b5f 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,30 +30,48 @@
     <description>Main API of the Apache Unomi Context server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-tracing-api</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -63,7 +81,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -76,20 +93,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <!-- SLF4J Implementation for Testing -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/api/src/main/java/org/apache/unomi/api/ClusterNode.java b/api/src/main/java/org/apache/unomi/api/ClusterNode.java
index 1f04cca28..66a4ee7c4 100644
--- a/api/src/main/java/org/apache/unomi/api/ClusterNode.java
+++ b/api/src/main/java/org/apache/unomi/api/ClusterNode.java
@@ -23,7 +23,7 @@ package org.apache.unomi.api;
 public class ClusterNode extends Item {
 
     private static final long serialVersionUID = 1281422346318230514L;
-    
+
     public static final String ITEM_TYPE = "clusterNode";
 
     private double cpuLoad;
@@ -35,8 +35,8 @@ public class ClusterNode extends Item {
     private boolean data;
     private long startTime;
     private long lastHeartbeat;
-    
-    // Server information 
+
+    // Server information
     private ServerInfo serverInfo;
 
     /**
@@ -172,7 +172,7 @@ public class ClusterNode extends Item {
     public void setData(boolean data) {
         this.data = data;
     }
-    
+
     /**
      * Retrieves the node start time in milliseconds.
      *
@@ -208,7 +208,7 @@ public class ClusterNode extends Item {
     public void setLastHeartbeat(long lastHeartbeat) {
         this.lastHeartbeat = lastHeartbeat;
     }
-    
+
     /**
      * Gets the server information.
      *
diff --git a/api/src/main/java/org/apache/unomi/api/ContextRequest.java b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
index 1c6a977b4..f050be672 100644
--- a/api/src/main/java/org/apache/unomi/api/ContextRequest.java
+++ b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
@@ -24,7 +24,6 @@ import org.apache.unomi.api.services.EventListenerService;
 import org.apache.unomi.api.services.PersonalizationService;
 import org.apache.unomi.api.services.ProfileService;
 import org.apache.unomi.api.services.RulesService;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/api/src/main/java/org/apache/unomi/api/GeoPoint.java b/api/src/main/java/org/apache/unomi/api/GeoPoint.java
index 4472bbe45..b3d0d02a6 100644
--- a/api/src/main/java/org/apache/unomi/api/GeoPoint.java
+++ b/api/src/main/java/org/apache/unomi/api/GeoPoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.unomi.api;
 
+
 import java.util.Map;
 
 /**
diff --git a/api/src/main/java/org/apache/unomi/api/Item.java b/api/src/main/java/org/apache/unomi/api/Item.java
index 3d39ddd7a..080ffd4f4 100644
--- a/api/src/main/java/org/apache/unomi/api/Item.java
+++ b/api/src/main/java/org/apache/unomi/api/Item.java
@@ -189,8 +189,6 @@ public abstract class Item implements Serializable {
 
     public void setLastModifiedBy(String lastModifiedBy) {
         this.lastModifiedBy = lastModifiedBy;
-        this.lastModificationDate = new Date();
-        this.version++;
     }
 
     public Date getCreationDate() {
diff --git a/api/src/main/java/org/apache/unomi/api/conditions/Condition.java b/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
index 7537a70eb..12cffe0f7 100644
--- a/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
+++ b/api/src/main/java/org/apache/unomi/api/conditions/Condition.java
@@ -31,7 +31,7 @@ public class Condition implements Serializable {
 
     ConditionType conditionType;
     String conditionTypeId;
-    Map<String, Object> parameterValues = new HashMap<String, Object>();
+    Map<String, Object> parameterValues = new HashMap<>();
 
     /**
      * Instantiates a new Condition.
diff --git a/api/src/main/java/org/apache/unomi/api/exceptions/BadSegmentConditionException.java b/api/src/main/java/org/apache/unomi/api/exceptions/BadSegmentConditionException.java
index bed713154..d118fd2cd 100644
--- a/api/src/main/java/org/apache/unomi/api/exceptions/BadSegmentConditionException.java
+++ b/api/src/main/java/org/apache/unomi/api/exceptions/BadSegmentConditionException.java
@@ -17,8 +17,59 @@
 
 package org.apache.unomi.api.exceptions;
 
+/**
+ * Exception thrown when a segment condition is invalid or cannot be used.
+ * <p>
+ * This exception is thrown in the following scenarios:
+ * <ul>
+ *   <li>When a segment is enabled but has no condition (null condition)</li>
+ *   <li>When a condition has structural issues that prevent it from being evaluated or queried:
+ *       <ul>
+ *         <li>Unresolved condition types (missing plugins, invalid type IDs)</li>
+ *         <li>Conditions that fail to build queries or evaluate against items</li>
+ *       </ul>
+ *   </li>
+ *   <li>When a condition has parameter validation errors:
+ *       <ul>
+ *         <li>Invalid parameter types (e.g., String instead of Integer)</li>
+ *         <li>Missing required parameters</li>
+ *         <li>Invalid parameter values (e.g., values outside allowed ranges)</li>
+ *         <li>Exclusive parameter violations</li>
+ *       </ul>
+ *   </li>
+ * </ul>
+ * <p>
+ * This is a domain-specific exception that allows callers to distinguish segment condition
+ * validation errors from general argument validation errors (which would use
+ * {@link IllegalArgumentException}).
+ *
+ * @see org.apache.unomi.api.services.SegmentService#setSegmentDefinition(org.apache.unomi.api.segments.Segment)
+ */
 public class BadSegmentConditionException extends RuntimeException {
+    
+    /**
+     * Constructs a new BadSegmentConditionException with no detail message.
+     */
     public BadSegmentConditionException() {
         super();
     }
+    
+    /**
+     * Constructs a new BadSegmentConditionException with the specified detail message.
+     *
+     * @param message the detail message explaining why the condition is invalid
+     */
+    public BadSegmentConditionException(String message) {
+        super(message);
+    }
+    
+    /**
+     * Constructs a new BadSegmentConditionException with the specified detail message and cause.
+     *
+     * @param message the detail message explaining why the condition is invalid
+     * @param cause the cause of this exception
+     */
+    public BadSegmentConditionException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/api/src/main/java/org/apache/unomi/api/services/ClusterService.java b/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
index ad8777503..f100be286 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ClusterService.java
@@ -19,7 +19,6 @@ package org.apache.unomi.api.services;
 
 import org.apache.unomi.api.ClusterNode;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
diff --git a/api/src/main/java/org/apache/unomi/api/services/InvalidObjectInfo.java b/api/src/main/java/org/apache/unomi/api/services/InvalidObjectInfo.java
new file mode 100644
index 000000000..5e220da0a
--- /dev/null
+++ b/api/src/main/java/org/apache/unomi/api/services/InvalidObjectInfo.java
@@ -0,0 +1,166 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.api.services;
+
+import java.util.*;
+
+/**
+ * Information about an invalid object, including detailed reasons for invalidation.
+ */
+public class InvalidObjectInfo {
+    private final String objectType;
+    private final String objectId;
+    private final String reason;
+    private final long firstSeenTimestamp;
+    private volatile long lastSeenTimestamp;
+    private volatile int encounterCount;
+    private final List<String> missingConditionTypeIds;
+    private final List<String> missingActionTypeIds;
+    private final Set<String> contextNames;
+
+    public InvalidObjectInfo(String objectType, String objectId, String reason) {
+        this(objectType, objectId, reason, null, null, null);
+    }
+
+    public InvalidObjectInfo(String objectType, String objectId, String reason, 
+                             List<String> missingConditionTypeIds, 
+                             List<String> missingActionTypeIds,
+                             String contextName) {
+        this.objectType = objectType;
+        this.objectId = objectId;
+        this.reason = reason;
+        this.firstSeenTimestamp = System.currentTimeMillis();
+        this.lastSeenTimestamp = this.firstSeenTimestamp;
+        this.encounterCount = 1;
+        this.missingConditionTypeIds = missingConditionTypeIds != null 
+            ? new ArrayList<>(missingConditionTypeIds) : new ArrayList<>();
+        this.missingActionTypeIds = missingActionTypeIds != null 
+            ? new ArrayList<>(missingActionTypeIds) : new ArrayList<>();
+        this.contextNames = new HashSet<>();
+        if (contextName != null) {
+            this.contextNames.add(contextName);
+        }
+    }
+
+    public String getObjectType() {
+        return objectType;
+    }
+
+    public String getObjectId() {
+        return objectId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public long getFirstSeenTimestamp() {
+        return firstSeenTimestamp;
+    }
+
+    public long getLastSeenTimestamp() {
+        return lastSeenTimestamp;
+    }
+
+    public int getEncounterCount() {
+        return encounterCount;
+    }
+
+    public List<String> getMissingConditionTypeIds() {
+        return Collections.unmodifiableList(missingConditionTypeIds);
+    }
+
+    public List<String> getMissingActionTypeIds() {
+        return Collections.unmodifiableList(missingActionTypeIds);
+    }
+
+    public Set<String> getContextNames() {
+        return Collections.unmodifiableSet(contextNames);
+    }
+
+    /**
+     * Update the info when the object is encountered again.
+     * This method is called internally by ResolverService to track repeated encounters.
+     * 
+     * @param missingConditionTypeIds additional missing condition type IDs
+     * @param missingActionTypeIds additional missing action type IDs
+     * @param contextName context where it was encountered
+     */
+    public void updateEncounter(List<String> missingConditionTypeIds, 
+                       List<String> missingActionTypeIds,
+                       String contextName) {
+        this.lastSeenTimestamp = System.currentTimeMillis();
+        this.encounterCount++;
+        
+        if (missingConditionTypeIds != null) {
+            for (String typeId : missingConditionTypeIds) {
+                if (!this.missingConditionTypeIds.contains(typeId)) {
+                    this.missingConditionTypeIds.add(typeId);
+                }
+            }
+        }
+        
+        if (missingActionTypeIds != null) {
+            for (String typeId : missingActionTypeIds) {
+                if (!this.missingActionTypeIds.contains(typeId)) {
+                    this.missingActionTypeIds.add(typeId);
+                }
+            }
+        }
+        
+        if (contextName != null) {
+            this.contextNames.add(contextName);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        InvalidObjectInfo that = (InvalidObjectInfo) o;
+        return Objects.equals(objectType, that.objectType) && Objects.equals(objectId, that.objectId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(objectType, objectId);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder("InvalidObjectInfo{");
+        sb.append("objectType='").append(objectType).append('\'');
+        sb.append(", objectId='").append(objectId).append('\'');
+        sb.append(", reason='").append(reason).append('\'');
+        sb.append(", firstSeen=").append(firstSeenTimestamp);
+        sb.append(", lastSeen=").append(lastSeenTimestamp);
+        sb.append(", encounters=").append(encounterCount);
+        if (!missingConditionTypeIds.isEmpty()) {
+            sb.append(", missingConditionTypes=").append(missingConditionTypeIds);
+        }
+        if (!missingActionTypeIds.isEmpty()) {
+            sb.append(", missingActionTypes=").append(missingActionTypeIds);
+        }
+        if (!contextNames.isEmpty()) {
+            sb.append(", contexts=").append(contextNames);
+        }
+        sb.append('}');
+        return sb.toString();
+    }
+}
+
diff --git a/api/src/main/java/org/apache/unomi/api/services/ResolverService.java b/api/src/main/java/org/apache/unomi/api/services/ResolverService.java
new file mode 100644
index 000000000..902cff748
--- /dev/null
+++ b/api/src/main/java/org/apache/unomi/api/services/ResolverService.java
@@ -0,0 +1,203 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.api.services;
+
+import org.apache.unomi.api.MetadataItem;
+import org.apache.unomi.api.PropertyType;
+import org.apache.unomi.api.actions.Action;
+import org.apache.unomi.api.conditions.Condition;
+import org.apache.unomi.api.rules.Rule;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Service for resolving condition types, action types, and value types, with automatic
+ * tracking of invalid objects that have unresolved types.
+ * 
+ * This service centralizes type resolution logic and automatically tracks objects
+ * that fail to resolve, providing detailed error information.
+ */
+public interface ResolverService {
+    
+    /**
+     * Resolve a condition type and all its nested conditions.
+     * This is a low-level method that only performs resolution - it does NOT track invalid objects
+     * or handle missingPlugins. Use {@link #resolveCondition(String, MetadataItem, Condition, String)}
+     * for validation contexts where tracking is needed.
+     * 
+     * @param rootCondition the condition to resolve
+     * @param contextObjectName name/ID of the object containing this condition (for error messages)
+     * @return true if resolution succeeded, false otherwise
+     */
+    boolean resolveConditionType(Condition rootCondition, String contextObjectName);
+    
+    /**
+     * Resolve all action types in a rule.
+     * This is a low-level method that only performs resolution - it does NOT track invalid objects
+     * or handle missingPlugins.
+     * 
+     * @param rule the rule containing actions to resolve
+     * @param ignoreErrors if true, don't log warnings for missing actions
+     * @return true if all actions resolved successfully, false otherwise
+     */
+    boolean resolveActionTypes(Rule rule, boolean ignoreErrors);
+    
+    /**
+     * Resolve a single action type.
+     * This is a low-level method that only performs resolution - it does NOT track invalid objects
+     * or handle missingPlugins.
+     * 
+     * @param action the action to resolve
+     * @return true if resolution succeeded, false otherwise
+     */
+    boolean resolveActionType(Action action);
+    
+    /**
+     * Resolve a value type for a property type.
+     * 
+     * @param propertyType the property type to resolve
+     */
+    void resolveValueType(PropertyType propertyType);
+    
+    /**
+     * Resolve condition types for a MetadataItem with automatic tracking and missingPlugins handling.
+     * 
+     * <p>This method performs three operations:
+     * <ul>
+     *   <li>Resolves the condition type</li>
+     *   <li>Tracks invalid objects in the tracking service</li>
+     *   <li>Sets/clears the missingPlugins flag on the item's metadata</li>
+     * </ul>
+     * 
+     * <p>This is the recommended method for validation contexts (e.g., when saving rules, segments, goals).
+     * 
+     * @param objectType the type of object (e.g., "rules", "segments", "goals", "campaigns", "scoring")
+     * @param item the MetadataItem object (e.g., Rule, Segment, Goal, Campaign, Scoring)
+     * @param condition the condition to resolve (may be null)
+     * @param contextName context name for error messages
+     * @return true if condition resolved successfully (or was null), false otherwise
+     */
+    boolean resolveCondition(String objectType, MetadataItem item, Condition condition, String contextName);
+    
+    /**
+     * Resolve action types for a rule with automatic tracking and missingPlugins handling.
+     * 
+     * <p>This method performs three operations:
+     * <ul>
+     *   <li>Resolves the action types</li>
+     *   <li>Tracks invalid objects in the tracking service</li>
+     *   <li>Sets/clears the missingPlugins flag on the rule's metadata</li>
+     * </ul>
+     * 
+     * <p>Note: For complete rule validation (condition + actions), use {@link #resolveRule(String, Rule)} instead.
+     * 
+     * @param objectType the type of object (e.g., "rules")
+     * @param rule the rule containing actions to resolve
+     * @return true if all actions resolved successfully, false otherwise
+     */
+    boolean resolveActions(String objectType, Rule rule);
+    
+    /**
+     * Resolve both condition and actions for a rule with automatic tracking and missingPlugins handling.
+     * 
+     * <p>This is a convenience method that handles both condition and action resolution together,
+     * ensuring missingPlugins is set correctly based on both resolutions.
+     * 
+     * @param objectType the type of object (e.g., "rules")
+     * @param rule the rule to resolve
+     * @return true if both condition and actions resolved successfully, false otherwise
+     */
+    boolean resolveRule(String objectType, Rule rule);
+    
+    // Invalid object tracking methods
+    
+    /**
+     * Mark an object as invalid with a reason.
+     * 
+     * @param objectType the type of object (e.g., "rules", "segments", "goals", "campaigns", "scoring")
+     * @param objectId the ID of the object
+     * @param reason the reason why the object is invalid (e.g., "Unresolved condition type: xyz", "Unresolved action type: abc")
+     */
+    void markInvalid(String objectType, String objectId, String reason);
+    
+    /**
+     * Mark an object as valid (remove it from invalid tracking).
+     * 
+     * @param objectType the type of object
+     * @param objectId the ID of the object
+     */
+    void markValid(String objectType, String objectId);
+    
+    /**
+     * Check if an object is invalid.
+     * 
+     * @param objectType the type of object
+     * @param objectId the ID of the object
+     * @return true if the object is invalid, false otherwise
+     */
+    boolean isInvalid(String objectType, String objectId);
+    
+    /**
+     * Get the invalidation reason for an object.
+     * 
+     * @param objectType the type of object
+     * @param objectId the ID of the object
+     * @return the reason why the object is invalid, or null if the object is valid
+     */
+    String getInvalidationReason(String objectType, String objectId);
+    
+    /**
+     * Get all invalid objects grouped by object type, with their reasons.
+     * 
+     * @return a map where keys are object type names (e.g., "rules", "segments", "goals", "campaigns", "scoring")
+     *         and values are maps of object ID to InvalidObjectInfo
+     */
+    Map<String, Map<String, InvalidObjectInfo>> getAllInvalidObjects();
+    
+    /**
+     * Get invalid objects for a specific object type, with their reasons.
+     * 
+     * @param objectType the object type (e.g., "rules", "segments", "goals", "campaigns", "scoring")
+     * @return map of object ID to InvalidObjectInfo for the specified type, or empty map if type is unknown
+     */
+    Map<String, InvalidObjectInfo> getInvalidObjects(String objectType);
+    
+    /**
+     * Get all invalid object IDs grouped by object type (for backward compatibility).
+     * 
+     * @return a map where keys are object type names and values are sets of invalid object IDs
+     */
+    Map<String, Set<String>> getAllInvalidObjectIds();
+    
+    /**
+     * Get invalid object IDs for a specific object type (for backward compatibility).
+     * 
+     * @param objectType the object type
+     * @return set of invalid object IDs for the specified type, or empty set if type is unknown
+     */
+    Set<String> getInvalidObjectIds(String objectType);
+    
+    /**
+     * Get the total count of all invalid objects across all types.
+     * 
+     * @return total count of invalid objects
+     */
+    int getTotalInvalidObjectCount();
+}
+
diff --git a/api/src/main/java/org/apache/unomi/api/utils/ParserHelper.java b/api/src/main/java/org/apache/unomi/api/utils/ParserHelper.java
index 0b4b2543d..75d906cae 100644
--- a/api/src/main/java/org/apache/unomi/api/utils/ParserHelper.java
+++ b/api/src/main/java/org/apache/unomi/api/utils/ParserHelper.java
@@ -47,6 +47,8 @@ public class ParserHelper {
     private static final String VALUE_NAME_SEPARATOR = "::";
     private static final String PLACEHOLDER_PREFIX = "${";
     private static final String PLACEHOLDER_SUFFIX = "}";
+    
+    private static final int MAX_RECURSION_DEPTH = 1000;
 
     public interface ConditionVisitor {
         void visit(Condition condition);
@@ -68,22 +70,30 @@ public class ParserHelper {
     }
 
     public static boolean resolveConditionType(final DefinitionsService definitionsService, Condition rootCondition, String contextObjectName) {
-        return resolveConditionType(definitionsService, rootCondition, contextObjectName, new HashSet<>());
+        return resolveConditionType(definitionsService, rootCondition, contextObjectName, 
+                new HashSet<>(), false, 0);
     }
 
     private static boolean resolveConditionType(final DefinitionsService definitionsService, Condition rootCondition,
-            String contextObjectName, Set<String> resolutionPath) {
+            String contextObjectName, Set<String> parentChainPath, boolean isGoingUp, int depth) {
         if (rootCondition == null) {
             LOGGER.warn("Couldn't resolve null condition for {}", contextObjectName);
             return false;
         }
 
-        // Check for circular reference
-        if (!resolutionPath.add(rootCondition.getConditionTypeId())) {
-            LOGGER.warn("Detected circular reference for condition type {} in {}", rootCondition.getConditionTypeId(), contextObjectName);
+        if (depth > MAX_RECURSION_DEPTH) {
+            LOGGER.error("Maximum recursion depth ({}) exceeded when resolving condition type {} in {}",
+                    MAX_RECURSION_DEPTH, rootCondition.getConditionTypeId(), contextObjectName);
             return false;
         }
 
+        if (isGoingUp) {
+            if (!parentChainPath.add(rootCondition.getConditionTypeId())) {
+                LOGGER.warn("Detected circular reference for condition type {} in {}", rootCondition.getConditionTypeId(), contextObjectName);
+                return false;
+            }
+        }
+
         try {
             // Resolve current condition type if needed
             if (rootCondition.getConditionType() == null) {
@@ -98,24 +108,34 @@ public class ParserHelper {
                 unresolvedConditionTypes.remove(rootCondition.getConditionTypeId());
                 rootCondition.setConditionType(conditionType);
 
-                // Resolve parent condition if it exists
-                if (conditionType.getParentCondition() != null &&
-                    !resolveConditionType(definitionsService, conditionType.getParentCondition(), contextObjectName, resolutionPath)) {
-                    rootCondition.setConditionType(null);
-                    LOGGER.warn("Failed to resolve parent condition for type: {} in {}",
-                        rootCondition.getConditionTypeId(), contextObjectName);
-                    return false;
+                if (conditionType.getParentCondition() != null) {
+                    Set<String> pathForParent = new HashSet<>(parentChainPath);
+                    if (!isGoingUp) {
+                        pathForParent.add(rootCondition.getConditionTypeId());
+                    }
+                    if (!resolveConditionType(definitionsService, conditionType.getParentCondition(), contextObjectName, 
+                            pathForParent, true, depth + 1)) {
+                        rootCondition.setConditionType(null);
+                        LOGGER.warn("Failed to resolve parent condition for type: {} in {}",
+                            rootCondition.getConditionTypeId(), contextObjectName);
+                        return false;
+                    }
                 }
             }
 
-            // Resolve all parameter conditions
             for (Object value : rootCondition.getParameterValues().values()) {
-                if (value instanceof Condition && !resolveConditionType(definitionsService, (Condition) value, contextObjectName, resolutionPath)) {
-                    return false;
+                if (value instanceof Condition) {
+                    if (!resolveConditionType(definitionsService, (Condition) value, contextObjectName, 
+                            parentChainPath, false, depth + 1)) {
+                        return false;
+                    }
                 } else if (value instanceof Collection) {
                     for (Object item : (Collection<?>) value) {
-                        if (item instanceof Condition && !resolveConditionType(definitionsService, (Condition) item, contextObjectName, resolutionPath)) {
-                            return false;
+                        if (item instanceof Condition) {
+                            if (!resolveConditionType(definitionsService, (Condition) item, contextObjectName, 
+                                    parentChainPath, false, depth + 1)) {
+                                return false;
+                            }
                         }
                     }
                 }
@@ -123,7 +143,9 @@ public class ParserHelper {
 
             return true;
         } finally {
-            resolutionPath.remove(rootCondition.getConditionTypeId());
+            if (isGoingUp) {
+                parentChainPath.remove(rootCondition.getConditionTypeId());
+            }
         }
     }
 
diff --git a/api/src/test/java/org/apache/unomi/api/utils/ParserHelperTest.java b/api/src/test/java/org/apache/unomi/api/utils/ParserHelperTest.java
index 1c0657746..5004db7c2 100644
--- a/api/src/test/java/org/apache/unomi/api/utils/ParserHelperTest.java
+++ b/api/src/test/java/org/apache/unomi/api/utils/ParserHelperTest.java
@@ -546,4 +546,181 @@ public class ParserHelperTest {
         assertEquals("First subCondition type should be set", subCondition1Type, resolvedSubConditions.get(0).getConditionType());
         assertEquals("Second subCondition type should be set", subCondition2Type, resolvedSubConditions.get(1).getConditionType());
     }
+
+    @Test
+    public void testResolveBooleanConditionWithParentConditionUsingBooleanCondition() {
+        // Test scenario: booleanCondition A has subCondition B
+        // subCondition B has parentCondition which is booleanCondition C
+        // This should NOT be detected as a circular reference because they are different instances
+        Condition booleanConditionA = new Condition();
+        booleanConditionA.setConditionTypeId("booleanCondition");
+        booleanConditionA.setParameter("operator", "and");
+        
+        Condition subConditionB = new Condition();
+        subConditionB.setConditionTypeId("eventPropertyCondition");
+        Map<String, Object> subConditionBParams = new HashMap<>();
+        subConditionBParams.put("propertyName", "testProperty");
+        subConditionBParams.put("propertyValue", "testValue");
+        subConditionB.setParameterValues(subConditionBParams);
+        booleanConditionA.setParameter("subConditions", Arrays.asList(subConditionB));
+        
+        Condition booleanConditionC = new Condition();
+        booleanConditionC.setConditionTypeId("booleanCondition");
+        booleanConditionC.setParameter("operator", "or");
+        
+        Condition subConditionD = new Condition();
+        subConditionD.setConditionTypeId("profilePropertyCondition");
+        booleanConditionC.setParameter("subConditions", Arrays.asList(subConditionD));
+        
+        ConditionType booleanConditionType = new ConditionType();
+        booleanConditionType.setItemId("booleanCondition");
+        
+        ConditionType eventPropertyConditionType = new ConditionType();
+        eventPropertyConditionType.setItemId("eventPropertyCondition");
+        eventPropertyConditionType.setParentCondition(booleanConditionC);
+        
+        ConditionType profilePropertyConditionType = new ConditionType();
+        profilePropertyConditionType.setItemId("profilePropertyCondition");
+        
+        when(definitionsService.getConditionType("booleanCondition")).thenReturn(booleanConditionType);
+        when(definitionsService.getConditionType("eventPropertyCondition")).thenReturn(eventPropertyConditionType);
+        when(definitionsService.getConditionType("profilePropertyCondition")).thenReturn(profilePropertyConditionType);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, booleanConditionA, "testContext");
+        assertTrue("BooleanCondition with parent condition using booleanCondition should resolve successfully", result);
+        assertEquals("Root booleanCondition type should be set", booleanConditionType, booleanConditionA.getConditionType());
+    }
+
+    @Test
+    public void testSelfReferencingCycle() {
+        // Test self-referencing condition hits depth limit
+        Condition a = new Condition();
+        a.setConditionTypeId("booleanCondition");
+        a.setParameter("subConditions", Arrays.asList(a));
+        
+        ConditionType booleanConditionType = new ConditionType();
+        booleanConditionType.setItemId("booleanCondition");
+        when(definitionsService.getConditionType("booleanCondition")).thenReturn(booleanConditionType);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, a, "testContext");
+        assertFalse("Self-referencing condition should hit depth limit", result);
+    }
+
+    @Test
+    public void testMultipleBranchesWithSameConditionType() {
+        // Test that multiple branches can use the same condition type without false positives
+        Condition root = new Condition();
+        root.setConditionTypeId("booleanCondition");
+        
+        Condition branch1 = new Condition();
+        branch1.setConditionTypeId("booleanCondition");
+        
+        Condition branch2 = new Condition();
+        branch2.setConditionTypeId("booleanCondition");
+        
+        root.setParameter("subConditions", Arrays.asList(branch1, branch2));
+        
+        ConditionType booleanConditionType = new ConditionType();
+        booleanConditionType.setItemId("booleanCondition");
+        when(definitionsService.getConditionType("booleanCondition")).thenReturn(booleanConditionType);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, root, "testContext");
+        assertTrue("Multiple branches using the same condition type should not be a false positive", result);
+    }
+
+    @Test
+    public void testCycleInParentConditionChain() {
+        // Test cycle in parent condition chain: A has parent B, B has parent C, C has parent B
+        Condition root = new Condition();
+        root.setConditionTypeId("conditionA");
+        
+        Condition parentB = new Condition();
+        parentB.setConditionTypeId("conditionB");
+        
+        ConditionType typeA = new ConditionType();
+        typeA.setItemId("conditionA");
+        typeA.setParentCondition(parentB);
+        
+        ConditionType typeB = new ConditionType();
+        typeB.setItemId("conditionB");
+        
+        Condition parentC = new Condition();
+        parentC.setConditionTypeId("conditionC");
+        
+        ConditionType typeC = new ConditionType();
+        typeC.setItemId("conditionC");
+        
+        typeB.setParentCondition(parentC);
+        typeC.setParentCondition(parentB);
+        
+        when(definitionsService.getConditionType("conditionA")).thenReturn(typeA);
+        when(definitionsService.getConditionType("conditionB")).thenReturn(typeB);
+        when(definitionsService.getConditionType("conditionC")).thenReturn(typeC);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, root, "testContext");
+        assertFalse("Cycle in parent condition chain (B->C->B) should be detected", result);
+    }
+
+    @Test
+    public void testNestedBooleanConditionsWithoutCycle() {
+        // Test deeply nested booleanConditions that don't form a cycle
+        Condition root = new Condition();
+        root.setConditionTypeId("booleanCondition");
+        
+        Condition b1 = new Condition();
+        b1.setConditionTypeId("booleanCondition");
+        
+        Condition b2 = new Condition();
+        b2.setConditionTypeId("booleanCondition");
+        
+        Condition b3 = new Condition();
+        b3.setConditionTypeId("booleanCondition");
+        
+        root.setParameter("subConditions", Arrays.asList(b1));
+        b1.setParameter("subConditions", Arrays.asList(b2));
+        b2.setParameter("subConditions", Arrays.asList(b3));
+        
+        ConditionType booleanConditionType = new ConditionType();
+        booleanConditionType.setItemId("booleanCondition");
+        when(definitionsService.getConditionType("booleanCondition")).thenReturn(booleanConditionType);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, root, "testContext");
+        assertTrue("Deeply nested booleanConditions without cycle should succeed", result);
+    }
+
+    @Test
+    public void testUpDownBackUpCycle() {
+        // Test up → down → back up cycle: Root A -> parameter B -> B's parent C -> C's parent B (cycle in parent chain)
+        // This creates a cycle in the parent chain that should be detected
+        Condition rootA = new Condition();
+        rootA.setConditionTypeId("typeA");
+        
+        Condition paramB = new Condition();
+        paramB.setConditionTypeId("typeB");
+        rootA.setParameter("subConditions", Arrays.asList(paramB));
+        
+        Condition parentC = new Condition();
+        parentC.setConditionTypeId("typeC");
+        
+        Condition parentB = new Condition();
+        parentB.setConditionTypeId("typeB");
+        
+        ConditionType typeA = new ConditionType();
+        typeA.setItemId("typeA");
+        
+        ConditionType typeB = new ConditionType();
+        typeB.setItemId("typeB");
+        typeB.setParentCondition(parentC);
+        
+        ConditionType typeC = new ConditionType();
+        typeC.setItemId("typeC");
+        typeC.setParentCondition(parentB);
+        
+        when(definitionsService.getConditionType("typeA")).thenReturn(typeA);
+        when(definitionsService.getConditionType("typeB")).thenReturn(typeB);
+        when(definitionsService.getConditionType("typeC")).thenReturn(typeC);
+        
+        boolean result = ParserHelper.resolveConditionType(definitionsService, rootA, "testContext");
+        assertFalse("Up → down → back up cycle (B->C->B) should be detected", result);
+    }
 }
diff --git a/bom/artifacts/pom.xml b/bom/artifacts/pom.xml
new file mode 100644
index 000000000..047e255bc
--- /dev/null
+++ b/bom/artifacts/pom.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-root</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>unomi-bom-artifacts</artifactId>
+    <name>Apache Unomi :: BOM :: Unomi Artifacts</name>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-tracing-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-tracing-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-metrics</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-scripting</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-persistence-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-persistence-elasticsearch-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-persistence-opensearch-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-persistence-opensearch-conditions</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-json-schema-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-json-schema-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-json-schema-shell-commands</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>log4j-extension</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-geonames-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-geonames-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-privacy-extension-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-privacy-extension-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-lists-extension-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-lists-extension-actions</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cxs-lists-extension-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-services-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-services</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-wab</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-web-servlets</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-web-tracker-wab</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-lifecycle-watcher</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>shell-commands</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>shell-dev-commands</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-weather-update-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-salesforce-connector-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-salesforce-connector-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-salesforce-connector-actions</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-router-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-router-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-router-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-router-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-groovy-actions-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-groovy-actions</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cdp-graphql-api-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>cdp-graphql-feature</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>graphql-providers-sample</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-plugins-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-plugins-request</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-plugins-mail</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-plugins-optimization-test</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-kar</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-router-karaf-feature</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 000000000..42882b9b5
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.unomi</groupId>
+        <artifactId>unomi-root</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>unomi-bom</artifactId>
+    <name>Apache Unomi :: Bill Of Material</name>
+    <description>Common Dependencies used in the Apache Unomi maven modules</description>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>karaf-bom</artifactId>
+                <version>${karaf.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Missing in Karaf 4.4.7 (fixed later...) -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.metatype.annotations</artifactId>
+                <version>1.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.useradmin</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.enterprise</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.karaf.cellar</groupId>
+                <artifactId>apache-karaf-cellar</artifactId>
+                <classifier>features</classifier>
+                <version>${karaf.cellar.version}</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.cellar</groupId>
+                <artifactId>org.apache.karaf.cellar.core</artifactId>
+                <version>${karaf.cellar.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.cellar</groupId>
+                <artifactId>org.apache.karaf.cellar.config</artifactId>
+                <version>${karaf.cellar.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.jaas</groupId>
+                <artifactId>org.apache.karaf.jaas.boot</artifactId>
+                <version>${karaf.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>${javax-validation.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta-annotation-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>${rs-api.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-csv</artifactId>
+                <version>${commons-csv.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>${commons-beanutils.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons-collections.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-email</artifactId>
+                <version>${commons-email.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>${commons-net.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons-fileupload.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.elasticsearch.test</groupId>
+                <artifactId>framework</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>co.elastic.clients</groupId>
+                <artifactId>elasticsearch-java</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opensearch.client</groupId>
+                <artifactId>opensearch-java</artifactId>
+                <version>${opensearch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-features-metrics</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-features-logging</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-transports-http</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-rs-security-cors</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jaxb-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jdk8</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-base</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-json-provider</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-test-framework</artifactId>
+                <version>${lucene.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-1.2-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore-osgi</artifactId>
+                <version>${httpcore-osgi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient-osgi</artifactId>
+                <version>${httpclient-osgi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient-osgi</artifactId>
+                <version>${httpclient-osgi.version}</version>
+                <type>bundle</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-clients</artifactId>
+                <version>${kafka-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mvel</groupId>
+                <artifactId>mvel2</artifactId>
+                <version>${mvel2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.opencsv</groupId>
+                <artifactId>opencsv</artifactId>
+                <version>${opencsv.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.jodah</groupId>
+                <artifactId>failsafe</artifactId>
+                <version>${failsafe.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${joda-time.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.seancfoley</groupId>
+                <artifactId>ipaddress</artifactId>
+                <version>${ipaddress.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.java-json-tools</groupId>
+                <artifactId>btf</artifactId>
+                <version>${btf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.java-json-tools</groupId>
+                <artifactId>msg-simple</artifactId>
+                <version>${msg-simple.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.java-json-tools</groupId>
+                <artifactId>json-patch</artifactId>
+                <version>${json-patch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.java-json-tools</groupId>
+                <artifactId>jackson-coreutils</artifactId>
+                <version>${jackson-coreutils.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${org-json.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>swagger-ui</artifactId>
+                <version>${swagger-ui.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy-json</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>ST4</artifactId>
+                <version>${st4.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.maxmind.geoip2</groupId>
+                <artifactId>geoip2</artifactId>
+                <version>${geoip2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>nl.basjes.parse.useragent</groupId>
+                <artifactId>yauaa</artifactId>
+                <version>${yauaa.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.cometd.java</groupId>
+                <artifactId>bayeux-api</artifactId>
+                <version>${bayeux-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.cometd.java</groupId>
+                <artifactId>cometd-java-common</artifactId>
+                <version>${comet-java-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.cometd.java</groupId>
+                <artifactId>cometd-java-client-http-common</artifactId>
+                <version>${comet-java-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.cometd.java</groupId>
+                <artifactId>cometd-java-client-common</artifactId>
+                <version>${comet-java-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.cometd.java</groupId>
+                <artifactId>cometd-java-client-http-jetty</artifactId>
+                <version>${comet-java-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.reactivex.rxjava2</groupId>
+                <artifactId>rxjava</artifactId>
+                <version>${reactivex.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr-runtime</artifactId>
+                <version>${antlr.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>${antlr4.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>stringtemplate</artifactId>
+                <version>${stringtemplate.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.abego.treelayout</groupId>
+                <artifactId>org.abego.treelayout.core</artifactId>
+                <version>${treelayout.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.graphql-java</groupId>
+                <artifactId>java-dataloader</artifactId>
+                <version>${java-dataloader.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.reactivestreams</groupId>
+                <artifactId>reactive-streams</artifactId>
+                <version>${reactive-stream.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-compat-qual</artifactId>
+                <version>${checker-compat-qual.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>${error_prone_annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.j2objc</groupId>
+                <artifactId>j2objc-annotations</artifactId>
+                <version>${j2objc-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-annotations</artifactId>
+                <version>${animal-sniffer-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.graphql-java</groupId>
+                <artifactId>graphql-java</artifactId>
+                <version>${graphql.java.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.graphql-java</groupId>
+                <artifactId>graphql-java-annotations</artifactId>
+                <version>${graphql.java.annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.graphql-java</groupId>
+                <artifactId>graphql-java-extended-scalars</artifactId>
+                <version>${graphql.java.extended.scalars.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-client</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.websocket</groupId>
+                <artifactId>websocket-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit-jupiter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>${awaitility.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>artifacts</module>
+    </modules>
+
+</project>
diff --git a/build.ps1 b/build.ps1
index 24fb00bbf..bed45c6fd 100644
--- a/build.ps1
+++ b/build.ps1
@@ -33,7 +33,8 @@ param(
     [string]$KarafHome,
     [switch]$UseOpenSearch,
     [switch]$NoKaraf,
-    [string]$AutoStart
+    [string]$AutoStart,
+    [switch]$ResolverDebug
 )
 
 # Global variables
@@ -207,6 +208,7 @@ function Show-Usage {
         Write-Host "  $CYAN-UseOpenSearch$NC         Use OpenSearch instead of ElasticSearch"
         Write-Host "  $CYAN-NoKaraf$NC              Build without starting Karaf"
         Write-Host "  $CYAN-AutoStart$NC <engine>    Auto-start with specified engine"
+        Write-Host "  $CYAN-ResolverDebug$NC        Enable Karaf Resolver debug logging for integration tests"
     } else {
         Write-Host "  -Help                    Show this help message"
         Write-Host "  -MavenDebug             Enable Maven debug output"
@@ -223,6 +225,7 @@ function Show-Usage {
         Write-Host "  -UseOpenSearch         Use OpenSearch instead of ElasticSearch"
         Write-Host "  -NoKaraf              Build without starting Karaf"
         Write-Host "  -AutoStart <engine>    Auto-start with specified engine"
+        Write-Host "  -ResolverDebug         Enable Karaf Resolver debug logging for integration tests"
     }
     
     Write-Host ""
@@ -445,6 +448,79 @@ function Test-Requirements {
 # Check requirements before proceeding
 Test-Requirements 
 
+# Validate OpenSearch password requirement
+if ($UseOpenSearch -or ($AutoStart -and $AutoStart -eq 'opensearch')) {
+    if (-not $env:UNOMI_OPENSEARCH_PASSWORD -or [string]::IsNullOrWhiteSpace($env:UNOMI_OPENSEARCH_PASSWORD)) {
+        Write-Status "error" "UNOMI_OPENSEARCH_PASSWORD is not set for OpenSearch"
+        Write-Status "info" "When using OpenSearch, you must set the UNOMI_OPENSEARCH_PASSWORD environment variable before building/starting."
+        Write-Host "Examples:"
+        Write-Host "  setx UNOMI_OPENSEARCH_PASSWORD yourStrongPassword (PowerShell - current user)"
+        Write-Host "  $env:UNOMI_OPENSEARCH_PASSWORD='yourStrongPassword'; .\build.ps1 -IntegrationTests -UseOpenSearch"
+        exit 1
+    }
+}
+
+# Function to check for conflicting environment variables before integration tests
+function Test-IntegrationTestEnvVars {
+    $detectedVars = @()
+    $scriptDir = Split-Path -Parent $MyInvocation.PSCommandPath
+    
+    # Check for Elasticsearch environment variables
+    if ($env:UNOMI_ELASTICSEARCH_CLUSTERNAME -or 
+        $env:UNOMI_ELASTICSEARCH_USERNAME -or 
+        $env:UNOMI_ELASTICSEARCH_PASSWORD -or 
+        $env:UNOMI_ELASTICSEARCH_SSL_ENABLE -or 
+        $env:UNOMI_ELASTICSEARCH_SSL_TRUST_ALL_CERTIFICATES) {
+        $detectedVars += "Elasticsearch"
+    }
+    
+    # Check for OpenSearch environment variables
+    if ($env:UNOMI_OPENSEARCH_CLUSTERNAME -or 
+        $env:UNOMI_OPENSEARCH_ADDRESSES -or 
+        $env:UNOMI_OPENSEARCH_USERNAME -or 
+        $env:UNOMI_OPENSEARCH_PASSWORD -or 
+        $env:UNOMI_OPENSEARCH_SSL_ENABLE -or 
+        $env:UNOMI_OPENSEARCH_SSL_TRUST_ALL_CERTIFICATES) {
+        $detectedVars += "OpenSearch"
+    }
+    
+    if ($detectedVars.Count -gt 0) {
+        Write-Status "error" "Environment variables for $($detectedVars -join ' and ') are set and will interfere with integration tests"
+        Write-Host ""
+        Write-Host "Integration tests manage their own search engine configuration and should not"
+        Write-Host "be run with these environment variables set."
+        Write-Host ""
+        Write-Host "To clear the environment variables, run one of the following:"
+        Write-Host ""
+        if ($detectedVars -contains "Elasticsearch") {
+            Write-Host "  . $scriptDir\clear-elasticsearch.sh"
+        }
+        if ($detectedVars -contains "OpenSearch") {
+            Write-Host "  . $scriptDir\clear-opensearch.sh"
+        }
+        Write-Host ""
+        Write-Host "Or manually unset the variables in PowerShell:"
+        if ($detectedVars -contains "Elasticsearch") {
+            Write-Host "  Remove-Item Env:\UNOMI_ELASTICSEARCH_CLUSTERNAME"
+            Write-Host "  Remove-Item Env:\UNOMI_ELASTICSEARCH_USERNAME"
+            Write-Host "  Remove-Item Env:\UNOMI_ELASTICSEARCH_PASSWORD"
+            Write-Host "  Remove-Item Env:\UNOMI_ELASTICSEARCH_SSL_ENABLE"
+            Write-Host "  Remove-Item Env:\UNOMI_ELASTICSEARCH_SSL_TRUST_ALL_CERTIFICATES"
+        }
+        if ($detectedVars -contains "OpenSearch") {
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_CLUSTERNAME"
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_ADDRESSES"
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_USERNAME"
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_PASSWORD"
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_SSL_ENABLE"
+            Write-Host "  Remove-Item Env:\UNOMI_OPENSEARCH_SSL_TRUST_ALL_CERTIFICATES"
+        }
+        Write-Host ""
+        Write-Host "After clearing the variables, you can run the integration tests again."
+        exit 1
+    }
+}
+
 function Get-MavenOptions {
     $options = @()
     
@@ -459,8 +535,13 @@ function Get-MavenOptions {
         $options += "-DskipTests"
     }
     if ($IntegrationTests) {
+        # Check for conflicting environment variables before running integration tests
+        Test-IntegrationTestEnvVars
         $options += "-Pintegration-tests"
     }
+    if ($ResolverDebug) {
+        $options += "-Dit.unomi.resolver.debug=true"
+    }
     if ($NoMavenCache) {
         $options += "-Dmaven.buildcache.enabled=false"
     }
@@ -479,6 +560,10 @@ function Invoke-MavenBuild {
     $mvnOptions = Get-MavenOptions
     $buildCommand = "mvn clean install $mvnOptions"
     
+    if ($ResolverDebug) {
+        Write-Status "info" "Karaf Resolver debug logging enabled for integration tests"
+    }
+    
     Write-Status "info" "Running: $buildCommand"
     Write-Host ""
     
diff --git a/build.sh b/build.sh
index 3413e0314..bbc60f3b2 100755
--- a/build.sh
+++ b/build.sh
@@ -241,6 +241,7 @@ print_section "Apache Unomi Build Script"
 
 # Default values
 SKIP_TESTS=false
+SKIP_UNIT_TESTS=false
 RUN_INTEGRATION_TESTS=false
 DEPLOY=false
 DEBUG=false
@@ -258,6 +259,7 @@ IT_DEBUG=false
 IT_DEBUG_PORT=5006
 IT_DEBUG_SUSPEND=false
 SKIP_MIGRATION_TESTS=false
+RESOLVER_DEBUG=false
 
 # Enhanced usage function with color support
 usage() {
@@ -278,6 +280,7 @@ EOF
         echo -e "${BOLD}Options:${NC}"
         echo -e "  ${CYAN}-h, --help${NC}                 Show this help message"
         echo -e "  ${CYAN}-s, --skip-tests${NC}           Skip all tests"
+        echo -e "  ${CYAN}--skip-unit-tests${NC}          Skip unit tests (integration tests can still run)"
         echo -e "  ${CYAN}-i, --integration-tests${NC}    Run integration tests"
         echo -e "  ${CYAN}-d, --deploy${NC}               Deploy after build"
         echo -e "  ${CYAN}-X, --maven-debug${NC}         Enable Maven debug output"
@@ -296,6 +299,7 @@ EOF
         echo -e "  ${CYAN}--it-debug-port PORT${NC}        Set integration test debug port"
         echo -e "  ${CYAN}--it-debug-suspend${NC}        Suspend integration test until debugger connects"
         echo -e "  ${CYAN}--skip-migration-tests${NC}    Skip migration-related tests"
+        echo -e "  ${CYAN}--resolver-debug${NC}          Enable Karaf Resolver debug logging for integration tests"
     else
         cat << "EOF"
      _    _ _____ _      ____
@@ -311,6 +315,7 @@ EOF
         echo "Options:"
         echo "  -h, --help                 Show this help message"
         echo "  -s, --skip-tests           Skip all tests"
+        echo "  --skip-unit-tests          Skip unit tests (integration tests can still run)"
         echo "  -i, --integration-tests    Run integration tests"
         echo "  -d, --deploy               Deploy after build"
         echo "  -X, --maven-debug         Enable Maven debug output"
@@ -329,6 +334,7 @@ EOF
         echo "  --it-debug-port PORT      Set integration test debug port"
         echo "  --it-debug-suspend        Suspend integration test until debugger connects"
         echo "  --skip-migration-tests    Skip migration-related tests"
+        echo "  --resolver-debug          Enable Karaf Resolver debug logging for integration tests"
     fi
 
     echo
@@ -337,6 +343,9 @@ EOF
         echo -e "  ${GRAY}# Build with integration tests using OpenSearch${NC}"
         echo -e "  ${GRAY}$0 --integration-tests --use-opensearch${NC}"
         echo -e
+        echo -e "  ${GRAY}# Build skipping unit tests but running integration tests${NC}"
+        echo -e "  ${GRAY}$0 --skip-unit-tests --integration-tests${NC}"
+        echo -e
         echo -e "  ${GRAY}# Build in debug mode${NC}"
         echo -e "  ${GRAY}$0 --debug --debug-port 5006 --debug-suspend${NC}"
         echo -e
@@ -361,6 +370,9 @@ EOF
         echo "  # Build with integration tests using OpenSearch"
         echo "  $0 --integration-tests --use-opensearch"
         echo
+        echo "  # Build skipping unit tests but running integration tests"
+        echo "  $0 --skip-unit-tests --integration-tests"
+        echo
         echo "  # Build in debug mode"
         echo "  $0 --debug --debug-port 5006 --debug-suspend"
         echo
@@ -400,6 +412,9 @@ while [ "$1" != "" ]; do
         -s | --skip-tests)
             SKIP_TESTS=true
             ;;
+        --skip-unit-tests)
+            SKIP_UNIT_TESTS=true
+            ;;
         -i | --integration-tests)
             RUN_INTEGRATION_TESTS=true
             ;;
@@ -457,6 +472,9 @@ while [ "$1" != "" ]; do
         --skip-migration-tests)
             SKIP_MIGRATION_TESTS=true
             ;;
+        --resolver-debug)
+            RESOLVER_DEBUG=true
+            ;;
         *)
             echo "Unknown option: $1"
             usage
@@ -700,6 +718,23 @@ check_requirements() {
         has_errors=true
     fi
 
+    if [ "$SKIP_TESTS" = true ] && [ "$SKIP_UNIT_TESTS" = true ]; then
+        print_status "error" "Cannot use --skip-tests and --skip-unit-tests together"
+        has_errors=true
+    fi
+
+    # OpenSearch password check
+    if [ "$USE_OPENSEARCH" = true ] || [ "$AUTO_START" = "opensearch" ]; then
+        if [ -z "$UNOMI_OPENSEARCH_PASSWORD" ]; then
+            print_status "error" "UNOMI_OPENSEARCH_PASSWORD is not set for OpenSearch"
+            echo "When using OpenSearch, you must export UNOMI_OPENSEARCH_PASSWORD before running the build/start."
+            echo "Examples:"
+            echo "  export UNOMI_OPENSEARCH_PASSWORD=yourStrongPassword"
+            echo "  UNOMI_OPENSEARCH_PASSWORD=yourStrongPassword $0 --integration-tests --use-opensearch"
+            has_errors=true
+        fi
+    fi
+
     if [ ! -z "$SINGLE_TEST" ] && [ "$RUN_INTEGRATION_TESTS" = false ]; then
         print_status "error" "Single test specified (--single-test) but integration tests are not enabled. Use --integration-tests to run the test."
         has_errors=true
@@ -805,9 +840,73 @@ if [ ! -f ~/.m2/settings.xml ]; then
     fi
 fi
 
+# Function to check for conflicting environment variables before integration tests
+check_integration_test_env_vars() {
+    local detected_vars=()
+    local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    
+    # Check for Elasticsearch environment variables
+    if [ -n "${UNOMI_ELASTICSEARCH_CLUSTERNAME+x}" ] || \
+       [ -n "${UNOMI_ELASTICSEARCH_USERNAME+x}" ] || \
+       [ -n "${UNOMI_ELASTICSEARCH_PASSWORD+x}" ] || \
+       [ -n "${UNOMI_ELASTICSEARCH_SSL_ENABLE+x}" ] || \
+       [ -n "${UNOMI_ELASTICSEARCH_SSL_TRUST_ALL_CERTIFICATES+x}" ]; then
+        detected_vars+=("Elasticsearch")
+    fi
+    
+    # Check for OpenSearch environment variables
+    if [ -n "${UNOMI_OPENSEARCH_CLUSTERNAME+x}" ] || \
+       [ -n "${UNOMI_OPENSEARCH_ADDRESSES+x}" ] || \
+       [ -n "${UNOMI_OPENSEARCH_USERNAME+x}" ] || \
+       [ -n "${UNOMI_OPENSEARCH_PASSWORD+x}" ] || \
+       [ -n "${UNOMI_OPENSEARCH_SSL_ENABLE+x}" ] || \
+       [ -n "${UNOMI_OPENSEARCH_SSL_TRUST_ALL_CERTIFICATES+x}" ]; then
+        detected_vars+=("OpenSearch")
+    fi
+    
+    if [ ${#detected_vars[@]} -gt 0 ]; then
+        print_status "error" "Environment variables for ${detected_vars[*]} are set and will interfere with integration tests"
+        echo ""
+        echo "Integration tests manage their own search engine configuration and should not"
+        echo "be run with these environment variables set."
+        echo ""
+        echo "To clear the environment variables, run one of the following:"
+        echo ""
+        for var_type in "${detected_vars[@]}"; do
+            if [ "$var_type" = "Elasticsearch" ]; then
+                echo "  source ${script_dir}/clear-elasticsearch.sh"
+            elif [ "$var_type" = "OpenSearch" ]; then
+                echo "  source ${script_dir}/clear-opensearch.sh"
+            fi
+        done
+        echo ""
+        echo "Or manually unset the variables:"
+        if [[ " ${detected_vars[@]} " =~ " Elasticsearch " ]]; then
+            echo "  unset UNOMI_ELASTICSEARCH_CLUSTERNAME"
+            echo "  unset UNOMI_ELASTICSEARCH_USERNAME"
+            echo "  unset UNOMI_ELASTICSEARCH_PASSWORD"
+            echo "  unset UNOMI_ELASTICSEARCH_SSL_ENABLE"
+            echo "  unset UNOMI_ELASTICSEARCH_SSL_TRUST_ALL_CERTIFICATES"
+        fi
+        if [[ " ${detected_vars[@]} " =~ " OpenSearch " ]]; then
+            echo "  unset UNOMI_OPENSEARCH_CLUSTERNAME"
+            echo "  unset UNOMI_OPENSEARCH_ADDRESSES"
+            echo "  unset UNOMI_OPENSEARCH_USERNAME"
+            echo "  unset UNOMI_OPENSEARCH_PASSWORD"
+            echo "  unset UNOMI_OPENSEARCH_SSL_ENABLE"
+            echo "  unset UNOMI_OPENSEARCH_SSL_TRUST_ALL_CERTIFICATES"
+        fi
+        echo ""
+        echo "After clearing the variables, you can run the integration tests again."
+        exit 1
+    fi
+}
+
 # Add profile options
 PROFILES=""
 if [ "$RUN_INTEGRATION_TESTS" = true ]; then
+    # Check for conflicting environment variables before running integration tests
+    check_integration_test_env_vars
     if [ "$USE_OPENSEARCH" = true ]; then
         MVN_OPTS="$MVN_OPTS -Duse.opensearch=true -P opensearch"
         echo "Running integration tests with OpenSearch"
@@ -840,10 +939,28 @@ if [ "$RUN_INTEGRATION_TESTS" = true ]; then
         MVN_OPTS="$MVN_OPTS -Dit.test.exclude.pattern=**/migration/**/*IT.java"
         echo "Skipping migration tests"
     fi
+
+    # Add Karaf Resolver debug option if specified
+    if [ "$RESOLVER_DEBUG" = true ]; then
+        MVN_OPTS="$MVN_OPTS -Dit.unomi.resolver.debug=true"
+        echo "Enabling Karaf Resolver debug logging for integration tests"
+    fi
+
+    # Add skip unit tests option if specified (integration tests will still run)
+    if [ "$SKIP_UNIT_TESTS" = true ]; then
+        # Activate skip-unit-tests profile to skip unit tests (surefire), not integration tests (failsafe)
+        MVN_OPTS="$MVN_OPTS -P skip-unit-tests"
+        echo "Skipping unit tests (integration tests will still run)"
+    fi
 else
     if [ "$SKIP_TESTS" = true ]; then
         PROFILES="$PROFILES,!integration-tests,!run-tests"
         MVN_OPTS="$MVN_OPTS -DskipTests"
+    elif [ "$SKIP_UNIT_TESTS" = true ]; then
+        # Skip unit tests but allow integration tests to run if --integration-tests is specified
+        # Activate skip-unit-tests profile to skip unit tests (surefire), not integration tests (failsafe)
+        MVN_OPTS="$MVN_OPTS -P skip-unit-tests"
+        echo "Skipping unit tests"
     fi
     
     # Warn if single test was specified but integration tests are not enabled
diff --git a/clear-elasticsearch.sh b/clear-elasticsearch.sh
new file mode 100755
index 000000000..d264ba3ce
--- /dev/null
+++ b/clear-elasticsearch.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+# Detect if script is being sourced or executed directly
+# Both setup and clear scripts must be sourced to modify the current shell's environment
+_IS_SOURCED=false
+if [ -n "${ZSH_VERSION}" ]; then
+    # In zsh, use funcstack - it has entries when sourced, empty when executed
+    # This works even when nested (sourced from another sourced script)
+    if [ ${#funcstack[@]} -gt 0 ]; then
+        _IS_SOURCED=true
+    fi
+else
+    # In bash, check BASH_SOURCE
+    if [ -n "${BASH_SOURCE[0]}" ] && [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+        _IS_SOURCED=true
+    fi
+fi
+
+if [ "${_IS_SOURCED}" = false ]; then
+    echo "WARNING: This script must be sourced to clear environment variables in your shell." >&2
+    echo "" >&2
+    echo "Usage:" >&2
+    echo "  source ${0}" >&2
+    echo "  # or" >&2
+    echo "  . ${0}" >&2
+    echo "" >&2
+    echo "Note: Both setup and clear scripts must be sourced because they modify" >&2
+    echo "environment variables (export/unset) which only work in the current shell." >&2
+    # Only exit if executed directly, not if sourced
+    exit 1
+fi
+
+# Clear Elasticsearch environment variables
+unset UNOMI_ELASTICSEARCH_CLUSTERNAME
+unset UNOMI_ELASTICSEARCH_USERNAME
+unset UNOMI_ELASTICSEARCH_PASSWORD
+unset UNOMI_ELASTICSEARCH_SSL_ENABLE
+unset UNOMI_ELASTICSEARCH_SSL_TRUST_ALL_CERTIFICATES
+
+echo "Elasticsearch environment variables cleared."
+
diff --git a/clear-opensearch.sh b/clear-opensearch.sh
new file mode 100755
index 000000000..e6789bff4
--- /dev/null
+++ b/clear-opensearch.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+# Detect if script is being sourced or executed directly
+# Both setup and clear scripts must be sourced to modify the current shell's environment
+_IS_SOURCED=false
+if [ -n "${ZSH_VERSION}" ]; then
+    # In zsh, use funcstack - it has entries when sourced, empty when executed
+    # This works even when nested (sourced from another sourced script)
+    if [ ${#funcstack[@]} -gt 0 ]; then
+        _IS_SOURCED=true
+    fi
+else
+    # In bash, check BASH_SOURCE
+    if [ -n "${BASH_SOURCE[0]}" ] && [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+        _IS_SOURCED=true
+    fi
+fi
+
+if [ "${_IS_SOURCED}" = false ]; then
+    echo "WARNING: This script must be sourced to clear environment variables in your shell." >&2
+    echo "" >&2
+    echo "Usage:" >&2
+    echo "  source ${0}" >&2
+    echo "  # or" >&2
+    echo "  . ${0}" >&2
+    echo "" >&2
+    echo "Note: Both setup and clear scripts must be sourced because they modify" >&2
+    echo "environment variables (export/unset) which only work in the current shell." >&2
+    # Only exit if executed directly, not if sourced
+    exit 1
+fi
+
+# Clear OpenSearch environment variables
+unset UNOMI_OPENSEARCH_CLUSTERNAME
+unset UNOMI_OPENSEARCH_ADDRESSES
+unset UNOMI_OPENSEARCH_USERNAME
+unset UNOMI_OPENSEARCH_PASSWORD
+unset UNOMI_OPENSEARCH_SSL_ENABLE
+unset UNOMI_OPENSEARCH_SSL_TRUST_ALL_CERTIFICATES
+
+echo "OpenSearch environment variables cleared."
+
diff --git a/common/pom.xml b/common/pom.xml
index 181a9e487..e0b2b8ef9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,23 +18,32 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>unomi-common</artifactId>
     <name>Apache Unomi :: Common Classes</name>
     <description>Common Classes used in the Apache Unomi Context server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.5</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -44,28 +53,22 @@
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${version.karaf}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.table</artifactId>
-            <version>${version.karaf}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/common/src/main/java/org/apache/unomi/common/DataTable.java b/common/src/main/java/org/apache/unomi/common/DataTable.java
index 06839fccd..21862d299 100644
--- a/common/src/main/java/org/apache/unomi/common/DataTable.java
+++ b/common/src/main/java/org/apache/unomi/common/DataTable.java
@@ -20,7 +20,6 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/create_unomi_prs.py b/create_unomi_prs.py
deleted file mode 100755
index a9ebdb9bf..000000000
--- a/create_unomi_prs.py
+++ /dev/null
@@ -1,1088 +0,0 @@
-#!/usr/bin/env python3
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-UNOMI Ticket-Based PR Creation Tool
-
-Creates PRs mapped to existing UNOMI JIRA tickets and suggests new tickets for unmapped changes.
-Includes git history validation and documentation co-location.
-
-Features:
-- Maps changes to existing UNOMI tickets (UNOMI-139, UNOMI-873, UNOMI-878, etc.)
-- Creates new ticket suggestions for unmapped functionality
-- Validates changes against git history and main branch
-- Co-locates documentation with code changes
-- Comprehensive validation and simulation modes
-"""
-
-import os
-import re
-import sys
-import json
-import argparse
-import subprocess
-from pathlib import Path
-from typing import Dict, List, Set, Tuple, Optional, NamedTuple
-from dataclasses import dataclass
-from collections import defaultdict
-import difflib
-
-class Colors:
-    RED = '\033[0;31m'
-    GREEN = '\033[0;32m'
-    YELLOW = '\033[1;33m'
-    BLUE = '\033[0;34m'
-    CYAN = '\033[0;36m'
-    PURPLE = '\033[0;35m'
-    NC = '\033[0m'
-
-@dataclass
-class CommitInfo:
-    """Information about a commit"""
-    hash: str
-    message: str
-    files: List[str]
-    unomi_tickets: Set[str]
-
-@dataclass
-class UNOMIGroup:
-    """A group of changes mapped to a UNOMI ticket"""
-    ticket: str
-    title: str
-    description: str
-    priority: str
-    files: Set[str]
-    commits: List[CommitInfo]
-    commit_count: int
-    patterns: List[str]
-    needs_new_ticket: bool = False
-
-class UNOMIPRCreator:
-    def __init__(self, source_branch="unomi-3-dev", base_branch="master"):
-        self.source_branch = source_branch
-        self.base_branch = base_branch
-        self.work_dir = Path.cwd()
-        
-        # UNOMI Ticket-based groupings
-        self.unomi_groups = {
-            # === EXISTING TICKETS ===
-            "UNOMI-139": {
-                "title": "🏢 UNOMI-139: Multi-Tenancy Support System",
-                "description": "Complete multi-tenancy implementation including API (Tenant, SecurityService, ExecutionContext), service implementations, REST endpoints, shell commands, integration tests, configuration, migration scripts, and comprehensive documentation.",
-                "patterns": [
-                    # Multi-tenancy core
-                    r".*[Tt]enant.*",
-                    r".*[Mm]ulti.*[Tt]enan.*",
-                    r"api/.*/(tenants|security|ExecutionContext)",
-                    r"api/.*/services/(ExecutionContextManager|TenantLifecycleListener)",
-                    r"services.*/tenants/",
-                    r"rest.*/tenants/",
-                    r".*[Aa]pi[Kk]ey.*",
-                    r".*[Ss]ecurity[Ss]ervice.*",
-                    r".*[Ee]xecution[Cc]ontext.*",
-                    # Associated documentation
-                    r"manual.*multitenancy",
-                    r"manual.*security",
-                    r"manual.*tenant",
-                    r"itests.*tenant.*",
-                    r"etc.*tenant"
-                ],
-                "priority": "CRITICAL",
-                "commit_patterns": [r"UNOMI-139"]
-            },
-            
-            "UNOMI-878": {
-                "title": "🧩 UNOMI-878: Enhanced Cluster-Aware Task Scheduling Service",
-                "description": "Complete scheduler service with full integration into Unomi's persistence layer. Supports clustering, node-specific execution, crash recovery, task locking, in-memory vs persistent storage, task filtering, and comprehensive developer APIs.",
-                "patterns": [
-                    r".*[Ss]chedul.*",
-                    r".*[Tt]ask.*",
-                    r"api.*tasks/",
-                    r"api.*SchedulerService",
-                    r"services.*scheduler/",
-                    r"rest.*scheduler/",
-                    r"tools.*scheduler.*",
-                    r".*scheduledTask.*",
-                    # Documentation
-                    r"manual.*schedul.*",
-                    r"manual.*task.*",
-                    r"itests.*schedul.*"
-                ],
-                "priority": "HIGH",
-                "commit_patterns": [r"UNOMI-878"]
-            },
-            
-            "UNOMI-880": {
-                "title": "🗄️ UNOMI-880: Unified Multi-Tenant Caching Service", 
-                "description": "Replaces scattered caching logic with consistent caching framework supporting multi-tenant contexts, periodic refresh, predefined-item loading, unified monitoring via Karaf shell commands, and migration of existing services like definitions and segments.",
-                "patterns": [
-                    r"^services-common/",
-                    r".*AbstractMultiTypeCachingService.*",
-                    r".*AbstractContextAwareService.*",
-                    r".*CacheableTypeConfig.*",
-                    r".*[Cc]ach.*",
-                    # Services using new caching
-                    r"services/.*/(ProfileServiceImpl|RulesService|DefinitionsServiceImpl)",
-                    # Documentation
-                    r"manual.*cach.*",
-                    r"itests.*cach.*"
-                ],
-                "priority": "HIGH", 
-                "commit_patterns": [r"UNOMI-880"]
-            },
-            
-            "UNOMI-881": {
-                "title": "🧪 UNOMI-881: New Unit Testing Framework",
-                "description": "Establishes standardized testing infrastructure with reusable base classes, InMemoryPersistenceService enhancement, optimistic concurrency control, comprehensive test utilities, and conventions across modules.",
-                "patterns": [
-                    r".*InMemoryPersistence.*",
-                    r".*Test.*\.java$",
-                    r".*test.*",
-                    r"/test/",
-                    r"itests/",
-                    # Testing infrastructure
-                    r".*BaseIT.*",
-                    r".*TestTracer.*",
-                    # Documentation  
-                    r"manual.*test.*",
-                    r"itests/README.*"
-                ],
-                "priority": "MEDIUM",
-                "commit_patterns": [r"UNOMI-881"]
-            },
-            
-            "UNOMI-882": {
-                "title": "📚 UNOMI-882: Enhanced Technical Documentation with Integrated Diagrams",
-                "description": "Improves documentation via updated guides, architecture diagrams, flowcharts, API compatibility guides, migration documentation, and comprehensive user manuals for version 3 components.",
-                "patterns": [
-                    r"^manual/.*\.(adoc|md)$",
-                    r"README.*",
-                    r".*\.md$",
-                    r".*architecture.*",
-                    r".*diagram.*",
-                    # Exclude code-specific docs (handled by their respective tickets)
-                    r"(?!.*/(src|test)/).*\.adoc$"
-                ],
-                "priority": "LOW",
-                "commit_patterns": [r"UNOMI-882"]
-            },
-            
-            "UNOMI-883": {
-                "title": "🔍 UNOMI-883: Unified Condition Validation Service",
-                "description": "Adds centralized validation mechanism for conditions, ensuring consistent enforcement across services, richer validation of parameters and types, improved developer experience, and comprehensive condition parsing.",
-                "patterns": [
-                    r"api.*ConditionValidation",
-                    r"api.*ValueTypeValidator", 
-                    r".*ConditionValidationService.*",
-                    r".*validation.*",
-                    r".*Validator.*",
-                    # JSON schema validation
-                    r".*schema.*validation.*",
-                    # Documentation
-                    r"manual.*validation.*",
-                    r"manual.*condition.*"
-                ],
-                "priority": "MEDIUM",
-                "commit_patterns": [r"UNOMI-883"]
-            },
-            
-            "UNOMI-884": {
-                "title": "🔄 UNOMI-884: Migration Scripts for V3 Upgrade",
-                "description": "Introduces migration scripts to upgrade legacy Unomi installations to version 3: adding audit fields (createdBy, lastModifiedBy, timestamps, tenantId), default tenant initialization, authentication filter enhancements, and reindexing using ElasticSearch via painless/Groovy scripts.",
-                "patterns": [
-                    r".*[Mm]igration.*",
-                    r".*[Aa]udit.*",
-                    r".*[Aa]uthentication.*[Ff]ilter.*",
-                    r".*createdBy.*",
-                    r".*lastModifiedBy.*",
-                    r".*tenantId.*",
-                    # Migration-related config changes
-                    r".*dynamic.*template.*",
-                    # Documentation
-                    r"manual.*migration.*",
-                    r"manual.*upgrade.*"
-                ],
-                "priority": "HIGH",
-                "commit_patterns": [r"UNOMI-884"]
-            },
-            
-            "UNOMI-887": {
-                "title": "🔨 UNOMI-887: Enhanced build.sh Script",
-                "description": "Refactors the project's build script (build.sh) to include colorized output, better error handling, progress tracking, configurable build options, Unicode/ASCII fallback, sections with headers, Windows support, and enhanced tool detection.",
-                "patterns": [
-                    r"^build\.sh$",
-                    r"^build\.ps1$", 
-                    r"^buildAndRun.*",
-                    r"^generate-package\.sh$",
-                    r"^compileDeploy.*",
-                    r"^BUILDING$",
-                    # Build documentation
-                    r"manual.*build.*",
-                    r"manual.*deploy.*"
-                ],
-                "priority": "LOW",
-                "commit_patterns": [r"UNOMI-887"]
-            },
-            
-            "UNOMI-888": {
-                "title": "📖 UNOMI-888: Javadoc for Import/Export Service",
-                "description": "Augments Javadoc documentation for core classes in the import/export subsystem, clarifying responsibilities for services like ImportExportConfigurationService, ProfileImportService, handling of error conditions, parameters, and integration points.",
-                "patterns": [
-                    r".*[Ii]mport.*",
-                    r".*[Ee]xport.*",
-                    r".*ImportExportConfigurationService.*",
-                    r".*ProfileImportService.*",
-                    # Documentation specific to import/export
-                    r"manual.*import.*",
-                    r"manual.*export.*"
-                ],
-                "priority": "LOW",
-                "commit_patterns": [r"UNOMI-888"]
-            },
-            
-            "UNOMI-889": {
-                "title": "🔒 UNOMI-889: Remove OGNL Scripting Support", 
-                "description": "Removes vulnerable OGNL dependency from the codebase (deprecated, insecure, incompatible with Java 17). Includes deleting OGNL dependency, replacing expressions with hard-coded property resolver, updating configs, tests, docs, and adding migration guide.",
-                "patterns": [
-                    r".*[Oo][Gg][Nn][Ll].*",
-                    r".*encryption.*extension.*",
-                    r".*scripting.*", 
-                    # Security-related removals
-                    r".*vulnerable.*",
-                    # Migration documentation
-                    r"manual.*ognl.*",
-                    r"manual.*scripting.*"
-                ],
-                "priority": "HIGH",
-                "commit_patterns": [r"UNOMI-889", r"Remove encryption extension"]
-            },
-            
-            "UNOMI-892": {
-                "title": "⚡ UNOMI-892: Build Infrastructure and CI/CD Improvements",
-                "description": "Introduces Maven build cache to speed up CI and local builds, configure cache locations, TTL, share cache between pipelines, adjust Karaf packaging and integration-test settings, GitHub workflows, and comprehensive build optimization.",
-                "patterns": [
-                    r"\.mvn/.*",
-                    r".*maven.*cache.*", 
-                    r".*build.*cache.*",
-                    r"pom\.xml$",
-                    # CI/CD improvements - expanded
-                    r"\.github/.*",
-                    r"^kar/.*",
-                    r"^package/.*",
-                    r"^lifecycle-watcher/.*",
-                    r"\.cfg$",
-                    r"\.properties$",
-                    r"feature\.xml$",
-                    r"^docker/.*",
-                    r"^etc/.*",
-                    r"\.gitignore$",
-                    r"^KEYS$",
-                    # Documentation
-                    r"manual.*maven.*",
-                    r"manual.*build.*cache.*"
-                ],
-                "priority": "LOW",
-                "commit_patterns": [r"UNOMI-892"]
-            },
-            
-            "UNOMI-897": {
-                "title": "🏃 UNOMI-897: Groovy Actions Race-Condition & Performance Fixes",
-                "description": "Addresses race condition where shared Groovy shell leaks user data across threads and scalability/memory issues under high concurrency. Includes thread-safety improvements, performance optimization, and comprehensive Groovy actions runtime fixes.",
-                "patterns": [
-                    r".*[Gg]roovy.*[Aa]ction.*",
-                    r".*GroovyActionDispatcher.*",
-                    r".*GroovyActionsService.*",
-                    r"extensions/groovy-actions/",
-                    # Performance and threading
-                    r".*race.*condition.*",
-                    r".*thread.*safety.*",
-                    # Documentation
-                    r"manual.*groovy.*"
-                ],
-                "priority": "HIGH", 
-                "commit_patterns": [r"UNOMI-897"]
-            },
-            
-            "UNOMI-873": {
-                "title": "🔍 UNOMI-873: Request Tracing & Observability Framework",
-                "description": "Complete request tracing system including API, implementation, service integration, explain parameter functionality, comprehensive observability for debugging and performance analysis, and detailed tracing documentation.",
-                "patterns": [
-                    r"^tracing/",
-                    r".*[Tt]rac.*",
-                    r".*explain.*",
-                    r".*[Ee]xplain.*",
-                    r".*TracerService.*",
-                    r".*RequestTracer.*",
-                    r".*TraceNode.*", 
-                    r"services/.*TestTracer.*",
-                    # Documentation
-                    r"manual.*tracing.*",
-                    r"manual.*explain.*",
-                    r"rest.*[Tt]rac.*",
-                    r"api.*[Tt]rac.*"
-                ],
-                "priority": "MEDIUM",
-                "commit_patterns": [r"UNOMI-873"]
-            },
-            
-            "UNOMI-877": {
-                "title": "🏥 UNOMI-877: Enhanced Cluster Health & Service Management",
-                "description": "Remove problematic cluster services (Karaf Cellar, Hazelcast) and replace with PersistenceService-based cluster synchronization. Includes ClusterHealthCheckProvider, server information management, and improved cluster stability.",
-                "patterns": [
-                    r".*[Cc]luster.*[Hh]ealth.*",
-                    r".*ClusterService.*",
-                    r".*ClusterHealthCheckProvider.*",
-                    r".*[Hh]ealth.*[Cc]heck.*",
-                    r".*[Ss]erver.*[Ii]nfo.*",
-                    # Legacy removal patterns
-                    r".*Karaf.*Cellar.*",
-                    r".*Hazelcast.*",
-                    # Documentation
-                    r"manual.*cluster.*",
-                    r"manual.*health.*"
-                ],
-                "priority": "MEDIUM", 
-                "commit_patterns": [r"UNOMI-877"]
-            },
-
-            # === NEW TICKETS FOR UNMAPPED FUNCTIONALITY ===
-            "UNOMI-904": {
-                "title": "🔐 UNOMI-904: Enhanced Security Permission System",
-                "description": "Refactor security system to replace 'operation' terminology with 'permission' for standardized access control management. Includes comprehensive permission-based authorization across all services and improved security context handling.",
-                "patterns": [
-                    r".*[Pp]ermission.*",
-                    r".*[Oo]peration.*[Pp]ermission.*",
-                    r".*security.*permission.*",
-                    r".*authorization.*"
-                ],
-                "priority": "HIGH",
-                "commit_patterns": [r"Replace.*operation.*permission", r"permission.*role"],
-                "needs_new_ticket": True
-            },
-            
-            "UNOMI-905": {
-                "title": "🎯 UNOMI-905: Segment Condition Evaluation Engine Improvements", 
-                "description": "Enhanced segment condition evaluation with bug fixes for past event conditions, improved calculation algorithms, better condition resolution, segment bug fixes, and comprehensive condition architecture improvements. Excludes GraphQL condition factories which belong to GraphQL ticket.",
-                "patterns": [
-                    r".*[Ss]egment.*[Cc]ondition.*",
-                    r".*[Pp]ast.*[Ee]vent.*[Cc]ondition.*", 
-                    r".*condition.*evaluation.*",
-                    r".*[Ss]egment.*bug.*",
-                    r".*ParserHelper.*",
-                    r".*ConditionEvaluator.*",
-                    r"persistence.*conditions.*ConditionEvaluatorDispatcher.*",
-                    r".*[Ss]egment.*[Ss]ervice.*"
-                ],
-                "priority": "HIGH",
-                "commit_patterns": [r"segment.*condition", r"past.*event.*condition", r"condition.*bug", r"Bugfixes.*segment.*condition"],
-                "needs_new_ticket": True
-            },
-            
-            "UNOMI-906": {
-                "title": "🛠️ UNOMI-906: Unified Shell Commands Framework",
-                "description": "Replace individual item type CRUD commands with unified unomi:crud command supporting any object type. Includes enhanced shell dev commands with tenant ID display, ID completion, and comprehensive command consolidation.",
-                "patterns": [
-                    r"tools/shell-dev-commands/",
-                    r".*[Ss]hell.*[Cc]ommand.*",
-                    r".*CRUD.*[Cc]ommand.*",
-                    r".*unomi:crud.*"
-                ],
-                "priority": "MEDIUM",
-                "commit_patterns": [r"shell.*command", r"CRUD.*command", r"custom.*item.*type.*CRUD"],
-                "needs_new_ticket": True
-            },
-            
-            "UNOMI-907": {
-                "title": "🖥️ UNOMI-907: Cross-Platform Build Support",
-                "description": "Add Windows compatibility to build system with Windows build script (build.ps1), enhanced tool detection, cross-platform development experience, and comprehensive build system improvements for multiple operating systems.",
-                "patterns": [
-                    r".*[Ww]indows.*",
-                    r".*\.ps1$",
-                    r".*cross.*platform.*",
-                    r".*tool.*detection.*"
-                ],
-                "priority": "LOW",
-                "commit_patterns": [r"Windows.*build", r"cross.*platform", r"tool.*detection"],
-                "needs_new_ticket": True
-            },
-            
-            "UNOMI-909": {
-                "title": "🌐 UNOMI-909: GraphQL and REST API Enhancements",
-                "description": "Complete GraphQL system improvements with modern UI, enhanced REST endpoints, API enhancements, web interfaces, and comprehensive API-related functionality. Includes GraphQL condition factories and parsers that were incorrectly grouped elsewhere.",
-                "patterns": [
-                    r"^graphql/.*",
-                    r"^rest/.*",
-                    r"^wab/.*", 
-                    r"^metrics/.*",
-                    # GraphQL condition factories belong here, not in condition evaluation
-                    r"graphql.*condition.*factories.*",
-                    r"graphql.*condition.*parsers.*",
-                    # Core API classes (excluding infrastructure APIs covered by other tickets)
-                    r"^api/src/main/java/org/apache/unomi/api/(?!tenants|security|ExecutionContext|services|tasks|conditions).*",
-                    r".*GraphQL.*",
-                    r".*REST.*",
-                    # Documentation
-                    r"manual.*graphql.*",
-                    r"manual.*rest.*",
-                    r"manual.*api.*"
-                ],
-                "priority": "MEDIUM",
-                "commit_patterns": [r"GraphQL.*bug.*fix", r"REST.*endpoint", r"API.*compatibility", r"GraphQL.*bug.*fixes"],
-                "needs_new_ticket": True
-            }
-        }
-
-    def run_git_command(self, cmd: List[str]) -> str:
-        """Run a git command and return output"""
-        try:
-            result = subprocess.run(['git'] + cmd, capture_output=True, text=True, check=True)
-            return result.stdout.strip()
-        except subprocess.CalledProcessError as e:
-            print(f"{Colors.RED}Git command failed: {' '.join(cmd)}{Colors.NC}")
-            print(f"{Colors.RED}Error: {e.stderr}{Colors.NC}")
-            return ""
-
-    def validate_git_history(self) -> bool:
-        """Validate git history and branch comparison"""
-        print(f"\n{Colors.BLUE}🔍 Validating Git History and Branch Comparison{Colors.NC}")
-        
-        # Check branches exist
-        branches = self.run_git_command(['branch', '-a']).split('\n')
-        source_exists = any(self.source_branch in branch for branch in branches)
-        base_exists = any(self.base_branch in branch for branch in branches) 
-        
-        if not source_exists:
-            print(f"{Colors.RED}❌ Source branch '{self.source_branch}' not found{Colors.NC}")
-            return False
-            
-        if not base_exists:
-            print(f"{Colors.RED}❌ Base branch '{self.base_branch}' not found{Colors.NC}")
-            return False
-        
-        # Get commit counts
-        ahead_count = self.run_git_command(['rev-list', '--count', f'{self.base_branch}..{self.source_branch}'])
-        behind_count = self.run_git_command(['rev-list', '--count', f'{self.source_branch}..{self.base_branch}'])
-        
-        print(f"{Colors.GREEN}✅ Branch validation successful:{Colors.NC}")
-        print(f"  • Source branch '{self.source_branch}': {ahead_count} commits ahead of {self.base_branch}")
-        print(f"  • Base branch '{self.base_branch}': {behind_count} commits ahead of {self.source_branch}")
-        
-        # Validate no conflicts
-        merge_base = self.run_git_command(['merge-base', self.source_branch, self.base_branch])
-        if merge_base:
-            print(f"  • Merge base: {merge_base[:8]}")
-        
-        return True
-
-    def get_commit_info(self) -> List[CommitInfo]:
-        """Get detailed commit information with UNOMI ticket mapping"""
-        commits = []
-        
-        # Get all commits between branches
-        commit_output = self.run_git_command([
-            'log', f'{self.base_branch}..{self.source_branch}', 
-            '--pretty=format:%H|%s', '--reverse'
-        ])
-        
-        if not commit_output:
-            return commits
-            
-        for line in commit_output.split('\n'):
-            if '|' not in line:
-                continue
-                
-            hash_part, message = line.split('|', 1)
-            
-            # Get files for this commit  
-            files = self.run_git_command(['show', '--name-only', '--pretty=format:', hash_part])
-            file_list = [f for f in files.split('\n') if f.strip()]
-            
-            # Extract UNOMI tickets
-            unomi_tickets = set(re.findall(r'UNOMI-\d+', message))
-            
-            commits.append(CommitInfo(
-                hash=hash_part,
-                message=message,
-                files=file_list,
-                unomi_tickets=unomi_tickets
-            ))
-        
-        return commits
-
-    def get_changed_files(self) -> List[str]:
-        """Get all files changed between base and source branch"""
-        output = self.run_git_command(['diff', f'{self.base_branch}...{self.source_branch}', '--name-only'])
-        return [f for f in output.split('\n') if f.strip()]
-
-    def classify_file_to_unomi_ticket(self, file_path: str, commits: List[CommitInfo]) -> Optional[str]:
-        """Classify a file to a UNOMI ticket using patterns and commit history"""
-        
-        # First, check if file is in commits with explicit UNOMI tickets
-        for commit in commits:
-            if file_path in commit.files and commit.unomi_tickets:
-                # Return the first UNOMI ticket found
-                return list(commit.unomi_tickets)[0]
-        
-        # Then use pattern matching
-        for ticket, group_info in self.unomi_groups.items():
-            for pattern in group_info["patterns"]:
-                if re.search(pattern, file_path):
-                    return ticket
-        
-        # Check commit message patterns for files without explicit UNOMI tickets
-        for commit in commits:
-            if file_path in commit.files:
-                for ticket, group_info in self.unomi_groups.items():
-                    if "commit_patterns" in group_info:
-                        for pattern in group_info["commit_patterns"]:
-                            if re.search(pattern, commit.message, re.IGNORECASE):
-                                return ticket
-        
-        return None
-
-    def ensure_documentation_colocation(self, groups: Dict[str, UNOMIGroup]) -> None:
-        """Ensure documentation is co-located with related code changes"""
-        print(f"\n{Colors.CYAN}📚 Ensuring Documentation Co-location{Colors.NC}")
-        
-        # Documentation patterns and their related code patterns
-        doc_mappings = {
-            r"manual.*multitenancy": ["UNOMI-139"],
-            r"manual.*schedul.*": ["UNOMI-878"],
-            r"manual.*cach.*": ["UNOMI-880"], 
-            r"manual.*test.*": ["UNOMI-881"],
-            r"manual.*validation.*": ["UNOMI-883"],
-            r"manual.*migration.*": ["UNOMI-884"],
-            r"manual.*build.*": ["UNOMI-887"],
-            r"manual.*import.*": ["UNOMI-888"],
-            r"manual.*tracing.*": ["UNOMI-873"],
-            r"manual.*cluster.*": ["UNOMI-877"],
-            r"manual.*groovy.*": ["UNOMI-897"]
-        }
-        
-        # Move documentation files to appropriate groups
-        doc_moves = 0
-        for group_name, group in groups.items():
-            if group_name == "UNOMI-882":  # Skip dedicated docs ticket
-                continue
-                
-            files_to_move = set()
-            for file in group.files:
-                for doc_pattern, target_tickets in doc_mappings.items():
-                    if re.search(doc_pattern, file) and group_name in target_tickets:
-                        files_to_move.add(file)
-            
-            if files_to_move:
-                # Remove from documentation group
-                if "UNOMI-882" in groups:
-                    groups["UNOMI-882"].files -= files_to_move
-                    doc_moves += len(files_to_move)
-                
-                print(f"  • Moved {len(files_to_move)} doc files to {group_name}")
-        
-        print(f"  • Total documentation files co-located: {doc_moves}")
-
-    def analyze_and_group_changes(self) -> Dict[str, UNOMIGroup]:
-        """Analyze changes and group them by UNOMI tickets"""
-        print(f"\n{Colors.CYAN}🔍 Analyzing Changes and Grouping by UNOMI Tickets{Colors.NC}")
-        
-        commits = self.get_commit_info()
-        changed_files = self.get_changed_files()
-        
-        print(f"  • Found {len(commits)} commits")
-        print(f"  • Found {len(changed_files)} changed files")
-        
-        # Group files by UNOMI tickets
-        ticket_groups = defaultdict(set)
-        unmapped_files = set()
-        
-        for file_path in changed_files:
-            ticket = self.classify_file_to_unomi_ticket(file_path, commits)
-            if ticket:
-                ticket_groups[ticket].add(file_path)
-            else:
-                unmapped_files.add(file_path)
-        
-        # Create UNOMIGroup objects
-        groups = {}
-        for ticket, files in ticket_groups.items():
-            if ticket in self.unomi_groups:
-                group_info = self.unomi_groups[ticket]
-                
-                # Get commits for this ticket
-                ticket_commits = [c for c in commits if ticket in c.unomi_tickets or 
-                                any(f in files for f in c.files)]
-                
-                groups[ticket] = UNOMIGroup(
-                    ticket=ticket,
-                    title=group_info["title"],
-                    description=group_info["description"],
-                    priority=group_info["priority"],
-                    files=files,
-                    commits=ticket_commits,
-                    commit_count=len(ticket_commits),
-                    patterns=group_info["patterns"],
-                    needs_new_ticket=group_info.get("needs_new_ticket", False)
-                )
-        
-        # Handle unmapped files - create a miscellaneous group
-        if unmapped_files:
-            unmapped_commits = [c for c in commits if 
-                              any(f in unmapped_files for f in c.files) and 
-                              not c.unomi_tickets]
-            
-            groups["UNOMI-908"] = UNOMIGroup(
-                ticket="UNOMI-908",
-                title="🔧 UNOMI-908: Miscellaneous Improvements and Fixes",
-                description="Various improvements, bug fixes, and enhancements that don't fit into existing UNOMI ticket categories. Includes performance optimizations, minor feature additions, and general code improvements.",
-                priority="LOW",
-                files=unmapped_files,
-                commits=unmapped_commits,
-                commit_count=len(unmapped_commits),
-                patterns=[],
-                needs_new_ticket=True
-            )
-        
-        # Ensure documentation co-location
-        self.ensure_documentation_colocation(groups)
-        
-        return groups
-
-    def validate_groupings(self, groups: Dict[str, UNOMIGroup]) -> bool:
-        """Validate UNOMI ticket groupings"""
-        print(f"\n{Colors.BLUE}🔍 Validating UNOMI Ticket Groupings{Colors.NC}")
-        
-        all_changed_files = set(self.get_changed_files())
-        grouped_files = set()
-        validation_errors = 0
-        
-        # Validate each group
-        for ticket, group in groups.items():
-            print(f"{Colors.GREEN}🎫 {ticket}: {len(group.files)} files, {group.commit_count} commits (Priority: {group.priority}){Colors.NC}")
-            
-            # Check for file overlaps
-            overlap = grouped_files.intersection(group.files)
-            if overlap:
-                print(f"{Colors.RED}⚠️  OVERLAP in {ticket}: {list(overlap)[:3]}{'...' if len(overlap) > 3 else ''}{Colors.NC}")
-                validation_errors += 1
-            
-            grouped_files.update(group.files)
-            
-            # Show if new ticket is needed
-            if group.needs_new_ticket:
-                print(f"{Colors.YELLOW}   📝 NEW TICKET NEEDED{Colors.NC}")
-        
-        # Check for unmatched files
-        unmatched = all_changed_files - grouped_files
-        if unmatched:
-            print(f"\n{Colors.RED}❌ UNMATCHED FILES ({len(unmatched)}):${Colors.NC}")
-            for file in sorted(list(unmatched))[:5]:
-                print(f"  {file}")
-            if len(unmatched) > 5:
-                print(f"  ... and {len(unmatched) - 5} more")
-            validation_errors += 1
-        
-        print(f"\n{Colors.CYAN}📊 Validation Summary:{Colors.NC}")
-        print(f"  • Total files: {len(all_changed_files)}")
-        print(f"  • Grouped files: {len(grouped_files)}")
-        print(f"  • UNOMI tickets: {len(groups)}")
-        print(f"  • New tickets needed: {sum(1 for g in groups.values() if g.needs_new_ticket)}")
-        print(f"  • Validation errors: {validation_errors}")
-        
-        if validation_errors == 0:
-            print(f"{Colors.GREEN}✅ UNOMI ticket groupings are valid!{Colors.NC}")
-            return True
-        else:
-            print(f"{Colors.RED}❌ Groupings have issues that need attention{Colors.NC}")
-            return False
-
-    def show_unomi_summary(self, groups: Dict[str, UNOMIGroup]) -> None:
-        """Show comprehensive UNOMI ticket summary"""
-        print(f"\n{Colors.BLUE}🎯 UNOMI TICKET-BASED PR SUMMARY{Colors.NC}")
-        print("=" * 80)
-        
-        # Group by existing vs new tickets
-        existing_tickets = {k: v for k, v in groups.items() if not v.needs_new_ticket}
-        new_tickets = {k: v for k, v in groups.items() if v.needs_new_ticket}
-        
-        # Sort by priority
-        priority_order = {"CRITICAL": 0, "HIGH": 1, "MEDIUM": 2, "LOW": 3}
-        
-        def sort_key(item):
-            return (priority_order.get(item[1].priority, 4), item[0])
-        
-        print(f"\n{Colors.GREEN}✅ EXISTING UNOMI TICKETS ({len(existing_tickets)} tickets){Colors.NC}")
-        print("-" * 60)
-        
-        for ticket, group in sorted(existing_tickets.items(), key=sort_key):
-            priority_color = Colors.RED if group.priority == 'CRITICAL' else Colors.YELLOW if group.priority == 'HIGH' else Colors.CYAN
-            print(f"  {priority_color}{ticket:<12}{Colors.NC} | {len(group.files):3d} files | {group.commit_count:2d} commits | {group.priority}")
-            print(f"    {group.title}")
-        
-        if new_tickets:
-            print(f"\n{Colors.PURPLE}🆕 NEW UNOMI TICKETS NEEDED ({len(new_tickets)} tickets){Colors.NC}")
-            print("-" * 60)
-            
-            for ticket, group in sorted(new_tickets.items(), key=sort_key):
-                priority_color = Colors.RED if group.priority == 'CRITICAL' else Colors.YELLOW if group.priority == 'HIGH' else Colors.CYAN
-                print(f"  {priority_color}{ticket:<12}{Colors.NC} | {len(group.files):3d} files | {group.commit_count:2d} commits | {group.priority}")
-                print(f"    {group.title}")
-        
-        total_files = sum(len(g.files) for g in groups.values())
-        total_commits = sum(g.commit_count for g in groups.values())
-        
-        print(f"\n{Colors.CYAN}📊 TOTALS:{Colors.NC}")
-        print(f"  • Total UNOMI tickets: {len(groups)}")
-        print(f"  • Existing tickets: {len(existing_tickets)}")  
-        print(f"  • New tickets needed: {len(new_tickets)}")
-        print(f"  • Total files: {total_files}")
-        print(f"  • Total commits: {total_commits}")
-        print(f"  • Average files per ticket: {total_files / len(groups):.1f}")
-
-    def simulate_pr_creation(self, groups: Dict[str, UNOMIGroup]) -> None:
-        """Simulate UNOMI ticket-based PR creation"""
-        print(f"\n{Colors.PURPLE}🔬 SIMULATION: UNOMI Ticket-Based PR Creation{Colors.NC}")
-        
-        # Sort by priority and ticket number
-        priority_order = {"CRITICAL": 0, "HIGH": 1, "MEDIUM": 2, "LOW": 3}
-        sorted_groups = sorted(groups.items(), 
-                             key=lambda x: (priority_order.get(x[1].priority, 4), x[0]))
-        
-        for i, (ticket, group) in enumerate(sorted_groups, 1):
-            status = "🆕 NEW TICKET" if group.needs_new_ticket else "✅ EXISTING"
-            
-            print(f"\n{Colors.CYAN}📁 PR {i}: {ticket} ({status}){Colors.NC}")
-            print(f"{Colors.BLUE}Title: {group.title}{Colors.NC}")
-            print(f"{Colors.YELLOW}Priority: {group.priority}{Colors.NC}")
-            print(f"{Colors.GREEN}Files: {len(group.files)} | Commits: {group.commit_count}{Colors.NC}")
-            
-            # Show sample files
-            sample_files = sorted(list(group.files))[:8]
-            for file in sample_files:
-                print(f"  • {file}")
-            if len(group.files) > 8:
-                print(f"  ... and {len(group.files) - 8} more files")
-            
-            # Show sample commits  
-            if group.commits:
-                print(f"{Colors.PURPLE}Recent commits:{Colors.NC}")
-                for commit in group.commits[-3:]:
-                    print(f"  {commit.hash[:8]} {commit.message[:60]}...")
-
-    def create_pr_for_group(self, ticket: str, group: UNOMIGroup) -> bool:
-        """Create a PR for a specific UNOMI ticket group"""
-        print(f"\n{Colors.GREEN}Creating PR for {ticket}{Colors.NC}")
-        
-        # Create branch name
-        branch_name = f"{ticket.lower()}-implementation"
-        
-        try:
-            # Create branch from base
-            self.run_git_command(['checkout', self.base_branch])
-            self.run_git_command(['pull', 'origin', self.base_branch])
-            
-            # Check if branch exists
-            existing_branches = self.run_git_command(['branch', '-a'])
-            if branch_name in existing_branches:
-                print(f"{Colors.YELLOW}⚠️  Branch {branch_name} already exists, using existing{Colors.NC}")
-                self.run_git_command(['checkout', branch_name])
-            else:
-                self.run_git_command(['checkout', '-b', branch_name])
-            
-            # Apply changes for specific files
-            self.apply_file_changes(group.files)
-            
-            # Stage changes
-            self.run_git_command(['add', '.'])
-            
-            # Create commit message
-            status_indicator = "🆕" if group.needs_new_ticket else "✅"
-            commit_message = f"""{status_indicator} {group.title}
-
-{group.description}
-
-Changes:
-- Files modified: {len(group.files)}
-- Commits integrated: {group.commit_count}
-- Priority: {group.priority}
-
-{f'🆕 NEW TICKET REQUIRED: This functionality needs a new JIRA ticket to be created.' if group.needs_new_ticket else '✅ EXISTING TICKET: Maps to existing UNOMI JIRA ticket.'}
-
-🤖 Generated with UNOMI Ticket-Based PR Creation Tool
-Co-Authored-By: Claude <no...@anthropic.com>
-"""
-            
-            # Commit changes
-            result = subprocess.run(['git', 'commit', '-m', commit_message], 
-                                  capture_output=True, text=True)
-            
-            if result.returncode != 0:
-                if "nothing to commit" in result.stdout:
-                    print(f"{Colors.YELLOW}⚠️  No changes to commit for {ticket}{Colors.NC}")
-                    self.run_git_command(['checkout', self.base_branch])
-                    return False
-                else:
-                    print(f"{Colors.RED}❌ Commit failed: {result.stderr}{Colors.NC}")
-                    return False
-            
-            # Push branch
-            push_result = self.run_git_command(['push', '-u', 'origin', branch_name])
-            if not push_result and "fatal" in push_result:
-                print(f"{Colors.RED}❌ Push failed for {ticket}{Colors.NC}")
-                return False
-            
-            # Create PR using GitHub CLI
-            pr_title = group.title
-            pr_body = self.generate_pr_body(group)
-            
-            subprocess.run([
-                'gh', 'pr', 'create',
-                '--title', pr_title,
-                '--body', pr_body,
-                '--base', self.base_branch,
-                '--head', branch_name
-            ])
-            
-            print(f"{Colors.GREEN}✅ Created PR for {ticket}: {branch_name}{Colors.NC}")
-            return True
-            
-        except Exception as e:
-            print(f"{Colors.RED}❌ Error creating PR for {ticket}: {e}{Colors.NC}")
-            return False
-
-    def apply_file_changes(self, files: Set[str]) -> None:
-        """Apply changes for specific files using git"""
-        temp_patch = "/tmp/unomi_pr.patch"
-        
-        with open(temp_patch, 'w') as f:
-            for file in files:
-                diff_output = self.run_git_command(['diff', f'{self.base_branch}...{self.source_branch}', '--', file])
-                if diff_output:
-                    f.write(diff_output + '\n')
-        
-        if os.path.getsize(temp_patch) > 0:
-            result = subprocess.run(['git', 'apply', temp_patch], capture_output=True)
-            if result.returncode != 0:
-                # Try 3-way merge
-                subprocess.run(['git', 'apply', '--3way', temp_patch])
-        
-        os.remove(temp_patch)
-
-    def generate_pr_body(self, group: UNOMIGroup) -> str:
-        """Generate comprehensive PR body for UNOMI ticket"""
-        status = "🆕 **NEW JIRA TICKET REQUIRED**" if group.needs_new_ticket else "✅ **EXISTING JIRA TICKET**"
-        
-        # Generate file categories
-        file_categories = defaultdict(list)
-        for file in sorted(group.files):
-            if file.startswith('api/'):
-                file_categories['API Changes'].append(file)
-            elif file.startswith('services/'):
-                file_categories['Service Implementation'].append(file)
-            elif file.startswith('rest/'):
-                file_categories['REST Endpoints'].append(file)
-            elif file.startswith('extensions/'):
-                file_categories['Extensions'].append(file)
-            elif file.startswith('manual/'):
-                file_categories['Documentation'].append(file)
-            elif file.startswith('itests/'):
-                file_categories['Integration Tests'].append(file)
-            elif 'test' in file.lower():
-                file_categories['Unit Tests'].append(file)
-            else:
-                file_categories['Configuration & Build'].append(file)
-        
-        file_breakdown = ""
-        for category, files in file_categories.items():
-            file_breakdown += f"\n### {category} ({len(files)} files)\n"
-            for file in files[:5]:  # Show first 5 files
-                file_breakdown += f"- `{file}`\n"
-            if len(files) > 5:
-                file_breakdown += f"- ... and {len(files) - 5} more files\n"
-        
-        return f"""## {group.ticket}: UNOMI Ticket Implementation
-
-{status}
-
-### Summary
-{group.description}
-
-### Changes Overview
-- **Files Changed**: {len(group.files)}
-- **Commits Integrated**: {group.commit_count}
-- **Priority**: {group.priority}
-
-### File Breakdown
-{file_breakdown}
-
-### UNOMI Integration Benefits
-- ✅ **Ticket-Based Organization**: All changes mapped to specific UNOMI functionality
-- ✅ **Documentation Co-location**: Related documentation included with code changes  
-- ✅ **Complete Feature Implementation**: API + services + REST + tests + config together
-- ✅ **Git History Validation**: Changes verified against commit history and main branch
-- ✅ **Comprehensive Testing**: Integration tests and unit tests included
-
-### Testing Checklist
-- [ ] Build passes: `./build.sh`
-- [ ] Integration tests pass: `./itests/kt.sh`
-- [ ] Unit tests pass for modified services
-- [ ] Documentation builds correctly
-- [ ] No regressions in existing functionality
-
-### Review Notes
-This PR implements {group.ticket} functionality with comprehensive changes across the entire stack.
-{f'**Action Required**: Create JIRA ticket {group.ticket} before merging this PR.' if group.needs_new_ticket else f'**JIRA Reference**: This PR implements existing ticket {group.ticket}.'}
-
-### Validation
-- ✅ Git history validated against `{self.source_branch}` and `{self.base_branch}`
-- ✅ Documentation co-located with related code changes
-- ✅ All file patterns verified and mapped to UNOMI ticket
-
-🤖 Generated with UNOMI Ticket-Based PR Creation Tool
-
-Co-Authored-By: Claude <no...@anthropic.com>
-"""
-
-    def create_all_prs(self, groups: Dict[str, UNOMIGroup]) -> None:
-        """Create all UNOMI ticket-based PRs in dependency order"""
-        print(f"\n{Colors.BLUE}🚀 Creating UNOMI Ticket-Based PRs in Dependency Order{Colors.NC}")
-        
-        # DEPENDENCY-AWARE CREATION ORDER (based on semantic analysis)
-        dependency_order = [
-            # Phase 1: Core Infrastructure (CRITICAL - Must merge first)
-            "UNOMI-139",  # Multi-Tenancy - Foundation for all tenant-aware features
-            "UNOMI-897",  # Groovy Actions Fixes - Critical performance/data integrity
-            
-            # Phase 2: Framework Services (HIGH - Merge after core)
-            "UNOMI-880",  # Caching - Required by multiple services  
-            "UNOMI-884",  # Migration Scripts - Schema changes before service enhancements
-            "UNOMI-878",  # Task Scheduling - Core service functionality
-            
-            # Phase 3: Cross-cutting Concerns (MEDIUM - Merge after frameworks)
-            "UNOMI-881",  # Testing Framework - Enables comprehensive testing
-            "UNOMI-873",  # Request Tracing - Observability across all services
-            "UNOMI-883",  # Condition Validation - Service validation framework
-            "UNOMI-877",  # Cluster Health - Health monitoring system
-            
-            # Phase 4: API & Extensions (MEDIUM - Merge after services)
-            "UNOMI-905",  # Segment Condition Evaluation - Core condition logic
-            "UNOMI-909",  # GraphQL & REST APIs - API layer enhancements  
-            "UNOMI-906",  # Shell Commands - Administrative tools
-            
-            # Phase 5: Infrastructure & Documentation (LOW - Merge last)
-            "UNOMI-887",  # Build Scripts - Build improvements
-            "UNOMI-888",  # Javadoc - Documentation improvements
-            "UNOMI-892",  # CI/CD - Infrastructure improvements
-            "UNOMI-882",  # Documentation - User-facing documentation
-            "UNOMI-908",  # Miscellaneous - Remaining improvements
-        ]
-        
-        successful_prs = 0
-        failed_prs = 0
-        
-        print(f"{Colors.CYAN}📋 Creating PRs in dependency-aware order:{Colors.NC}")
-        for phase, tickets in enumerate([
-            dependency_order[0:2],   # Phase 1: Core Infrastructure
-            dependency_order[2:5],   # Phase 2: Framework Services  
-            dependency_order[5:9],   # Phase 3: Cross-cutting Concerns
-            dependency_order[9:12],  # Phase 4: API & Extensions
-            dependency_order[12:],   # Phase 5: Infrastructure & Documentation
-        ], 1):
-            phase_names = ["Core Infrastructure", "Framework Services", "Cross-cutting Concerns", "API & Extensions", "Infrastructure & Documentation"]
-            print(f"\n{Colors.PURPLE}Phase {phase}: {phase_names[phase-1]}{Colors.NC}")
-            
-            for ticket in tickets:
-                if ticket not in groups:
-                    print(f"{Colors.YELLOW}⚠️  Skipping {ticket} - not found in groups{Colors.NC}")
-                    continue
-                    
-                group = groups[ticket]
-                if not group.files:
-                    print(f"{Colors.YELLOW}⚠️  Skipping {ticket} - no files{Colors.NC}")
-                    continue
-                    
-                if self.create_pr_for_group(ticket, group):
-                    successful_prs += 1
-                else:
-                    failed_prs += 1
-        
-        print(f"\n{Colors.CYAN}📊 PR Creation Summary:{Colors.NC}")
-        print(f"  • Successful PRs: {successful_prs}")
-        print(f"  • Failed PRs: {failed_prs}")
-        print(f"  • Total attempted: {successful_prs + failed_prs}")
-        print(f"\n{Colors.GREEN}🎯 Dependency Order Benefits:{Colors.NC}")
-        print(f"  • Core infrastructure merged first (UNOMI-139, UNOMI-897)")
-        print(f"  • Framework services depend on core (UNOMI-880, UNOMI-878)")
-        print(f"  • Cross-cutting concerns use frameworks (tracing, validation)")
-        print(f"  • API/Extensions build on services (GraphQL, REST)")
-        print(f"  • Infrastructure improvements merged last")
-
-    def main(self):
-        """Main execution method"""
-        parser = argparse.ArgumentParser(
-            description="UNOMI Ticket-Based PR Creation Tool",
-            epilog="""
-Examples:
-  python3 create_unomi_prs.py --validate      # Validate UNOMI ticket mappings
-  python3 create_unomi_prs.py --summary       # Show UNOMI ticket summary
-  python3 create_unomi_prs.py --simulate      # Simulate PR creation
-  python3 create_unomi_prs.py                 # Create actual PRs
-            """,
-            formatter_class=argparse.RawDescriptionHelpFormatter
-        )
-        parser.add_argument('--simulate', action='store_true', 
-                          help='Simulate PR creation without making actual changes')
-        parser.add_argument('--validate', action='store_true', 
-                          help='Validate UNOMI ticket groupings')
-        parser.add_argument('--summary', action='store_true', 
-                          help='Show UNOMI ticket-based summary')
-        parser.add_argument('--source', default='unomi-3-dev',
-                          help='Source branch (default: unomi-3-dev)')
-        parser.add_argument('--base', default='master', 
-                          help='Base branch (default: master)')
-        
-        args = parser.parse_args()
-        
-        self.source_branch = args.source
-        self.base_branch = args.base
-        
-        # Validate git environment
-        if not self.validate_git_history():
-            sys.exit(1)
-        
-        # Analyze and group changes
-        groups = self.analyze_and_group_changes()
-        
-        # Execute requested operation
-        if args.validate:
-            print(f"{Colors.BLUE}✅ Running UNOMI ticket validation{Colors.NC}")
-            if self.validate_groupings(groups):
-                sys.exit(0)
-            else:
-                sys.exit(1)
-        elif args.summary:
-            print(f"{Colors.CYAN}📊 Generating UNOMI ticket summary{Colors.NC}")
-            self.show_unomi_summary(groups)
-        elif args.simulate:
-            print(f"{Colors.YELLOW}🔬 Running UNOMI PR simulation{Colors.NC}")
-            self.simulate_pr_creation(groups)
-        else:
-            print(f"{Colors.BLUE}🎯 Creating UNOMI ticket-based PRs{Colors.NC}")
-            self.create_all_prs(groups)
-
-if __name__ == "__main__":
-    creator = UNOMIPRCreator()
-    creator.main()
\ No newline at end of file
diff --git a/docker/README.md b/docker/README.md
index b6dce3c4f..8917a7323 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -51,26 +51,26 @@ For ElasticSearch:
 
 For OpenSearch:
 
-    docker pull opensearchproject/opensearch:2.18.0
+    docker pull opensearchproject/opensearch:3.0.0
     docker network create unomi
     export OPENSEARCH_ADMIN_PASSWORD=enter_your_custom_admin_password_here
-    docker run --name opensearch --net unomi -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD} opensearchproject/opensearch:2.18.0
+    docker run --name opensearch --net unomi -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD} opensearchproject/opensearch:3.0.0
     
 For Unomi (with ElasticSearch):
 
-    docker pull apache/unomi:2.7.0-SNAPSHOT
+    docker pull apache/unomi:3.1.0-SNAPSHOT
     docker run --name unomi --net unomi -p 8181:8181 -p 9443:9443 -p 8102:8102 \
         -e UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200 \
-        apache/unomi:2.7.0-SNAPSHOT
+        apache/unomi:3.1.0-SNAPSHOT
 
 For Unomi (with OpenSearch):
 
-    docker pull apache/unomi:2.7.0-SNAPSHOT
+    docker pull apache/unomi:3.1.0-SNAPSHOT
     docker run --name unomi --net unomi -p 8181:8181 -p 9443:9443 -p 8102:8102 \
         -e UNOMI_AUTO_START=opensearch \
         -e UNOMI_OPENSEARCH_ADDRESSES=opensearch:9200 \
         -e UNOMI_OPENSEARCH_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD} \
-        apache/unomi:2.7.0-SNAPSHOT
+        apache/unomi:3.1.0-SNAPSHOT
 
 ## Using a host OS Search Engine installation (only supported on macOS & Windows)
 
@@ -78,7 +78,7 @@ For ElasticSearch:
 
     docker run --name unomi -p 8181:8181 -p 9443:9443 -p 8102:8102 \
         -e UNOMI_ELASTICSEARCH_ADDRESSES=host.docker.internal:9200 \
-        apache/unomi:2.7.0-SNAPSHOT
+        apache/unomi:3.1.0-SNAPSHOT
 
 For OpenSearch:
 
@@ -86,7 +86,7 @@ For OpenSearch:
         -e UNOMI_AUTO_START=opensearch \
         -e UNOMI_OPENSEARCH_ADDRESSES=host.docker.internal:9200 \
         -e UNOMI_OPENSEARCH_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD} \
-        apache/unomi:2.7.0-SNAPSHOT
+        apache/unomi:3.1.0-SNAPSHOT
 
 Note: Linux doesn't support the host.docker.internal DNS lookup method yet, it should be available in an upcoming version of Docker. See https://github.com/docker/for-linux/issues/264
 
diff --git a/docker/pom.xml b/docker/pom.xml
index eb50b38a0..02b002ee4 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -29,6 +29,18 @@
     <name>Apache Unomi :: Docker Image</name>
     <description>Maven project to generate Docker image</description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
@@ -43,7 +55,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <id>copy</id>
@@ -109,7 +120,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.45.1</version>
                 <configuration>
                     <images>
                         <image>
diff --git a/docker/src/main/docker/Dockerfile b/docker/src/main/docker/Dockerfile
index 377bc9ff2..e2e73f486 100644
--- a/docker/src/main/docker/Dockerfile
+++ b/docker/src/main/docker/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 ################################################################################
 
-FROM library/eclipse-temurin:11
+FROM library/eclipse-temurin:17
 
 # Unomi environment variables
 ENV UNOMI_HOME=/opt/apache-unomi
diff --git a/docker/src/main/docker/docker-compose-build-es.yml b/docker/src/main/docker/docker-compose-build-es.yml
index eaf415083..2c75c0f97 100644
--- a/docker/src/main/docker/docker-compose-build-es.yml
+++ b/docker/src/main/docker/docker-compose-build-es.yml
@@ -17,19 +17,21 @@
 version: '2.4'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.2
-    volumes: # Persist ES data in seperate "esdata" volume
-      - esdata1:/usr/share/elasticsearch/data
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.1.3
+    volumes:
+      - unomi-3-elasticsearch-data:/usr/share/elasticsearch/data
     environment:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms1G -Xmx1G"
       - discovery.type=single-node
       - xpack.security.enabled=false
       - cluster.name=contextElasticSearch
-    ports: # Expose Elasticsearch ports
-      - "9200:9200"
+    networks:
+      - unomi-3
+    ports:
+      - 9200:9200
 
-  unomi:
+  node-1:
     build: .
     image: apache/unomi:${project.version}
     container_name: unomi
@@ -46,12 +48,20 @@ services:
       - 8102:8102
       # Debug port
       - "${DEBUG_PORT:-5005}:5005"
+    networks:
+      - unomi-3
     links:
       - elasticsearch
     depends_on:
       - elasticsearch
 
-
-volumes: # Define seperate volume for Elasticsearch data
-  esdata1:
+volumes:
+  unomi-3-elasticsearch-data:
     driver: local
+
+networks:
+  unomi-3:
+    name: unomi-3
+    ipam:
+      config:
+        - subnet: 172.24.32.0/24
diff --git a/docker/src/main/docker/docker-compose-build-os.yml b/docker/src/main/docker/docker-compose-build-os.yml
index 2d20c5fd4..0f736e004 100644
--- a/docker/src/main/docker/docker-compose-build-os.yml
+++ b/docker/src/main/docker/docker-compose-build-os.yml
@@ -23,7 +23,7 @@ networks:
 
 services:
   opensearch-node1:
-    image: opensearchproject/opensearch:2.18.0
+    image: opensearchproject/opensearch:3.0.0
     container_name: opensearch-node1
     environment:
       - cluster.name=opensearch-cluster
@@ -51,7 +51,7 @@ services:
           - opensearch-node1
 
   opensearch-node2:
-    image: opensearchproject/opensearch:2.18.0
+    image: opensearchproject/opensearch:3.0.0
     container_name: opensearch-node2
     environment:
       - cluster.name=opensearch-cluster
@@ -76,7 +76,7 @@ services:
           - opensearch-node2
 
   opensearch-dashboards:
-    image: opensearchproject/opensearch-dashboards:2.18.0
+    image: opensearchproject/opensearch-dashboards:3.0.0
     container_name: opensearch-dashboards
     ports:
       - 5601:5601
diff --git a/docker/src/main/docker/docker-compose-es.yml b/docker/src/main/docker/docker-compose-cluster.yml
similarity index 62%
copy from docker/src/main/docker/docker-compose-es.yml
copy to docker/src/main/docker/docker-compose-cluster.yml
index dbd931ec9..0eca8d6d5 100644
--- a/docker/src/main/docker/docker-compose-es.yml
+++ b/docker/src/main/docker/docker-compose-cluster.yml
@@ -15,56 +15,67 @@
 # limitations under the License.
 ################################################################################
 version: '2.4'
-
-# Define networks first
-networks:
-  unomi-net:
-    driver: bridge
-
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.2
-    container_name: elasticsearch
-    volumes: # Persist ES data in separate "esdata" volume
-      - esdata1:/usr/share/elasticsearch/data
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.1.3
+    volumes:
+      - unomi-3-elasticsearch-data:/usr/share/elasticsearch/data
     environment:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms1G -Xmx1G"
       - discovery.type=single-node
       - xpack.security.enabled=false
       - cluster.name=contextElasticSearch
-    ports: # Expose Elasticsearch ports
-      - "9200:9200"
     networks:
-      unomi-net:
-        aliases:
-          - elasticsearch
+      - unomi-3
+    ports:
+      - 9200:9200
 
-  unomi:
+  node-1:
     image: apache/unomi:${project.version}
-    container_name: unomi
     environment:
-      - UNOMI_AUTO_START=elasticsearch
       - UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200
-      # Debug settings
-      - KARAF_DEBUG=${DEBUG:-false}
-      - KARAF_DEBUG_PORT=${DEBUG_PORT:-5005}
-      - KARAF_DEBUG_SUSPEND=${DEBUG_SUSPEND:-n}
+      - UNOMI_CLUSTER_NODEID=unomi-3-node-1
     ports:
       - 8181:8181
       - 9443:9443
       - 8102:8102
-      # Debug port
-      - "${DEBUG_PORT:-5005}:5005"
+    networks:
+      - unomi-3
     links:
       - elasticsearch
     depends_on:
       - elasticsearch
+
+  wait-for-node-1:
+    image: alpine:latest
+    command: sh -c "echo 'Wait 3 minutes before starting unomi-3-node-2...' && sleep 180"
+    depends_on:
+      - node-1
+
+  node-2:
+    image: apache/unomi:${project.version}
+    environment:
+      - UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200
+      - UNOMI_CLUSTER_NODEID=unomi-3-node-2
+    ports:
+      - 8182:8181
+      - 9444:9443
+      - 8103:8102
     networks:
-      unomi-net:
-        aliases:
-          - unomi
+      - unomi-3
+    links:
+      - elasticsearch
+    depends_on:
+      - wait-for-node-1
 
-volumes: # Define separate volume for Elasticsearch data
-  esdata1:
+volumes:
+  unomi-3-elasticsearch-data:
     driver: local
+
+networks:
+  unomi-3:
+    name: unomi-3
+    ipam:
+      config:
+        - subnet: 172.24.32.0/24
diff --git a/docker/src/main/docker/docker-compose-es.yml b/docker/src/main/docker/docker-compose-es.yml
index dbd931ec9..66471c1a0 100644
--- a/docker/src/main/docker/docker-compose-es.yml
+++ b/docker/src/main/docker/docker-compose-es.yml
@@ -23,24 +23,22 @@ networks:
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.1.3
     container_name: elasticsearch
-    volumes: # Persist ES data in separate "esdata" volume
-      - esdata1:/usr/share/elasticsearch/data
+    volumes:
+      - unomi-3-elasticsearch-data:/usr/share/elasticsearch/data
     environment:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms1G -Xmx1G"
       - discovery.type=single-node
       - xpack.security.enabled=false
       - cluster.name=contextElasticSearch
-    ports: # Expose Elasticsearch ports
-      - "9200:9200"
     networks:
-      unomi-net:
-        aliases:
-          - elasticsearch
+      - unomi-3
+    ports:
+      - 9200:9200
 
-  unomi:
+  node-1:
     image: apache/unomi:${project.version}
     container_name: unomi
     environment:
@@ -56,6 +54,8 @@ services:
       - 8102:8102
       # Debug port
       - "${DEBUG_PORT:-5005}:5005"
+    networks:
+      - unomi-3
     links:
       - elasticsearch
     depends_on:
@@ -65,6 +65,12 @@ services:
         aliases:
           - unomi
 
-volumes: # Define separate volume for Elasticsearch data
-  esdata1:
+volumes: unomi-3-elasticsearch-data:
     driver: local
+
+networks:
+  unomi-3:
+    name: unomi-3
+    ipam:
+      config:
+        - subnet: 172.24.32.0/24
diff --git a/docker/src/main/docker/docker-compose-os.yml b/docker/src/main/docker/docker-compose-os.yml
index 00de665ef..cf229dedf 100644
--- a/docker/src/main/docker/docker-compose-os.yml
+++ b/docker/src/main/docker/docker-compose-os.yml
@@ -23,7 +23,7 @@ networks:
 
 services:
   opensearch-node1:
-    image: opensearchproject/opensearch:2.18.0
+    image: opensearchproject/opensearch:3.0.0
     container_name: opensearch-node1
     environment:
       - cluster.name=opensearch-cluster
@@ -51,7 +51,7 @@ services:
           - opensearch-node1
 
   opensearch-node2:
-    image: opensearchproject/opensearch:2.18.0
+    image: opensearchproject/opensearch:3.0.0
     container_name: opensearch-node2
     environment:
       - cluster.name=opensearch-cluster
@@ -102,7 +102,7 @@ services:
           - unomi
 
   opensearch-dashboards:
-    image: opensearchproject/opensearch-dashboards:2.18.0
+    image: opensearchproject/opensearch-dashboards:3.0.0
     container_name: opensearch-dashboards
     ports:
       - 5601:5601
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index 87c992b81..0199a087b 100644
--- a/extensions/geonames/pom.xml
+++ b/extensions/geonames/pom.xml
@@ -18,20 +18,18 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>services</module>
-        <module>rest</module>
-    </modules>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>cxs-geonames</artifactId>
     <name>Apache Unomi :: Extensions :: Geonames Database</name>
     <description>Apache Unomi Context Server extension that integrates with the Geonames database</description>
     <packaging>pom</packaging>
+
+    <modules>
+        <module>services</module>
+        <module>rest</module>
+    </modules>
 </project>
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index 24034e108..35d104956 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -17,30 +17,49 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>cxs-geonames</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-geonames-rest</artifactId>
     <name>Apache Unomi :: Extensions :: Geonames Database :: REST API</name>
     <description>REST API for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>cxs-geonames-services</artifactId>
-            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -51,8 +70,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -68,20 +87,16 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java b/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
index d17bc53d1..3f1ad8118 100644
--- a/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
+++ b/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
@@ -27,8 +27,6 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.PathSegment;
@@ -36,7 +34,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-@WebService
 @Produces(MediaType.APPLICATION_JSON + ";charset=UTF-8")
 @CrossOriginResourceSharing(
         allowAllOrigins = true,
@@ -55,7 +52,6 @@ public class GeonamesEndPoint {
         LOGGER.info("Initializing geonames service endpoint...");
     }
 
-    @WebMethod(exclude = true)
     public void setGeonamesService(GeonamesService geonamesService) {
         this.geonamesService = geonamesService;
     }
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e96cf21c7..77e190505 100644
--- a/extensions/geonames/services/pom.xml
+++ b/extensions/geonames/services/pom.xml
@@ -17,36 +17,43 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>cxs-geonames</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-geonames-services</artifactId>
     <name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
     <description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -57,15 +64,21 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-tracing-impl</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index bb4786fcf..49b093bf2 100644
--- a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,9 +17,10 @@
   -->
 
 <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
            xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+           http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0 https://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.3.0.xsd">
 
     <!-- References -->
     <reference id="persistenceService" interface="org.apache.unomi.persistence.spi.PersistenceService"/>
diff --git a/extensions/groovy-actions/karaf-kar/pom.xml b/extensions/groovy-actions/karaf-kar/pom.xml
index 77cf21636..54b6d0a6d 100644
--- a/extensions/groovy-actions/karaf-kar/pom.xml
+++ b/extensions/groovy-actions/karaf-kar/pom.xml
@@ -17,18 +17,15 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-groovy-actions-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-groovy-actions</artifactId>
     <name>Apache Unomi :: Extensions :: Groovy Actions :: Apache Karaf Feature and KAR archive</name>
-    <description>Apache Karaf Feature and KAR archive for the Apache Unomi Context Server extension that provides the possibility to use
-        Groovy for actions
-    </description>
+    <description>Apache Karaf Feature and KAR archive for the Apache Unomi Context Server extension that provides the possibility to use Groovy for actions</description>
     <packaging>kar</packaging>
 
     <build>
@@ -52,6 +49,44 @@
                 <configuration>
                     <startLevel>85</startLevel>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-features</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>features-generate-descriptor</goal>
+                        </goals>
+                        <configuration>
+                            <enableGeneration>true</enableGeneration>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>verify</goal></goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
+                                <!-- Unomi KAR repo that contains unomi-base + provider features -->
+                                <descriptor>mvn:org.apache.unomi/unomi-kar/${project.version}/xml/features</descriptor>
+                                <!-- This module's freshly generated features.xml -->
+                                <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+                            </descriptors>
+                            <distribution>org.apache.karaf:apache-karaf:zip:${karaf.version}</distribution>
+                            <javase>17</javase>
+                            <framework>
+                                <feature>framework</feature>
+                            </framework>
+
+                            <features>
+                                <feature>unomi-groovy-actions</feature>
+                            </features>
+
+                            <ignoreMissingConditions>true</ignoreMissingConditions>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
index 5c9e4915a..5d527b1e8 100644
--- a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
@@ -19,13 +19,8 @@
     <feature name="unomi-groovy-actions" description="${project.name}" version="${project.version}">
         <details>${project.description}</details>
         <feature>wrap</feature>
+        <feature>unomi-services</feature>
         <configfile finalname="/etc/org.apache.unomi.groovy.actions.cfg">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}/cfg/groovyactionscfg</configfile>
-        <bundle start="false">mvn:org.apache.groovy/groovy/${groovy.version}</bundle>
-        <bundle start="false">mvn:org.apache.groovy/groovy-xml/${groovy.version}</bundle>
-        <bundle start="false">mvn:org.apache.groovy/groovy-json/${groovy.version}</bundle>
-        <bundle start="false">wrap:mvn:io.github.http-builder-ng/http-builder-ng-core/1.0.4</bundle>
-        <bundle start="false">mvn:org.jsoup/jsoup/1.13.1</bundle>
-        <bundle start="false">mvn:com.sun.activation/javax.activation/1.2.0</bundle>
         <bundle start="false">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}</bundle>
         <bundle start="false">mvn:org.apache.unomi/unomi-groovy-actions-rest/${project.version}</bundle>
     </feature>
diff --git a/extensions/groovy-actions/pom.xml b/extensions/groovy-actions/pom.xml
index df5491865..22189ae58 100644
--- a/extensions/groovy-actions/pom.xml
+++ b/extensions/groovy-actions/pom.xml
@@ -23,7 +23,6 @@
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>unomi-groovy-actions-root</artifactId>
     <name>Apache Unomi :: Extensions :: Groovy Actions</name>
     <description>Apache Unomi Context Server extension that provides support for Groovy Actions</description>
diff --git a/extensions/groovy-actions/rest/pom.xml b/extensions/groovy-actions/rest/pom.xml
index 08266d50e..e3620c88b 100644
--- a/extensions/groovy-actions/rest/pom.xml
+++ b/extensions/groovy-actions/rest/pom.xml
@@ -17,31 +17,50 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-groovy-actions-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-groovy-actions-rest</artifactId>
     <name>Apache Unomi :: Extensions :: Groovy Actions :: REST API</name>
     <description>REST API for the Apache Unomi Context Server extension that integrates with groovy actions
     </description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-groovy-actions-services</artifactId>
-            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -52,10 +71,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -77,20 +102,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -98,14 +113,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            sun.nio.ch;resolution:=optional,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java b/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
index ae2236c01..8ba9ca26e 100644
--- a/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
+++ b/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
@@ -27,19 +27,11 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 
-@WebService
 @Produces(MediaType.APPLICATION_JSON + ";charset=UTF-8")
 @CrossOriginResourceSharing(allowAllOrigins = true, allowCredentials = true)
 @Path("/groovyActions")
@@ -55,7 +47,6 @@ public class GroovyActionsEndPoint {
         LOGGER.info("Initializing groovy actions service endpoint...");
     }
 
-    @WebMethod(exclude = true)
     public void setGroovyActionsService(GroovyActionsService groovyActionsService) {
         this.groovyActionsService = groovyActionsService;
     }
diff --git a/extensions/groovy-actions/services/pom.xml b/extensions/groovy-actions/services/pom.xml
index 522da0fcc..f0787a917 100644
--- a/extensions/groovy-actions/services/pom.xml
+++ b/extensions/groovy-actions/services/pom.xml
@@ -17,67 +17,85 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-groovy-actions-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-groovy-actions-services</artifactId>
     <name>Apache Unomi :: Extensions :: Groovy Actions :: Service</name>
-    <description>Service implementation for the Apache Unomi Context Server extension that provides the possibility to implement actions in
-        Groovy
-    </description>
+    <description>Service implementation for the Apache Unomi Context Server extension that provides the possibility to implement actions in Groovy</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-metrics</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-metrics</artifactId>
-            <version>${project.version}</version>
+            <artifactId>unomi-services-common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
+            <artifactId>unomi-services</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
+            <artifactId>unomi-tracing-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-services-common</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-tracing-api</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -90,6 +108,11 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
@@ -102,14 +125,9 @@
             <version>${groovy.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-tracing-impl</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -117,7 +135,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -129,14 +146,12 @@
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.jaas</groupId>
             <artifactId>org.apache.karaf.jaas.boot</artifactId>
-            <version>${karaf.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -147,7 +162,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -166,10 +180,6 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>
-                            sun.nio.ch;resolution:=optional,
-                            *
-                        </Import-Package>
                         <_dsannotations>*</_dsannotations>
                         <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                         <Unomi-Source-Folders>${project.basedir}</Unomi-Source-Folders>
@@ -201,27 +211,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Add JaCoCo plugin for code coverage reporting -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/ScriptMetadata.java b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/ScriptMetadata.java
index 159e70aed..4b8535d27 100644
--- a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/ScriptMetadata.java
+++ b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/ScriptMetadata.java
@@ -29,12 +29,12 @@ import java.util.Base64;
  * including content hash for efficient change detection and the compiled class
  * for direct execution without recompilation.
  * </p>
- * 
+ *
  * <p>
  * Thread Safety: This class is immutable and thread-safe. All fields are final
  * and the class provides no methods to modify its state after construction.
  * </p>
- * 
+ *
  * @since 2.7.0
  */
 public final class ScriptMetadata {
@@ -43,11 +43,11 @@ public final class ScriptMetadata {
     private final String contentHash;
     private final long creationTime;
     private final Class<? extends Script> compiledClass;
-    
+
     /**
      * Constructs a new ScriptMetadata instance.
-     * 
-     * @param actionName the unique name/identifier of the action
+     *
+     * @param actionName    the unique name/identifier of the action
      * @param scriptContent the raw Groovy script content
      * @param compiledClass the compiled Groovy script class
      * @throws IllegalArgumentException if any parameter is null
@@ -62,17 +62,17 @@ public final class ScriptMetadata {
         if (compiledClass == null) {
             throw new IllegalArgumentException("Compiled class cannot be null");
         }
-        
+
         this.actionName = actionName;
         this.scriptContent = scriptContent;
         this.contentHash = calculateHash(scriptContent);
         this.creationTime = System.currentTimeMillis();
         this.compiledClass = compiledClass;
     }
-    
+
     /**
      * Calculates SHA-256 hash of the given content.
-     * 
+     *
      * @param content the content to hash
      * @return Base64 encoded SHA-256 hash
      * @throws RuntimeException if SHA-256 algorithm is not available
@@ -86,14 +86,14 @@ public final class ScriptMetadata {
             throw new RuntimeException("SHA-256 algorithm not available", e);
         }
     }
-    
+
     /**
      * Determines if the script content has changed compared to new content.
      * <p>
      * This method uses SHA-256 hash comparison for efficient change detection
      * without storing or comparing the full script content.
      * </p>
-     * 
+     *
      * @param newContent the new script content to compare against
      * @return {@code true} if content has changed, {@code false} if unchanged
      * @throws IllegalArgumentException if newContent is null
@@ -104,53 +104,53 @@ public final class ScriptMetadata {
         }
         return !contentHash.equals(calculateHash(newContent));
     }
-    
+
     /**
      * Returns the action name/identifier.
-     * 
+     *
      * @return the action name, never null
      */
-    public String getActionName() { 
-        return actionName; 
+    public String getActionName() {
+        return actionName;
     }
-    
+
     /**
      * Returns the original script content.
-     * 
+     *
      * @return the script content, never null
      */
-    public String getScriptContent() { 
-        return scriptContent; 
+    public String getScriptContent() {
+        return scriptContent;
     }
-    
+
     /**
      * Returns the SHA-256 hash of the script content.
-     * 
+     *
      * @return Base64 encoded content hash, never null
      */
-    public String getContentHash() { 
-        return contentHash; 
+    public String getContentHash() {
+        return contentHash;
     }
-    
+
     /**
      * Returns the timestamp when this metadata was created.
-     * 
+     *
      * @return creation timestamp in milliseconds since epoch
      */
-    public long getCreationTime() { 
-        return creationTime; 
+    public long getCreationTime() {
+        return creationTime;
     }
-    
+
     /**
      * Returns the compiled Groovy script class.
      * <p>
      * This class can be used to create new script instances for execution
      * without requiring recompilation.
      * </p>
-     * 
+     *
      * @return the compiled script class, never null
      */
-    public Class<? extends Script> getCompiledClass() { 
-        return compiledClass; 
+    public Class<? extends Script> getCompiledClass() {
+        return compiledClass;
     }
-} 
\ No newline at end of file
+}
diff --git a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImpl.java b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImpl.java
index fa966ca32..c8974d951 100644
--- a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImpl.java
+++ b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImpl.java
@@ -504,7 +504,8 @@ public class GroovyActionsServiceImpl extends AbstractMultiTypeCachingService im
         try {
             return scriptClass.getMethod("execute").getAnnotation(Action.class);
         } catch (NoSuchMethodException e) {
-            LOGGER.error("Failed to extract action annotation - execute method not found", e);
+            // Scripts without an execute() method are valid; they simply have no @Action metadata
+            LOGGER.debug("No execute() method found on script class {}, skipping @Action extraction", scriptClass.getName());
             return null;
         } catch (Exception e) {
             LOGGER.error("Failed to extract action annotation", e);
diff --git a/extensions/groovy-actions/services/src/test/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImplTest.java b/extensions/groovy-actions/services/src/test/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImplTest.java
index dcb23e82d..a8f6442a2 100644
--- a/extensions/groovy-actions/services/src/test/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImplTest.java
+++ b/extensions/groovy-actions/services/src/test/java/org/apache/unomi/groovy/actions/services/impl/GroovyActionsServiceImplTest.java
@@ -28,7 +28,7 @@ import org.apache.unomi.api.services.cache.MultiTypeCacheService;
 import org.apache.unomi.api.tenants.TenantService;
 import org.apache.unomi.groovy.actions.GroovyActionDispatcher;
 import org.apache.unomi.persistence.spi.PersistenceService;
-import org.apache.unomi.persistence.spi.conditions.ConditionEvaluatorDispatcher;
+import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluatorDispatcher;
 import org.apache.unomi.services.TestHelper;
 import org.apache.unomi.services.common.security.KarafSecurityService;
 import org.apache.unomi.services.impl.*;
@@ -266,13 +266,13 @@ public class GroovyActionsServiceImplTest {
         // Test that we can get a compiled script
         String actionName = "testCompiledScript";
         String script = "return 'Hello, World!'";
-        
+
         contextManager.executeAsTenant(TENANT_1, () -> {
             groovyActionsService.save(actionName, script);
-            
+
             Class<? extends groovy.lang.Script> scriptClass = groovyActionsService.getCompiledScript(actionName);
             assertNotNull("Compiled script should not be null", scriptClass);
-            
+
             // Test that we can create an instance and execute it
             try {
                 groovy.lang.Script scriptInstance = scriptClass.getDeclaredConstructor().newInstance();
@@ -281,7 +281,7 @@ public class GroovyActionsServiceImplTest {
             } catch (Exception e) {
                 fail("Should be able to execute compiled script: " + e.getMessage());
             }
-            
+
             // Clean up
             groovyActionsService.remove(actionName);
         });
diff --git a/extensions/healthcheck/pom.xml b/extensions/healthcheck/pom.xml
index 632f0b64b..e16bd9ac7 100644
--- a/extensions/healthcheck/pom.xml
+++ b/extensions/healthcheck/pom.xml
@@ -23,37 +23,45 @@
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>healthcheck</artifactId>
     <name>Apache Unomi :: Extensions :: HealthCheck</name>
     <description>Apache Unomi HealthCheck extension that provide liveliness information about unomi</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-lifecycle-watcher</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>shell-commands</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -61,17 +69,34 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.useradmin</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-osgi</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.http</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore-osgi</artifactId>
+            <artifactId>httpclient-osgi</artifactId>
+            <type>bundle</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -82,7 +107,6 @@
         <dependency>
             <groupId>org.apache.karaf.jaas</groupId>
             <artifactId>org.apache.karaf.jaas.boot</artifactId>
-            <version>${karaf.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckProvider.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckProvider.java
index 9e5dc2ed9..9cabede77 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckProvider.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckProvider.java
@@ -17,19 +17,32 @@
 
 package org.apache.unomi.healthcheck;
 
+/**
+ * Contract for pluggable health checks. Implementations provide a name and
+ * return a {@link HealthCheckResponse} when executed; a default timeout
+ * response is available via {@link #timeout()}.
+ */
 public interface HealthCheckProvider {
 
+    /**
+     * Unique provider name used in responses and logs.
+     *
+     * @return the health check provider name
+     */
     String name();
 
     /**
-     * Used to check whether the provider is available. For example an ElasticSearch provider will not be available
-     * if OpenSearch is used instead as a persistence implementation.
-     * @return true if the provider is available, false otherwise
+     * Executes the health check, returning a {@link HealthCheckResponse} describing status and optional data.
+     *
+     * @return the health check result
      */
-    default boolean isAvailable() { return true;}
-
     HealthCheckResponse execute();
 
+    /**
+     * Convenience method returning a standardized timeout error response for this provider.
+     *
+     * @return a timeout {@link HealthCheckResponse}
+     */
     default HealthCheckResponse timeout() {
         return new HealthCheckResponse.Builder().name(name()).withData("error.cause", "timeout").error().build();
     }
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckService.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckService.java
index 6ee584cb1..9da585e14 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckService.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/HealthCheckService.java
@@ -26,9 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
@@ -126,7 +124,7 @@ public class HealthCheckService {
                     busy = true;
                     List<HealthCheckResponse> health = new ArrayList<>();
                     health.add(HealthCheckResponse.live("karaf"));
-                    for (HealthCheckProvider provider : providers.stream().filter(p -> config.getEnabledProviders().contains(p.name()) && p.isAvailable()).collect(Collectors.toList())) {
+                    for (HealthCheckProvider provider : providers.stream().filter(p -> config.getEnabledProviders().contains(p.name())).collect(Collectors.toList())) {
                         Future<HealthCheckResponse> future = executor.submit(provider::execute);
                         try {
                             HealthCheckResponse response = future.get(config.getTimeout(), TimeUnit.MILLISECONDS);
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/ElasticSearchHealthCheckProvider.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/ElasticSearchHealthCheckProvider.java
index b2b1efce4..278eb8a1e 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/ElasticSearchHealthCheckProvider.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/ElasticSearchHealthCheckProvider.java
@@ -17,6 +17,8 @@
 
 package org.apache.unomi.healthcheck.provider;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.auth.AuthScope;
@@ -28,12 +30,9 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.apache.unomi.healthcheck.HealthCheckConfig;
-import org.apache.unomi.healthcheck.HealthCheckProvider;
 import org.apache.unomi.healthcheck.HealthCheckResponse;
 import org.apache.unomi.healthcheck.util.CachedValue;
-import org.apache.unomi.persistence.spi.PersistenceService;
 import org.apache.unomi.shell.migration.utils.HttpUtils;
-import org.osgi.service.component.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,35 +43,21 @@ import java.util.concurrent.TimeUnit;
  * A Health Check that checks the status of the ElasticSearch connectivity according to the provided configuration.
  * This connectivity should be LIVE before any try to start Unomi.
  */
-@Component(service = HealthCheckProvider.class, immediate = true)
-public class ElasticSearchHealthCheckProvider implements HealthCheckProvider {
+public class ElasticSearchHealthCheckProvider implements PersistenceEngineHealthProvider {
 
     public static final String NAME = "elasticsearch";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchHealthCheckProvider.class.getName());
     private final CachedValue<HealthCheckResponse> cache = new CachedValue<>(10, TimeUnit.SECONDS);
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY)
     private HealthCheckConfig config;
 
     private CloseableHttpClient httpClient;
 
-    @Reference(service = PersistenceService.class, cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC, bind = "bind", unbind = "unbind")
-    private volatile PersistenceService persistenceService;
-
     public ElasticSearchHealthCheckProvider() {
         LOGGER.info("Building elasticsearch health provider service...");
     }
 
-    public void bind(PersistenceService persistenceService) {
-        this.persistenceService = persistenceService;
-    }
-
-    public void unbind(PersistenceService persistenceService) {
-        this.persistenceService = null;
-    }
-
-    @Activate
     public void activate() {
         LOGGER.info("Activating elasticsearch health provider service...");
         CredentialsProvider credentialsProvider = null;
@@ -99,11 +84,6 @@ public class ElasticSearchHealthCheckProvider implements HealthCheckProvider {
         return NAME;
     }
 
-    @Override
-    public boolean isAvailable() {
-        return persistenceService != null && "elasticsearch".equals(persistenceService.getName());
-    }
-
     @Override public HealthCheckResponse execute() {
         LOGGER.debug("Health check elasticsearch");
         if (cache.isStaled() || cache.getValue().isDown() || cache.getValue().isError()) {
@@ -112,6 +92,10 @@ public class ElasticSearchHealthCheckProvider implements HealthCheckProvider {
         return cache.getValue();
     }
 
+    @Override public HealthCheckResponse detailed() {
+        return execute();
+    }
+
     private HealthCheckResponse refresh() {
         LOGGER.debug("Refresh");
         HealthCheckResponse.Builder builder = new HealthCheckResponse.Builder();
@@ -125,9 +109,30 @@ public class ElasticSearchHealthCheckProvider implements HealthCheckProvider {
             if (response != null && response.getStatusLine().getStatusCode() == 200) {
                 builder.up();
                 HttpEntity entity = response.getEntity();
-                if (entity != null && EntityUtils.toString(entity).contains("\"status\":\"green\"")) {
-                    builder.live();
-                    //TODO parse and add cluster data
+                if (entity != null) {
+                    String content = EntityUtils.toString(entity);
+                    try {
+                        ObjectMapper mapper = new ObjectMapper();
+                        JsonNode root = mapper.readTree(content);
+                        if (root.has("status") && "green".equals(root.get("status").asText())) {
+                            builder.live();
+                        }
+                        if (root.has("cluster_name")) builder.withData("cluster_name", root.get("cluster_name").asText());
+                        if (root.has("status")) builder.withData("status", root.get("status").asText());
+                        if (root.has("timed_out")) builder.withData("timed_out", root.get("timed_out").asBoolean());
+                        if (root.has("number_of_nodes")) builder.withData("number_of_nodes", root.get("number_of_nodes").asLong());
+                        if (root.has("number_of_data_nodes")) builder.withData("number_of_data_nodes", root.get("number_of_data_nodes").asLong());
+                        if (root.has("active_primary_shards")) builder.withData("active_primary_shards", root.get("active_primary_shards").asLong());
+                        if (root.has("active_shards")) builder.withData("active_shards", root.get("active_shards").asLong());
+                        if (root.has("relocating_shards")) builder.withData("relocating_shards", root.get("relocating_shards").asLong());
+                        if (root.has("initializing_shards")) builder.withData("initializing_shards", root.get("initializing_shards").asLong());
+                        if (root.has("unassigned_shards")) builder.withData("unassigned_shards", root.get("unassigned_shards").asLong());
+                    } catch (Exception parseEx) {
+                        // Fallback to simple LIVE detection
+                        if (content.contains("\"status\":\"green\"")) {
+                            builder.live();
+                        }
+                    }
                 }
             }
         } catch (IOException e) {
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/OpenSearchHealthCheckProvider.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/OpenSearchHealthCheckProvider.java
index 5e9202847..7b97cfa12 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/OpenSearchHealthCheckProvider.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/OpenSearchHealthCheckProvider.java
@@ -17,6 +17,8 @@
 
 package org.apache.unomi.healthcheck.provider;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.auth.AuthScope;
@@ -28,12 +30,9 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.apache.unomi.healthcheck.HealthCheckConfig;
-import org.apache.unomi.healthcheck.HealthCheckProvider;
 import org.apache.unomi.healthcheck.HealthCheckResponse;
 import org.apache.unomi.healthcheck.util.CachedValue;
-import org.apache.unomi.persistence.spi.PersistenceService;
 import org.apache.unomi.shell.migration.utils.HttpUtils;
-import org.osgi.service.component.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,40 +43,21 @@ import java.util.concurrent.TimeUnit;
  * A Health Check that checks the status of the OpenSearch connectivity according to the provided configuration.
  * This connectivity should be LIVE before any try to start Unomi.
  */
-@Component(service = HealthCheckProvider.class, immediate = true)
-public class OpenSearchHealthCheckProvider implements HealthCheckProvider {
+public class OpenSearchHealthCheckProvider implements PersistenceEngineHealthProvider {
 
     public static final String NAME = "opensearch";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchHealthCheckProvider.class.getName());
     private final CachedValue<HealthCheckResponse> cache = new CachedValue<>(10, TimeUnit.SECONDS);
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY)
     private HealthCheckConfig config;
 
     private CloseableHttpClient httpClient;
 
-    @Reference(service = PersistenceService.class, cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC, bind = "bind", unbind = "unbind")
-    private volatile PersistenceService persistenceService;
-
-    public void bind(PersistenceService persistenceService) {
-        this.persistenceService = persistenceService;
-    }
-
-    public void unbind(PersistenceService persistenceService) {
-        this.persistenceService = null;
-    }
-
     public OpenSearchHealthCheckProvider() {
         LOGGER.info("Building OpenSearch health provider service...");
     }
 
-    @Override
-    public boolean isAvailable() {
-        return persistenceService != null && "opensearch".equals(persistenceService.getName());
-    }
-
-    @Activate
     public void activate() {
         LOGGER.info("Activating OpenSearch health provider service...");
         CredentialsProvider credentialsProvider = null;
@@ -112,6 +92,10 @@ public class OpenSearchHealthCheckProvider implements HealthCheckProvider {
         return cache.getValue();
     }
 
+    @Override public HealthCheckResponse detailed() {
+        return execute();
+    }
+
     private HealthCheckResponse refresh() {
         LOGGER.debug("Refresh");
         HealthCheckResponse.Builder builder = new HealthCheckResponse.Builder();
@@ -133,9 +117,28 @@ public class OpenSearchHealthCheckProvider implements HealthCheckProvider {
                 HttpEntity entity = response.getEntity();
                 if (entity != null) {
                     String content = EntityUtils.toString(entity);
-                    if (content.contains("\"status\":\"green\"") ||
-                        content.contains("\"status\":\"yellow\"") && minimalClusterState.equals("yellow")) {
-                        builder.live();
+                    try {
+                        ObjectMapper mapper = new ObjectMapper();
+                        JsonNode root = mapper.readTree(content);
+                        String status = root.has("status") ? root.get("status").asText() : null;
+                        if ("green".equals(status) || ("yellow".equals(status) && "yellow".equals(minimalClusterState))) {
+                            builder.live();
+                        }
+                        if (root.has("cluster_name")) builder.withData("cluster_name", root.get("cluster_name").asText());
+                        if (root.has("status")) builder.withData("status", root.get("status").asText());
+                        if (root.has("timed_out")) builder.withData("timed_out", root.get("timed_out").asBoolean());
+                        if (root.has("number_of_nodes")) builder.withData("number_of_nodes", root.get("number_of_nodes").asLong());
+                        if (root.has("number_of_data_nodes")) builder.withData("number_of_data_nodes", root.get("number_of_data_nodes").asLong());
+                        if (root.has("active_primary_shards")) builder.withData("active_primary_shards", root.get("active_primary_shards").asLong());
+                        if (root.has("active_shards")) builder.withData("active_shards", root.get("active_shards").asLong());
+                        if (root.has("relocating_shards")) builder.withData("relocating_shards", root.get("relocating_shards").asLong());
+                        if (root.has("initializing_shards")) builder.withData("initializing_shards", root.get("initializing_shards").asLong());
+                        if (root.has("unassigned_shards")) builder.withData("unassigned_shards", root.get("unassigned_shards").asLong());
+                    } catch (Exception parseEx) {
+                        if (content.contains("\"status\":\"green\"") ||
+                                (content.contains("\"status\":\"yellow\"") && "yellow".equals(minimalClusterState))) {
+                            builder.live();
+                        }
                     }
                 }
             }
diff --git a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/conditions/ConditionEvaluator.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceEngineHealthProvider.java
similarity index 59%
copy from persistence-spi/src/main/java/org/apache/unomi/persistence/spi/conditions/ConditionEvaluator.java
copy to extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceEngineHealthProvider.java
index 97af4ed97..276ba2272 100644
--- a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/conditions/ConditionEvaluator.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceEngineHealthProvider.java
@@ -15,18 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.unomi.persistence.spi.conditions;
+package org.apache.unomi.healthcheck.provider;
 
-import org.apache.unomi.api.Item;
-import org.apache.unomi.api.conditions.Condition;
-
-import java.util.Map;
+import org.apache.unomi.healthcheck.HealthCheckProvider;
+import org.apache.unomi.healthcheck.HealthCheckResponse;
 
 /**
- * Condition evaluator interface
+ * Common contract for persistence engine health providers to expose
+ * richer, implementation-specific health details.
  */
-public interface ConditionEvaluator {
-
-    boolean eval(Condition condition, Item item, Map<String, Object> context, ConditionEvaluatorDispatcher dispatcher);
+public interface PersistenceEngineHealthProvider extends HealthCheckProvider {
 
+    /**
+     * Build a detailed response that may include implementation-specific data.
+     *
+     * @return a detailed {@link HealthCheckResponse}
+     */
+    HealthCheckResponse detailed();
 }
+
+
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceHealthCheckProvider.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceHealthCheckProvider.java
index b0d2725dc..ec136fa33 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceHealthCheckProvider.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/provider/PersistenceHealthCheckProvider.java
@@ -20,6 +20,7 @@ package org.apache.unomi.healthcheck.provider;
 import org.apache.unomi.api.PropertyType;
 import org.apache.unomi.healthcheck.HealthCheckResponse;
 import org.apache.unomi.healthcheck.HealthCheckProvider;
+import org.apache.unomi.healthcheck.HealthCheckConfig;
 import org.apache.unomi.healthcheck.util.CachedValue;
 import org.apache.unomi.persistence.spi.PersistenceService;
 import org.osgi.service.component.annotations.Component;
@@ -46,16 +47,25 @@ public class PersistenceHealthCheckProvider implements HealthCheckProvider {
     @Reference(service = PersistenceService.class, cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC, bind = "bind", unbind = "unbind")
     private volatile PersistenceService service;
 
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL)
+    private volatile HealthCheckConfig healthCheckConfig;
+
+    // Lazily created delegate depending on the current persistence implementation
+    private volatile HealthCheckProvider delegate;
+
     public PersistenceHealthCheckProvider() {
         LOGGER.info("Building persistence health provider service...");
     }
 
     public void bind(PersistenceService service) {
         this.service = service;
+        // Reset delegate when persistence changes
+        this.delegate = null;
     }
 
     public void unbind(PersistenceService service) {
         this.service = null;
+        this.delegate = null;
     }
 
     @Override public String name() {
@@ -64,6 +74,17 @@ public class PersistenceHealthCheckProvider implements HealthCheckProvider {
 
     @Override public HealthCheckResponse execute() {
         LOGGER.debug("Health check persistence");
+
+        // If we can detect the underlying persistence, delegate to the appropriate provider
+        HealthCheckProvider resolved = resolveDelegate();
+        if (resolved != null) {
+            if (resolved instanceof PersistenceEngineHealthProvider) {
+                return ((PersistenceEngineHealthProvider) resolved).detailed();
+            }
+            return resolved.execute();
+        }
+
+        // Fallback to legacy behavior if no delegate is available yet
         if (cache.isStaled() || cache.getValue().isDown() || cache.getValue().isError()) {
             cache.setValue(refresh());
         }
@@ -88,4 +109,49 @@ public class PersistenceHealthCheckProvider implements HealthCheckProvider {
         }
         return builder.build();
     }
+
+    private HealthCheckProvider resolveDelegate() {
+        try {
+            if (delegate != null) {
+                return delegate;
+            }
+            if (service == null) {
+                return null;
+            }
+            String persistenceName;
+            try {
+                persistenceName = service.getName();
+            } catch (Throwable t) {
+                // Older SPI might not expose getName(); fallback to class inspection
+                persistenceName = service.getClass().getName().toLowerCase();
+            }
+
+            if (persistenceName == null) {
+                return null;
+            }
+
+            if (persistenceName.contains("opensearch")) {
+                OpenSearchHealthCheckProvider provider = new OpenSearchHealthCheckProvider();
+                if (healthCheckConfig != null) {
+                    provider.setConfig(healthCheckConfig);
+                }
+                provider.activate();
+                delegate = provider;
+            } else if (persistenceName.contains("elasticsearch")) {
+                ElasticSearchHealthCheckProvider provider = new ElasticSearchHealthCheckProvider();
+                if (healthCheckConfig != null) {
+                    provider.setConfig(healthCheckConfig);
+                }
+                provider.activate();
+                delegate = provider;
+            } else {
+                // Unknown persistence implementation, no delegate
+                return null;
+            }
+            return delegate;
+        } catch (Exception e) {
+            LOGGER.warn("Unable to resolve delegated health check provider", e);
+            return null;
+        }
+    }
 }
diff --git a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/servlet/HealthCheckServlet.java b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/servlet/HealthCheckServlet.java
index e1cb84e61..27dec31d4 100644
--- a/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/servlet/HealthCheckServlet.java
+++ b/extensions/healthcheck/src/main/java/org/apache/unomi/healthcheck/servlet/HealthCheckServlet.java
@@ -67,14 +67,14 @@ public class HealthCheckServlet extends HttpServlet {
         }
         List<HealthCheckResponse> checks = service.check();
         checks.sort(Comparator.comparing(HealthCheckResponse::getName));
+        response.getWriter().println(mapper.writeValueAsString(checks));
         response.setContentType("application/json");
         response.setHeader("Cache-Control", "no-cache");
-        if (checks.stream().allMatch(HealthCheckResponse::isLive)) {
-            response.setStatus(HttpServletResponse.SC_OK);
-        } else {
-            response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
-        }
-        response.getWriter().println(mapper.writeValueAsString(checks));
+            if (checks.stream().allMatch(HealthCheckResponse::isLive)) {
+                response.setStatus(HttpServletResponse.SC_OK);
+            } else {
+                response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+            }
         response.flushBuffer();
     }
 }
diff --git a/extensions/json-schema/rest/pom.xml b/extensions/json-schema/rest/pom.xml
index 45432a476..de0ef217a 100644
--- a/extensions/json-schema/rest/pom.xml
+++ b/extensions/json-schema/rest/pom.xml
@@ -17,80 +17,84 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-json-schema-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-json-schema-rest</artifactId>
     <name>Apache Unomi :: Extensions :: JSON Schema :: REST API</name>
     <description>JSON Schema REST API for the Apache Unomi Context Server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-json-schema-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-rest</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -98,14 +102,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            sun.nio.ch;resolution:=optional,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java b/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
index 5f9caabf0..51dc39a48 100644
--- a/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
+++ b/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
@@ -27,18 +27,13 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
 
-@WebService
 @Produces(MediaType.APPLICATION_JSON + ";charset=UTF-8")
 @CrossOriginResourceSharing(allowAllOrigins = true, allowCredentials = true)
 @Path("/jsonSchema")
@@ -54,7 +49,6 @@ public class JsonSchemaEndPoint {
         LOGGER.info("Initializing JSON schema endpoint...");
     }
 
-    @WebMethod(exclude = true)
     public void setSchemaService(SchemaService schemaService) {
         this.schemaService = schemaService;
     }
diff --git a/extensions/json-schema/services/pom.xml b/extensions/json-schema/services/pom.xml
index 66e429ffd..afbdd02e6 100644
--- a/extensions/json-schema/services/pom.xml
+++ b/extensions/json-schema/services/pom.xml
@@ -17,19 +17,29 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-json-schema-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-json-schema-services</artifactId>
     <name>Apache Unomi :: Extensions :: JSON Schema :: Service</name>
     <description>JSON Schema service for the Apache Unomi Context Server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <properties>
         <version.schema>1.0.86</version.schema>
         <version.schema.jackson>2.17.1</version.schema.jackson>
@@ -40,45 +50,45 @@
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-tracing-api</artifactId>
-            <version>${project.version}</version>
+            <artifactId>unomi-persistence-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-services-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-tracing-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-services-common</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- dependencies required for json-schema framework -->
@@ -96,38 +106,36 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${version.schema.jackson}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${version.schema.jackson}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${version.schema.jackson}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${version.schema.jackson}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.ethlo.time</groupId>
             <artifactId>itu</artifactId>
             <version>${version.schema.itu}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.2</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.jaas</groupId>
@@ -151,13 +159,11 @@
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -169,7 +175,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -180,19 +185,16 @@
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-tracing-impl</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-metrics</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-common</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -216,7 +218,6 @@
                             org.jcodings.specific;resolution:=optional,
                             org.joni;resolution:=optional,
                             org.joni.exception;resolution:=optional,
-                            sun.nio.ch;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
diff --git a/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/ValidationError.java b/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/ValidationError.java
index 7adfabef1..7dc9cb3eb 100644
--- a/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/ValidationError.java
+++ b/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/ValidationError.java
@@ -17,8 +17,6 @@
 
 package org.apache.unomi.schema.api;
 
-import com.networknt.schema.ValidationMessage;
-
 import java.io.Serializable;
 
 /**
diff --git a/extensions/json-schema/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/json-schema/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 52d7f8f6a..0480286b1 100644
--- a/extensions/json-schema/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/json-schema/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,9 +17,10 @@
   -->
 
 <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
            xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+           http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0 https://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.3.0.xsd">
 
     <!-- References -->
     <reference id="persistenceService" interface="org.apache.unomi.persistence.spi.PersistenceService"/>
diff --git a/extensions/json-schema/services/src/test/java/org/apache/unomi/schema/impl/SchemaServiceImplTest.java b/extensions/json-schema/services/src/test/java/org/apache/unomi/schema/impl/SchemaServiceImplTest.java
index 96e1297a5..035d0da1f 100644
--- a/extensions/json-schema/services/src/test/java/org/apache/unomi/schema/impl/SchemaServiceImplTest.java
+++ b/extensions/json-schema/services/src/test/java/org/apache/unomi/schema/impl/SchemaServiceImplTest.java
@@ -20,7 +20,7 @@ import org.apache.unomi.api.services.ExecutionContextManager;
 import org.apache.unomi.api.services.SchedulerService;
 import org.apache.unomi.api.services.cache.MultiTypeCacheService;
 import org.apache.unomi.persistence.spi.PersistenceService;
-import org.apache.unomi.persistence.spi.conditions.ConditionEvaluatorDispatcher;
+import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluatorDispatcher;
 import org.apache.unomi.schema.api.JsonSchemaWrapper;
 import org.apache.unomi.schema.api.ValidationException;
 import org.apache.unomi.schema.api.ValidationError;
diff --git a/extensions/json-schema/shell-commands/pom.xml b/extensions/json-schema/shell-commands/pom.xml
index f52e3819e..dc050177f 100644
--- a/extensions/json-schema/shell-commands/pom.xml
+++ b/extensions/json-schema/shell-commands/pom.xml
@@ -30,34 +30,47 @@
     <description>Shell commands for managing JSON schemas in Apache Unomi</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+        <!-- Unomi dependencies -->
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-json-schema-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>shell-dev-commands</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- Standard API Dependencies -->
         <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.core</artifactId>
-            <version>${karaf.version}</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <!-- Libraries -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml
index 1afced476..b2bd45796 100644
--- a/extensions/lists-extension/actions/pom.xml
+++ b/extensions/lists-extension/actions/pom.xml
@@ -17,31 +17,38 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>cxs-lists-extension</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-lists-extension-actions</artifactId>
     <name>Apache Unomi :: Extensions :: Lists :: Actions</name>
     <description>List extension rule actions for the Apache Unomi Context Server</description>
-
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>cxs-lists-extension-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 7a5524195..e75582222 100644
--- a/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/lists-extension/actions/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,7 +17,7 @@
   -->
 
 <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
     <reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
     <reference id="eventService" interface="org.apache.unomi.api.services.EventService"/>
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 8f3a92591..fac5fd0f0 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -18,13 +18,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>services</module>
-        <module>rest</module>
-        <module>actions</module>
-    </modules>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-extensions</artifactId>
@@ -35,4 +28,10 @@
     <name>Apache Unomi :: Extensions :: Lists</name>
     <description>List extension for the Apache Unomi Context Server</description>
     <packaging>pom</packaging>
+
+    <modules>
+        <module>services</module>
+        <module>rest</module>
+        <module>actions</module>
+    </modules>
 </project>
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index 40570c609..ba6ae96e1 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -17,31 +17,43 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>cxs-lists-extension</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-lists-extension-rest</artifactId>
     <name>Apache Unomi :: Extensions :: Lists :: REST API</name>
     <description>List extension REST API for the Apache Unomi Context Server</description>
-
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>cxs-lists-extension-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -50,12 +62,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -69,20 +81,16 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java b/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
index 47f90e750..bd14b4780 100644
--- a/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
+++ b/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
@@ -28,8 +28,6 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 
@@ -37,7 +35,6 @@ import javax.ws.rs.core.MediaType;
 /**
  * @author Christophe Laprun
  */
-@WebService
 @Produces(MediaType.APPLICATION_JSON)
 @CrossOriginResourceSharing(
         allowAllOrigins = true,
@@ -56,7 +53,6 @@ public class UserListServiceEndPoint {
         LOGGER.info("Initializing user list service endpoint...");
     }
 
-    @WebMethod(exclude = true)
     public void setUserListService(UserListService userListService) {
         this.userListService = userListService;
     }
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index a2823c1af..13a3cd955 100644
--- a/extensions/lists-extension/services/pom.xml
+++ b/extensions/lists-extension/services/pom.xml
@@ -17,31 +17,41 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>cxs-lists-extension</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-lists-extension-services</artifactId>
     <name>Apache Unomi :: Extensions :: Lists :: Service</name>
     <description>List extension service implementation for the Apache Unomi Context Server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
diff --git a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9398d0e67..78eac519a 100644
--- a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,7 +17,7 @@
   -->
 
 <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
     <reference id="persistenceService"
                interface="org.apache.unomi.persistence.spi.PersistenceService"/>
diff --git a/extensions/log4j-extension/pom.xml b/extensions/log4j-extension/pom.xml
index 984d865bb..fdfe248a3 100644
--- a/extensions/log4j-extension/pom.xml
+++ b/extensions/log4j-extension/pom.xml
@@ -17,39 +17,39 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-
     <artifactId>log4j-extension</artifactId>
-    <packaging>bundle</packaging>
     <name>Apache Unomi :: Extensions :: Log4j Extension</name>
     <description>Apache Unomi log4j extensions</description>
+    <packaging>bundle</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
-        <!-- Apache Commons -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.15.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.19.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/log4j-extension/src/main/java/org/apache/unomi/extensions/log4j/InMemoryLogAppender.java b/extensions/log4j-extension/src/main/java/org/apache/unomi/extensions/log4j/InMemoryLogAppender.java
new file mode 100644
index 000000000..4a2442205
--- /dev/null
+++ b/extensions/log4j-extension/src/main/java/org/apache/unomi/extensions/log4j/InMemoryLogAppender.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package org.apache.unomi.extensions.log4j;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.PatternLayout;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Custom Log4j2 appender that captures log events in memory for test log checking.
+ * This appender is designed to work with PaxExam/Karaf integration tests.
+ * 
+ * Note: This appender is included in the log4j-extension fragment bundle, which
+ * attaches to the Pax Logging Log4j2 bundle, ensuring it's available early in the
+ * startup process. It's only configured in integration tests, not in the default package.
+ * 
+ * The appender uses a lock-free bounded buffer to prevent memory leaks while minimizing
+ * contention. When the buffer exceeds the maximum size, older events are automatically evicted.
+ * The default maximum size is 100,000 events, which should be sufficient for most test scenarios.
+ * 
+ * Performance optimizations:
+ * - Lock-free append path using ConcurrentLinkedQueue
+ * - Atomic counters for size tracking
+ * - Minimal synchronization only for infrequent operations (clear, get all events)
+ * - Read operations use lock-free iteration
+ */
+@Plugin(name = "InMemoryLogAppender", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
+public class InMemoryLogAppender extends AbstractAppender {
+
+    private static final int DEFAULT_MAX_EVENTS = 100000;
+    // Lock-free queue for maximum append performance
+    private static final ConcurrentLinkedQueue<LogEvent> capturedEvents = new ConcurrentLinkedQueue<>();
+    // Atomic counters for lock-free size tracking
+    private static final AtomicInteger currentSize = new AtomicInteger(0);
+    private static final AtomicLong totalEventsAdded = new AtomicLong(0);
+    private static final AtomicLong totalEventsEvicted = new AtomicLong(0);
+    private static volatile boolean enabled = true;
+    private static volatile int maxEvents = DEFAULT_MAX_EVENTS;
+
+    protected InMemoryLogAppender(String name, Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions, Property[] properties) {
+        super(name, filter, layout, ignoreExceptions, properties);
+    }
+
+    @PluginFactory
+    public static InMemoryLogAppender createAppender(
+            @PluginAttribute("name") String name,
+            @PluginElement("Filter") Filter filter,
+            @PluginElement("Layout") Layout<? extends Serializable> layout,
+            @PluginAttribute("ignoreExceptions") boolean ignoreExceptions) {
+        if (name == null) {
+            LOGGER.error("No name provided for InMemoryLogAppender");
+            return null;
+        }
+        if (layout == null) {
+            layout = PatternLayout.createDefaultLayout();
+        }
+        return new InMemoryLogAppender(name, filter, layout, ignoreExceptions, null);
+    }
+
+    @Override
+    public void append(LogEvent event) {
+        // Fast path: check enabled flag first (volatile read, no lock)
+        if (!enabled) {
+            return;
+        }
+        
+        // Create a copy of the event to avoid issues with event reuse
+        LogEvent immutableEvent = event.toImmutable();
+        
+        // Lock-free add to queue (always succeeds with ConcurrentLinkedQueue)
+        capturedEvents.offer(immutableEvent);
+        int newSize = currentSize.incrementAndGet();
+        totalEventsAdded.incrementAndGet();
+        
+        // Evict old events if we exceed the maximum size
+        // This is done asynchronously to avoid blocking the append path
+        if (newSize > maxEvents) {
+            evictOldEvents();
+        }
+    }
+    
+    /**
+     * Evict old events to maintain the maximum size limit.
+     * This method is lock-free and only evicts when necessary.
+     */
+    private static void evictOldEvents() {
+        // Calculate how many events to evict
+        int current = currentSize.get();
+        int toEvict = current - maxEvents;
+        
+        if (toEvict <= 0) {
+            return;
+        }
+        
+        // Evict oldest events (lock-free)
+        int evicted = 0;
+        while (evicted < toEvict) {
+            LogEvent evictedEvent = capturedEvents.poll();
+            if (evictedEvent == null) {
+                // Queue is empty (shouldn't happen, but handle gracefully)
+                break;
+            }
+            evicted++;
+        }
+        
+        if (evicted > 0) {
+            currentSize.addAndGet(-evicted);
+            totalEventsEvicted.addAndGet(evicted);
+        }
+    }
+
+    /**
+     * Get all captured log events
+     * Note: This returns events in insertion order, but may not include all events
+     * if the buffer was full and events were evicted.
+     * This operation uses lock-free iteration for minimal contention.
+     */
+    public static List<LogEvent> getCapturedEvents() {
+        // Lock-free iteration - ConcurrentLinkedQueue.iterator() is thread-safe
+        List<LogEvent> events = new ArrayList<>();
+        for (LogEvent event : capturedEvents) {
+            events.add(event);
+        }
+        return Collections.unmodifiableList(events);
+    }
+
+    /**
+     * Clear all captured events
+     * Note: This operation requires synchronization to ensure atomicity,
+     * but it's infrequent (typically only at test setup/teardown).
+     */
+    public static void clearEvents() {
+        // Synchronize only for clear operation (infrequent)
+        synchronized (capturedEvents) {
+            capturedEvents.clear();
+            currentSize.set(0);
+            totalEventsAdded.set(0);
+            totalEventsEvicted.set(0);
+        }
+    }
+
+    /**
+     * Get events captured since a specific index
+     * Note: The index is relative to the total number of events added, not the current buffer size.
+     * If events were evicted and the startIndex is before the oldest available event, 
+     * an empty list is returned (checkpoint was lost due to buffer overflow).
+     * 
+     * This operation uses lock-free iteration for minimal contention.
+     * 
+     * @param startIndex The index of the first event to return (0-based, relative to total events added)
+     * @return List of events since the start index, or empty list if checkpoint was lost
+     */
+    public static List<LogEvent> getEventsSince(int startIndex) {
+        if (startIndex < 0) {
+            return Collections.emptyList();
+        }
+        
+        // Lock-free reads of atomic counters
+        long currentTotal = totalEventsAdded.get();
+        int bufferSize = currentSize.get();
+        long oldestAvailableIndex = currentTotal - bufferSize;
+        
+        // If the startIndex is before the oldest available event, the checkpoint was lost
+        if (startIndex < oldestAvailableIndex) {
+            // Checkpoint was lost due to buffer overflow
+            LOGGER.warn("Checkpoint index {} is before oldest available event {} (buffer overflow detected). " +
+                       "Total events: {}, Buffer size: {}, Evicted: {}",
+                       startIndex, oldestAvailableIndex, currentTotal, bufferSize, totalEventsEvicted.get());
+            return Collections.emptyList();
+        }
+        
+        // Calculate the actual start index in the buffer
+        int actualStartIndex = (int) (startIndex - oldestAvailableIndex);
+        
+        if (actualStartIndex >= bufferSize) {
+            // Start index is beyond the available events (shouldn't happen, but handle gracefully)
+            return Collections.emptyList();
+        }
+        
+        // Lock-free iteration - ConcurrentLinkedQueue.iterator() is thread-safe
+        List<LogEvent> events = new ArrayList<>();
+        int index = 0;
+        for (LogEvent event : capturedEvents) {
+            if (index >= actualStartIndex) {
+                events.add(event);
+            }
+            index++;
+        }
+        
+        return Collections.unmodifiableList(events);
+    }
+
+    /**
+     * Get the current event count (can be used as a checkpoint)
+     * Note: This returns the total number of events added, not the current buffer size.
+     * If events were evicted, the buffer size will be less than this count.
+     */
+    public static int getEventCount() {
+        return (int) totalEventsAdded.get();
+    }
+
+    /**
+     * Get the current buffer size (number of events currently stored)
+     * Note: This uses an atomic counter for lock-free reads.
+     */
+    public static int getBufferSize() {
+        return currentSize.get();
+    }
+
+    /**
+     * Get the total number of events that have been evicted due to buffer being full
+     */
+    public static long getEvictedEventCount() {
+        return totalEventsEvicted.get();
+    }
+
+    /**
+     * Set the maximum number of events to store in the buffer
+     * Note: This is a volatile write, so it's immediately visible to all threads.
+     * If the current buffer size exceeds the new max, old events will be evicted
+     * on the next append operation.
+     * 
+     * @param maxEvents Maximum number of events to store
+     */
+    public static void setMaxEvents(int maxEvents) {
+        if (maxEvents <= 0) {
+            throw new IllegalArgumentException("maxEvents must be positive");
+        }
+        // Volatile write - no synchronization needed
+        InMemoryLogAppender.maxEvents = maxEvents;
+        
+        // Evict old events if current size exceeds new max
+        if (currentSize.get() > maxEvents) {
+            evictOldEvents();
+        }
+    }
+
+    /**
+     * Get the maximum number of events that can be stored in the buffer
+     */
+    public static int getMaxEvents() {
+        return maxEvents;
+    }
+
+    /**
+     * Enable or disable event capture
+     */
+    public static void setEnabled(boolean enabled) {
+        InMemoryLogAppender.enabled = enabled;
+    }
+
+    /**
+     * Check if event capture is enabled
+     */
+    public static boolean isEnabled() {
+        return enabled;
+    }
+}
+
diff --git a/extensions/pom.xml b/extensions/pom.xml
index f7c8b4901..e94400112 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -18,30 +18,14 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-root</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>unomi-extensions</artifactId>
     <name>Apache Unomi :: Extensions</name>
     <description>Apache Unomi Context Server extensions</description>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>lists-extension</module>
-        <module>privacy-extension</module>
-        <module>geonames</module>
-        <module>router</module>
-        <module>salesforce-connector</module>
-        <module>weather-update</module>
-        <module>web-tracker</module>
-        <module>groovy-actions</module>
-        <module>json-schema</module>
-        <module>log4j-extension</module>
-        <module>healthcheck</module>
-    </modules>
-
 </project>
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 2e3094195..89ca8893c 100644
--- a/extensions/privacy-extension/pom.xml
+++ b/extensions/privacy-extension/pom.xml
@@ -18,21 +18,18 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>services</module>
-        <module>rest</module>
-    </modules>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>cxs-privacy-extension</artifactId>
     <name>Apache Unomi :: Extensions :: Privacy</name>
     <description>Privacy management extension for the Apache Unomi Context Server</description>
-
     <packaging>pom</packaging>
+
+    <modules>
+        <module>services</module>
+        <module>rest</module>
+    </modules>
 </project>
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 167aff48e..6f02f40c1 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -17,44 +17,58 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>cxs-privacy-extension</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-privacy-extension-rest</artifactId>
     <name>Apache Unomi :: Extensions :: Privacy :: REST API</name>
     <description>Privacy management extension REST API for the Apache Unomi Context Server</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>cxs-privacy-extension-services</artifactId>
-            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -68,45 +82,15 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--
-            <plugin>
-                <groupId>com.sebastian-daschner</groupId>
-                <artifactId>jaxrs-analyzer-maven-plugin</artifactId>
-                <version>0.17</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>analyze-jaxrs</goal>
-                        </goals>
-                        <configuration>
-                            <backend>swagger</backend>
-                            <deployedDomain>unomi.apache.org</deployedDomain>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-        </plugins>
-    </build>
 
 </project>
diff --git a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
index 8c3dafc1b..f804ac164 100644
--- a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
+++ b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
@@ -23,8 +23,6 @@ import org.apache.unomi.api.services.PrivacyService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -33,7 +31,6 @@ import java.util.List;
 /**
  * REST API end point for privacy service
  */
-@WebService
 @Produces(MediaType.APPLICATION_JSON)
 @CrossOriginResourceSharing(
         allowAllOrigins = true,
@@ -46,7 +43,6 @@ public class PrivacyServiceEndPoint {
     @Reference
     private PrivacyService privacyService;
 
-    @WebMethod(exclude = true)
     public void setPrivacyService(PrivacyService privacyService) {
         this.privacyService = privacyService;
     }
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index baf1641ff..e09eefaf1 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -17,46 +17,60 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>cxs-privacy-extension</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cxs-privacy-extension-services</artifactId>
     <name>Apache Unomi :: Extensions :: Privacy :: Services</name>
     <description>Privacy management extension service implementation for the Apache Unomi Context Server</description>
-    <version>3.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-lifecycle-watcher</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-lifecycle-watcher</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 522918044..6151b40ee 100644
--- a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -15,10 +15,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
+           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+           http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0 https://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.3.0.xsd">
 
     <reference id="persistenceService"
                interface="org.apache.unomi.persistence.spi.PersistenceService"/>
diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml
index 2f502f88c..b75236bb0 100644
--- a/extensions/router/pom.xml
+++ b/extensions/router/pom.xml
@@ -16,13 +16,11 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-extensions</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>unomi-router</artifactId>
     <name>Apache Unomi :: Extensions :: Router</name>
     <description>Apache Camel Router for the Apache Unomi Context server</description>
@@ -31,7 +29,6 @@
     <properties>
         <camel.version>2.23.1</camel.version>
         <kafka.client.version>0.11.0.3</kafka.client.version>
-        <commons-net.version>3.10.0</commons-net.version>
     </properties>
 
     <build>
diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml
index 28bc2af1b..5bcb5e5b2 100644
--- a/extensions/router/router-api/pom.xml
+++ b/extensions/router/router-api/pom.xml
@@ -16,23 +16,33 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>unomi-router</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-router-api</artifactId>
     <name>Apache Unomi :: Extensions :: Router :: API</name>
     <description>Router Specification API</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index 6d031ffff..eaf630cc3 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -16,52 +16,61 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>unomi-router</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-router-core</artifactId>
     <name>Apache Unomi :: Extensions :: Router :: Core</name>
     <description>Router Core (Apache Camel Routes)</description>
     <packaging>bundle</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-api</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-services</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-router-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
@@ -90,6 +99,7 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-ftp</artifactId>
             <version>${camel.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -97,14 +107,15 @@
             <version>${camel.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>${commons-net.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
@@ -113,13 +124,12 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>3.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -133,10 +143,14 @@
             <version>${kafka.client.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.unomi</groupId>
             <artifactId>unomi-tracing-impl</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index f0af23743..972d9699e 100644
--- a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -15,11 +15,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+
 <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
            xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
-                               http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+           http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0 https://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.3.0.xsd">
 
     <reference id="configSharingService" interface="org.apache.unomi.api.services.ConfigSharingService" />
     <reference id="profileImportService" interface="org.apache.unomi.router.api.services.ProfileImportService"/>
diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml
index 838b1f62e..01004d69c 100644
--- a/extensions/router/router-karaf-feature/pom.xml
+++ b/extensions/router/router-karaf-feature/pom.xml
@@ -16,27 +16,74 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>unomi-router</artifactId>
         <groupId>org.apache.unomi</groupId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>unomi-router-karaf-feature</artifactId>
     <name>Apache Unomi :: Extensions :: Router :: Apache Karaf Feature</name>
     <description>Apache Karaf feature for the Apache Unomi Context Server extension</description>
     <packaging>kar</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.unomi</groupId>
+                <artifactId>unomi-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
-            <version>0.1.54_1</version>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-persistence-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-router-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-router-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-router-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-router-rest</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-security-cors</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>${commons-net.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-osgi</artifactId>
+            <type>bundle</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-osgi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
+            <version>0.1.54_1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -88,49 +135,6 @@
             <artifactId>camel-kafka</artifactId>
             <version>${camel.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-cors</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-
-        <!-- UNOMI ROUTER Modules Dependencies -->
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-persistence-spi</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-router-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-router-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-router-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.unomi</groupId>
-            <artifactId>unomi-router-rest</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-osgi</artifactId>
-            <type>bundle</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore-osgi</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -154,6 +158,42 @@
                 <configuration>
                     <startLevel>90</startLevel>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-features</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>features-generate-descriptor</goal>
+                        </goals>
+                        <configuration>
+                            <enableGeneration>true</enableGeneration>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>verify-feature</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.unomi/unomi-kar/${project.version}/xml/features</descriptor>
+                                <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+                            </descriptors>
+                            <distribution>org.apache.karaf:apache-karaf:zip:${karaf.version}</distribution>
+                            <javase>17</javase>
+                            <framework>
+                                <feature>framework</feature>
+                            </framework>
+                            <features>
+                                <feature>unomi-router-karaf-feature</feature>
+                            </features>
+                            <ignoreMissingConditions>true</ignoreMissingConditions>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/extensions/router/router-karaf-feature/src/main/feature/feature.xml b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
... 48225 lines suppressed ...


(unomi) 02/02: chore: Update Java version in CI workflow and adjust serialVersionUIDs

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch merge/manual-merge
in repository https://gitbox.apache.org/repos/asf/unomi.git

commit 83f0d79e397bbf1e4bb2e8a4aa0499d0c5808fc3
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Sat Dec 6 09:14:19 2025 +0100

    chore: Update Java version in CI workflow and adjust serialVersionUIDs
    
    - Changed JDK setup from version 11 to 17 in the GitHub Actions workflow for improved compatibility and performance.
    - Updated serialVersionUIDs in Item.java and Parameter.java to reflect changes in class structure, ensuring proper serialization compatibility.
---
 .github/workflows/unomi-ci-docs.yml                   | 8 +++++---
 api/src/main/java/org/apache/unomi/api/Item.java      | 2 +-
 api/src/main/java/org/apache/unomi/api/Parameter.java | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unomi-ci-docs.yml b/.github/workflows/unomi-ci-docs.yml
index 9e91611fb..b5381b92a 100644
--- a/.github/workflows/unomi-ci-docs.yml
+++ b/.github/workflows/unomi-ci-docs.yml
@@ -16,10 +16,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
       
       - name: Install GraphViz
         run: |
diff --git a/api/src/main/java/org/apache/unomi/api/Item.java b/api/src/main/java/org/apache/unomi/api/Item.java
index 080ffd4f4..3e591fb74 100644
--- a/api/src/main/java/org/apache/unomi/api/Item.java
+++ b/api/src/main/java/org/apache/unomi/api/Item.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public abstract class Item implements Serializable {
     private static final Logger LOGGER = LoggerFactory.getLogger(Item.class.getName());
 
-    private static final long serialVersionUID = 7446061538573517071L;
+    private static final long serialVersionUID = 1217180125083162915L;
 
     private static final Map<Class,String> itemTypeCache = new ConcurrentHashMap<>();
 
diff --git a/api/src/main/java/org/apache/unomi/api/Parameter.java b/api/src/main/java/org/apache/unomi/api/Parameter.java
index 99870c44c..7155472f7 100644
--- a/api/src/main/java/org/apache/unomi/api/Parameter.java
+++ b/api/src/main/java/org/apache/unomi/api/Parameter.java
@@ -27,7 +27,7 @@ import java.io.Serializable;
  */
 public class Parameter implements Serializable {
 
-    private static final long serialVersionUID = 7446061538573517071L;
+    private static final long serialVersionUID = 6019392686888941547L;
 
     private String id;
     private String type;