This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch unomi-3-dev in repository https://gitbox.apache.org/repos/asf/unomi.git
commit c5d240aaac23912c878b8906235167562d292cf7 Author: Serge Huber <[email protected]> AuthorDate: Mon Jan 5 15:59:04 2026 +0100 Merges corrections --- bom/artifacts/pom.xml | 2 +- package/pom.xml | 3 +-- .../src/main/resources/etc/custom.system.properties | 19 +------------------ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/bom/artifacts/pom.xml b/bom/artifacts/pom.xml index 46a432227..35bdc5937 100644 --- a/bom/artifacts/pom.xml +++ b/bom/artifacts/pom.xml @@ -80,7 +80,7 @@ <artifactId>unomi-persistence-opensearch-core</artifactId> <version>${project.version}</version> </dependency> -<dependency> + <dependency> <groupId>org.apache.unomi</groupId> <artifactId>unomi-persistence-opensearch-conditions</artifactId> <version>${project.version}</version> diff --git a/package/pom.xml b/package/pom.xml index a0a3f90da..74ce771b9 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -365,8 +365,7 @@ <feature>unomi-rest-ui</feature> <feature>unomi-healthcheck</feature> <feature>cdp-graphql-feature</feature> - -<feature>unomi-distribution-elasticsearch</feature> + <feature>unomi-distribution-elasticsearch</feature> <feature>unomi-distribution-opensearch</feature> </installedFeatures> <javase>17</javase> diff --git a/package/src/main/resources/etc/custom.system.properties b/package/src/main/resources/etc/custom.system.properties index 747d9dd79..582686180 100644 --- a/package/src/main/resources/etc/custom.system.properties +++ b/package/src/main/resources/etc/custom.system.properties @@ -495,31 +495,14 @@ org.apache.unomi.weatherUpdate.apiKey=${env:UNOMI_WEATHERUPDATE_APIKEY:-YOUR_WEA org.apache.unomi.weatherUpdate.url.base=${env:UNOMI_WEATHERUPDATE_URL_BASE:-http://api.openweathermap.org} org.apache.unomi.weatherUpdate.url.attributes=${env:UNOMI_WEATHERUPDATE_URL_ATTRIBUTES:-data/2.5/weather} -####################################################################################################################### -## Settings for GraphQL ## -####################################################################################################################### -org.apache.unomi.graphql.feature.activated=${env:UNOMI_GRAPHQL_FEATURE_ACTIVATED:-false} - ####################################################################################################################### ## Settings for migration ## ####################################################################################################################### org.apache.unomi.migration.recoverFromHistory=${env:UNOMI_MIGRATION_RECOVER_FROM_HISTORY:-true} ####################################################################################################################### -## HealthCheck Settings ## +## Karaf Role Settings ## ####################################################################################################################### -org.apache.unomi.healthcheck.enabled:${env:UNOMI_HEALTHCHECK_ENABLED:-true} -org.apache.unomi.healthcheck.password=${env:UNOMI_HEALTHCHECK_PASSWORD:-health} -# -# Specify the list of health check providers (name) to use. The list is comma separated. Other providers will be ignored. -# As Karaf provider is the one needed by healthcheck (always LIVE), it cannot be ignored. -# -org.apache.unomi.healthcheck.providers:${env:UNOMI_HEALTHCHECK_PROVIDERS:-cluster,elasticsearch,opensearch,unomi,persistence} -# -# Specify the timeout in milliseconds for each healthcheck provider call. The default value is 400ms. -# If timeout is raised, the provider is marked in ERROR. -# -org.apache.unomi.healthcheck.timeout:${env:UNOMI_HEALTHCHECK_TIMEOUT:-400} # Override Karaf's local roles to add some of our own karaf.local.roles = admin,manager,viewer,systembundles,ROLE_UNOMI_ADMIN,ROLE_UNOMI_TENANT_ADMIN,ROLE_UNOMI_TENANT_USER
