This is an automated email from the ASF dual-hosted git repository. jsinovassinnaik pushed a commit to branch UNOMI-867 in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 3d7c58febe9e689a632e68a3cc70d9b9ef001ff8 Author: jsinovassin <[email protected]> AuthorDate: Fri Dec 6 18:15:26 2024 +0100 UNOMI-867: use a unique name in reindex step in migration --- api/pom.xml | 2 +- common/pom.xml | 4 ++-- docker/pom.xml | 2 +- extensions/geonames/pom.xml | 2 +- extensions/geonames/rest/pom.xml | 2 +- extensions/geonames/services/pom.xml | 2 +- extensions/groovy-actions/karaf-kar/pom.xml | 4 ++-- extensions/groovy-actions/pom.xml | 2 +- extensions/groovy-actions/rest/pom.xml | 2 +- extensions/groovy-actions/services/pom.xml | 2 +- extensions/healthcheck/pom.xml | 2 +- extensions/json-schema/pom.xml | 2 +- extensions/json-schema/rest/pom.xml | 2 +- extensions/json-schema/services/pom.xml | 2 +- extensions/lists-extension/actions/pom.xml | 2 +- extensions/lists-extension/pom.xml | 4 ++-- extensions/lists-extension/rest/pom.xml | 2 +- extensions/lists-extension/services/pom.xml | 2 +- extensions/log4j-extension/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/privacy-extension/pom.xml | 4 ++-- extensions/privacy-extension/rest/pom.xml | 2 +- extensions/privacy-extension/services/pom.xml | 4 ++-- extensions/router/pom.xml | 2 +- extensions/router/router-api/pom.xml | 2 +- extensions/router/router-core/pom.xml | 2 +- extensions/router/router-karaf-feature/pom.xml | 2 +- extensions/router/router-rest/pom.xml | 4 ++-- extensions/router/router-service/pom.xml | 2 +- extensions/salesforce-connector/actions/pom.xml | 4 ++-- extensions/salesforce-connector/karaf-kar/pom.xml | 4 ++-- extensions/salesforce-connector/pom.xml | 2 +- extensions/salesforce-connector/rest/pom.xml | 2 +- extensions/salesforce-connector/services/pom.xml | 2 +- extensions/weather-update/core/pom.xml | 2 +- extensions/weather-update/karaf-kar/pom.xml | 2 +- extensions/weather-update/pom.xml | 2 +- extensions/web-tracker/pom.xml | 2 +- extensions/web-tracker/wab/pom.xml | 2 +- graphql/cxs-impl/pom.xml | 2 +- graphql/graphql-ui/pom.xml | 2 +- graphql/karaf-feature/pom.xml | 2 +- graphql/pom.xml | 2 +- itests/pom.xml | 2 +- kar/pom.xml | 2 +- lifecycle-watcher/pom.xml | 2 +- manual/pom.xml | 4 ++-- metrics/pom.xml | 2 +- package/pom.xml | 2 +- persistence-elasticsearch/core/pom.xml | 2 +- persistence-elasticsearch/pom.xml | 2 +- persistence-spi/pom.xml | 2 +- plugins/baseplugin/pom.xml | 2 +- plugins/hover-event/pom.xml | 2 +- plugins/kafka-injector/pom.xml | 2 +- plugins/mail/pom.xml | 2 +- plugins/optimization-test/pom.xml | 2 +- plugins/past-event/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/request/pom.xml | 2 +- plugins/tracked-event/pom.xml | 2 +- pom.xml | 2 +- rest/pom.xml | 2 +- samples/graphql-providers-feature/pom.xml | 2 +- samples/graphql-providers/pom.xml | 2 +- samples/groovy-actions/pom.xml | 2 +- samples/login-integration/pom.xml | 4 ++-- samples/pom.xml | 2 +- samples/trainingplugin/pom.xml | 6 +++--- samples/tweet-button-plugin/pom.xml | 4 ++-- scripting/pom.xml | 4 ++-- services/pom.xml | 2 +- tools/pom.xml | 4 ++-- tools/shell-commands/pom.xml | 2 +- .../org/apache/unomi/shell/migration/utils/MigrationUtils.java | 8 ++++---- .../META-INF/cxs/migration/migrate-2.0.0-05-globalReindex.groovy | 2 +- .../META-INF/cxs/migration/migrate-2.0.0-10-profileReindex.groovy | 2 +- .../META-INF/cxs/migration/migrate-2.0.0-15-eventsReindex.groovy | 2 +- .../migrate-2.5.0-00-cleanPastEventProfileSession.groovy | 4 ++-- tools/shell-dev-commands/pom.xml | 2 +- wab/pom.xml | 2 +- 81 files changed, 100 insertions(+), 100 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 3ed267975..84ae34f40 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-api</artifactId> diff --git a/common/pom.xml b/common/pom.xml index e202af18d..27d1b95e4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-common</artifactId> @@ -58,7 +58,7 @@ <dependency> <groupId>org.apache.unomi</groupId> <artifactId>unomi-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/docker/pom.xml b/docker/pom.xml index 57502de25..2bca66d06 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-docker</artifactId> diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml index f83aaccbb..0b4b6c161 100644 --- a/extensions/geonames/pom.xml +++ b/extensions/geonames/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>cxs-geonames</artifactId> diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml index 34b3f1ce3..5e0355a25 100644 --- a/extensions/geonames/rest/pom.xml +++ b/extensions/geonames/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>cxs-geonames</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml index 0fe65c5b9..a5808e441 100644 --- a/extensions/geonames/services/pom.xml +++ b/extensions/geonames/services/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>cxs-geonames</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/groovy-actions/karaf-kar/pom.xml b/extensions/groovy-actions/karaf-kar/pom.xml index 4468e93be..61c4c2d1f 100644 --- a/extensions/groovy-actions/karaf-kar/pom.xml +++ b/extensions/groovy-actions/karaf-kar/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-groovy-actions-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -56,4 +56,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/extensions/groovy-actions/pom.xml b/extensions/groovy-actions/pom.xml index 53892b110..5a9033e99 100644 --- a/extensions/groovy-actions/pom.xml +++ b/extensions/groovy-actions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-groovy-actions-root</artifactId> diff --git a/extensions/groovy-actions/rest/pom.xml b/extensions/groovy-actions/rest/pom.xml index de1052262..85f925c47 100644 --- a/extensions/groovy-actions/rest/pom.xml +++ b/extensions/groovy-actions/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-groovy-actions-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/groovy-actions/services/pom.xml b/extensions/groovy-actions/services/pom.xml index 3d4de386e..db665e363 100644 --- a/extensions/groovy-actions/services/pom.xml +++ b/extensions/groovy-actions/services/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-groovy-actions-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/healthcheck/pom.xml b/extensions/healthcheck/pom.xml index 8b5f9253b..aa707f48e 100644 --- a/extensions/healthcheck/pom.xml +++ b/extensions/healthcheck/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>healthcheck</artifactId> diff --git a/extensions/json-schema/pom.xml b/extensions/json-schema/pom.xml index a38969f6a..21be8f78d 100644 --- a/extensions/json-schema/pom.xml +++ b/extensions/json-schema/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-json-schema-root</artifactId> diff --git a/extensions/json-schema/rest/pom.xml b/extensions/json-schema/rest/pom.xml index a9d9094d6..fe430d7da 100644 --- a/extensions/json-schema/rest/pom.xml +++ b/extensions/json-schema/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-json-schema-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/json-schema/services/pom.xml b/extensions/json-schema/services/pom.xml index 4538c8846..e4409a8e0 100644 --- a/extensions/json-schema/services/pom.xml +++ b/extensions/json-schema/services/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-json-schema-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml index e6a1f753d..5448a4cac 100644 --- a/extensions/lists-extension/actions/pom.xml +++ b/extensions/lists-extension/actions/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>cxs-lists-extension</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml index 55b6013c9..ba200f477 100644 --- a/extensions/lists-extension/pom.xml +++ b/extensions/lists-extension/pom.xml @@ -28,11 +28,11 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>cxs-lists-extension</artifactId> <name>Apache Unomi :: Extensions :: Lists</name> <description>List extension for the Apache Unomi Context Server</description> <packaging>pom</packaging> -</project> \ No newline at end of file +</project> diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml index 2ef53bcba..225a47216 100644 --- a/extensions/lists-extension/rest/pom.xml +++ b/extensions/lists-extension/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>cxs-lists-extension</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml index 7cabb2a02..e501f9878 100644 --- a/extensions/lists-extension/services/pom.xml +++ b/extensions/lists-extension/services/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>cxs-lists-extension</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/log4j-extension/pom.xml b/extensions/log4j-extension/pom.xml index 007010d3b..88689f375 100644 --- a/extensions/log4j-extension/pom.xml +++ b/extensions/log4j-extension/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/extensions/pom.xml b/extensions/pom.xml index 707f8b78a..cda3c5fe9 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-extensions</artifactId> diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml index e95cd9224..37ed9afbc 100644 --- a/extensions/privacy-extension/pom.xml +++ b/extensions/privacy-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>cxs-privacy-extension</artifactId> @@ -35,4 +35,4 @@ <description>Privacy management extension for the Apache Unomi Context Server</description> <packaging>pom</packaging> -</project> \ No newline at end of file +</project> diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml index ebfa43556..9d5f51843 100644 --- a/extensions/privacy-extension/rest/pom.xml +++ b/extensions/privacy-extension/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>cxs-privacy-extension</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml index ff8b64442..5799dc55e 100644 --- a/extensions/privacy-extension/services/pom.xml +++ b/extensions/privacy-extension/services/pom.xml @@ -20,14 +20,14 @@ <parent> <artifactId>cxs-privacy-extension</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-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>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml index 952614678..06c15e8dc 100644 --- a/extensions/router/pom.xml +++ b/extensions/router/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-router</artifactId> diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml index ef5a6d63c..307911b39 100644 --- a/extensions/router/router-api/pom.xml +++ b/extensions/router/router-api/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-router</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml index a8ce97fd4..2f41c5c30 100644 --- a/extensions/router/router-core/pom.xml +++ b/extensions/router/router-core/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-router</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml index 1ef821ef1..475941854 100644 --- a/extensions/router/router-karaf-feature/pom.xml +++ b/extensions/router/router-karaf-feature/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-router</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/router/router-rest/pom.xml b/extensions/router/router-rest/pom.xml index 5ea40ec2b..23efb254a 100644 --- a/extensions/router/router-rest/pom.xml +++ b/extensions/router/router-rest/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-router</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -92,4 +92,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/extensions/router/router-service/pom.xml b/extensions/router/router-service/pom.xml index c24e9e2d6..4f0801d2c 100644 --- a/extensions/router/router-service/pom.xml +++ b/extensions/router/router-service/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-router</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/salesforce-connector/actions/pom.xml b/extensions/salesforce-connector/actions/pom.xml index e60499d63..d2167f6f9 100644 --- a/extensions/salesforce-connector/actions/pom.xml +++ b/extensions/salesforce-connector/actions/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-salesforce-connector</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -46,4 +46,4 @@ </dependencies> -</project> \ No newline at end of file +</project> diff --git a/extensions/salesforce-connector/karaf-kar/pom.xml b/extensions/salesforce-connector/karaf-kar/pom.xml index f0fa2b6aa..526644a6d 100644 --- a/extensions/salesforce-connector/karaf-kar/pom.xml +++ b/extensions/salesforce-connector/karaf-kar/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-salesforce-connector</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -88,4 +88,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/extensions/salesforce-connector/pom.xml b/extensions/salesforce-connector/pom.xml index b759f7d5b..ccd0a8ee5 100644 --- a/extensions/salesforce-connector/pom.xml +++ b/extensions/salesforce-connector/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-salesforce-connector</artifactId> diff --git a/extensions/salesforce-connector/rest/pom.xml b/extensions/salesforce-connector/rest/pom.xml index d40ff5314..08cf3f046 100644 --- a/extensions/salesforce-connector/rest/pom.xml +++ b/extensions/salesforce-connector/rest/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-salesforce-connector</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/salesforce-connector/services/pom.xml b/extensions/salesforce-connector/services/pom.xml index 5ab56663c..d6b108e60 100644 --- a/extensions/salesforce-connector/services/pom.xml +++ b/extensions/salesforce-connector/services/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-salesforce-connector</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/weather-update/core/pom.xml b/extensions/weather-update/core/pom.xml index df00b96b0..e09827f18 100755 --- a/extensions/weather-update/core/pom.xml +++ b/extensions/weather-update/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-weather-update</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-weather-update-core</artifactId> diff --git a/extensions/weather-update/karaf-kar/pom.xml b/extensions/weather-update/karaf-kar/pom.xml index 5a7a1ab49..e85c4f34d 100644 --- a/extensions/weather-update/karaf-kar/pom.xml +++ b/extensions/weather-update/karaf-kar/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-weather-update</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/extensions/weather-update/pom.xml b/extensions/weather-update/pom.xml index 6324cd0ec..d061e82b2 100644 --- a/extensions/weather-update/pom.xml +++ b/extensions/weather-update/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-weather-update</artifactId> diff --git a/extensions/web-tracker/pom.xml b/extensions/web-tracker/pom.xml index 3f962a423..cfb6543d1 100644 --- a/extensions/web-tracker/pom.xml +++ b/extensions/web-tracker/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-extensions</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-web-tracker</artifactId> diff --git a/extensions/web-tracker/wab/pom.xml b/extensions/web-tracker/wab/pom.xml index b7b2633d0..0e9d118f2 100644 --- a/extensions/web-tracker/wab/pom.xml +++ b/extensions/web-tracker/wab/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-web-tracker</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-web-tracker-wab</artifactId> diff --git a/graphql/cxs-impl/pom.xml b/graphql/cxs-impl/pom.xml index 03efbc46f..3dab97400 100644 --- a/graphql/cxs-impl/pom.xml +++ b/graphql/cxs-impl/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-graphql</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/graphql/graphql-ui/pom.xml b/graphql/graphql-ui/pom.xml index 0947ba804..3128aacdd 100644 --- a/graphql/graphql-ui/pom.xml +++ b/graphql/graphql-ui/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-graphql</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-graphql-ui</artifactId> diff --git a/graphql/karaf-feature/pom.xml b/graphql/karaf-feature/pom.xml index d18139e9b..b3f21c2b2 100644 --- a/graphql/karaf-feature/pom.xml +++ b/graphql/karaf-feature/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-graphql</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>kar</packaging> diff --git a/graphql/pom.xml b/graphql/pom.xml index f0d3d8f75..8a52ff4de 100644 --- a/graphql/pom.xml +++ b/graphql/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-graphql</artifactId> diff --git a/itests/pom.xml b/itests/pom.xml index f61cbcd15..88d5062ad 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-itests</artifactId> <name>Apache Unomi :: Integration Tests</name> diff --git a/kar/pom.xml b/kar/pom.xml index 226e3c85c..2b2e9b60e 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-kar</artifactId> diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml index 444db2f3a..0fc5d187e 100644 --- a/lifecycle-watcher/pom.xml +++ b/lifecycle-watcher/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>unomi-root</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/manual/pom.xml b/manual/pom.xml index c49f65a3d..446cc1f0e 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>unomi-root</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -243,4 +243,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> diff --git a/metrics/pom.xml b/metrics/pom.xml index 102ba8e30..2becd789e 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-metrics</artifactId> diff --git a/package/pom.xml b/package/pom.xml index 13af2a5be..629b47647 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi</artifactId> diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml index ee5afc77f..8cd5f5d75 100644 --- a/persistence-elasticsearch/core/pom.xml +++ b/persistence-elasticsearch/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-persistence-elasticsearch</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-persistence-elasticsearch-core</artifactId> diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml index 01aa88967..a2081873f 100644 --- a/persistence-elasticsearch/pom.xml +++ b/persistence-elasticsearch/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-persistence-elasticsearch</artifactId> diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml index 0129f2788..498ee439a 100644 --- a/persistence-spi/pom.xml +++ b/persistence-spi/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-persistence-spi</artifactId> diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml index b4f260369..5143e32fb 100644 --- a/plugins/baseplugin/pom.xml +++ b/plugins/baseplugin/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-base</artifactId> diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml index 15bbe3fea..df7fbe617 100644 --- a/plugins/hover-event/pom.xml +++ b/plugins/hover-event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-hover-event</artifactId> diff --git a/plugins/kafka-injector/pom.xml b/plugins/kafka-injector/pom.xml index 59660ab60..13dd87044 100644 --- a/plugins/kafka-injector/pom.xml +++ b/plugins/kafka-injector/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>kafka-extension</artifactId> diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml index 40c931225..bd2d26934 100644 --- a/plugins/mail/pom.xml +++ b/plugins/mail/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-mail</artifactId> diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml index e5def900e..28215bc76 100644 --- a/plugins/optimization-test/pom.xml +++ b/plugins/optimization-test/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-optimization-test</artifactId> diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml index c22a797b4..37ea4b514 100644 --- a/plugins/past-event/pom.xml +++ b/plugins/past-event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-past-event</artifactId> diff --git a/plugins/pom.xml b/plugins/pom.xml index c810f306e..c78be5e05 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins</artifactId> diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml index 0e1ed3874..46021034d 100644 --- a/plugins/request/pom.xml +++ b/plugins/request/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-request</artifactId> diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml index fb9279d18..3c7219822 100644 --- a/plugins/tracked-event/pom.xml +++ b/plugins/tracked-event/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-plugins</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-plugins-tracked-event</artifactId> diff --git a/pom.xml b/pom.xml index c537486e1..fd1cbce65 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ event tracking server. </description> <url>https://unomi.apache.org</url> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <packaging>pom</packaging> <licenses> diff --git a/rest/pom.xml b/rest/pom.xml index fc856dbcd..ffbee232f 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-rest</artifactId> diff --git a/samples/graphql-providers-feature/pom.xml b/samples/graphql-providers-feature/pom.xml index 7a6475aaf..39083df4b 100644 --- a/samples/graphql-providers-feature/pom.xml +++ b/samples/graphql-providers-feature/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>graphql-providers-sample-feature</artifactId> diff --git a/samples/graphql-providers/pom.xml b/samples/graphql-providers/pom.xml index 0d9fc89b2..eb2e0c8fc 100644 --- a/samples/graphql-providers/pom.xml +++ b/samples/graphql-providers/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>graphql-providers-sample</artifactId> diff --git a/samples/groovy-actions/pom.xml b/samples/groovy-actions/pom.xml index c9f07a5d1..91f6aa8c3 100644 --- a/samples/groovy-actions/pom.xml +++ b/samples/groovy-actions/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>test-groovy-action-sample</artifactId> diff --git a/samples/login-integration/pom.xml b/samples/login-integration/pom.xml index 574322603..f29c26ac8 100644 --- a/samples/login-integration/pom.xml +++ b/samples/login-integration/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>login-integration-sample</artifactId> @@ -61,4 +61,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/samples/pom.xml b/samples/pom.xml index 2ae966fd2..36e49d60b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>unomi-root</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/trainingplugin/pom.xml b/samples/trainingplugin/pom.xml index 194409154..aa421e4fd 100644 --- a/samples/trainingplugin/pom.xml +++ b/samples/trainingplugin/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>training-plugin</artifactId> <name>Apache Unomi :: Samples :: Training plugin</name> @@ -31,7 +31,7 @@ <dependency> <groupId>org.apache.unomi</groupId> <artifactId>unomi-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> @@ -50,4 +50,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml index d2c35c89e..485ab8453 100644 --- a/samples/tweet-button-plugin/pom.xml +++ b/samples/tweet-button-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>tweet-button-plugin</artifactId> @@ -53,4 +53,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/scripting/pom.xml b/scripting/pom.xml index a4569828a..80208ec16 100644 --- a/scripting/pom.xml +++ b/scripting/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-scripting</artifactId> @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.unomi</groupId> <artifactId>unomi-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/services/pom.xml b/services/pom.xml index c4cf7e4da..bd5a7c85d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-services</artifactId> diff --git a/tools/pom.xml b/tools/pom.xml index 03372169f..38d6f2ac8 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-tools</artifactId> @@ -34,4 +34,4 @@ <module>shell-dev-commands</module> </modules> -</project> \ No newline at end of file +</project> diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml index 707c9f806..083b4d239 100644 --- a/tools/shell-commands/pom.xml +++ b/tools/shell-commands/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>unomi-tools</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>shell-commands</artifactId> diff --git a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java index e08cbb733..a92898681 100644 --- a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java +++ b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java @@ -196,7 +196,7 @@ public class MigrationUtils { } } - public static void reIndex(CloseableHttpClient httpClient, BundleContext bundleContext, String esAddress, String indexName, String newIndexSettings, String painlessScript, MigrationContext migrationContext) throws Exception { + public static void reIndex(CloseableHttpClient httpClient, BundleContext bundleContext, String esAddress, String indexName, String newIndexSettings, String painlessScript, MigrationContext migrationContext, String migrationUniqueName) throws Exception { if (indexName.endsWith("-cloned")) { // We should never reIndex a clone ... return; @@ -208,7 +208,7 @@ public class MigrationUtils { String setIndexReadOnlyRequest = resourceAsString(bundleContext, "requestBody/2.0.0/base_set_index_readonly_request.json"); - migrationContext.performMigrationStep("Reindex step for: " + indexName + " (clone creation)", () -> { + migrationContext.performMigrationStep(migrationUniqueName + " - reindex step for: " + indexName + " (clone creation)", () -> { // Delete clone in case it already exists, could be incomplete from a previous reindex attempt, so better create a fresh one. if (indexExists(httpClient, esAddress, indexNameCloned)) { HttpUtils.executeDeleteRequest(httpClient, esAddress + "/" + indexNameCloned, null); @@ -219,7 +219,7 @@ public class MigrationUtils { HttpUtils.executePostRequest(httpClient, esAddress + "/" + indexName + "/_clone/" + indexNameCloned, null, null); }); - migrationContext.performMigrationStep("Reindex step for: " + indexName + " (recreate the index and perform the re-indexation)", () -> { + migrationContext.performMigrationStep(migrationUniqueName + " - reindex step for: " + indexName + " (recreate the index and perform the re-indexation)", () -> { // Delete original index if it still exists if (indexExists(httpClient, esAddress, indexName)) { HttpUtils.executeDeleteRequest(httpClient, esAddress + "/" + indexName, null); @@ -232,7 +232,7 @@ public class MigrationUtils { waitForTaskToFinish(httpClient, esAddress, task.getString("task"), migrationContext); }); - migrationContext.performMigrationStep("Reindex step for: " + indexName + " (delete clone)", () -> { + migrationContext.performMigrationStep(migrationUniqueName + " - reindex step for: " + indexName + " (delete clone)", () -> { // Delete original index if it still exists if (indexExists(httpClient, esAddress, indexNameCloned)) { HttpUtils.executeDeleteRequest(httpClient, esAddress + "/" + indexNameCloned, null); diff --git a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-05-globalReindex.groovy b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-05-globalReindex.groovy index 3d013b1e4..cc29a9dc5 100644 --- a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-05-globalReindex.groovy +++ b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-05-globalReindex.groovy @@ -27,5 +27,5 @@ String[] indicesToReindex = ["segment", "scoring", "campaign", "conditionType", indicesToReindex.each { indexToReindex -> String mapping = MigrationUtils.resourceAsString(bundleContext, "requestBody/2.0.0/mappings/${indexToReindex}.json") String newIndexSettings = MigrationUtils.buildIndexCreationRequest(baseSettings, mapping, context, false) - MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, "${indexPrefix}-${indexToReindex.toLowerCase()}", newIndexSettings, null, context) + MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, "${indexPrefix}-${indexToReindex.toLowerCase()}", newIndexSettings, null, context, "migrate-2.0.0-05-globalReindex") } diff --git a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-10-profileReindex.groovy b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-10-profileReindex.groovy index bcb4e6ae7..b4e86761c 100644 --- a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-10-profileReindex.groovy +++ b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-10-profileReindex.groovy @@ -26,4 +26,4 @@ String baseSettings = MigrationUtils.resourceAsString(bundleContext, "requestBod String mapping = MigrationUtils.extractMappingFromBundles(bundleContext, "profile.json") String newIndexSettings = MigrationUtils.buildIndexCreationRequest(baseSettings, mapping, context, false) MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, indexPrefix + "-profile", - newIndexSettings, MigrationUtils.getFileWithoutComments(bundleContext, "requestBody/2.0.0/profile_migrate.painless"), context) + newIndexSettings, MigrationUtils.getFileWithoutComments(bundleContext, "requestBody/2.0.0/profile_migrate.painless"), context, "migrate-2.0.0-10-profileReindex") diff --git a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-15-eventsReindex.groovy b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-15-eventsReindex.groovy index 85a25df87..274fa7b19 100644 --- a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-15-eventsReindex.groovy +++ b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.0.0-15-eventsReindex.groovy @@ -35,5 +35,5 @@ String mapping = MigrationUtils.extractMappingFromBundles(bundleContext, "event. String newIndexSettings = MigrationUtils.buildIndexCreationRequest(baseSettings, mapping, context, true) Set<String> eventIndices = MigrationUtils.getIndexesPrefixedBy(context.getHttpClient(), esAddress, "${indexPrefix}-event-date-") eventIndices.each { eventIndex -> - MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, eventIndex, newIndexSettings, reIndexScript, context) + MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, eventIndex, newIndexSettings, reIndexScript, context, "migrate-2.0.0-15-eventsReindex") } diff --git a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.5.0-00-cleanPastEventProfileSession.groovy b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.5.0-00-cleanPastEventProfileSession.groovy index 7b519ce47..2e45b437d 100644 --- a/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.5.0-00-cleanPastEventProfileSession.groovy +++ b/tools/shell-commands/src/main/resources/META-INF/cxs/migration/migrate-2.5.0-00-cleanPastEventProfileSession.groovy @@ -32,7 +32,7 @@ context.performMigrationStep("2.5.0-clean-profile-mapping", () -> { String updatePastEventScript = MigrationUtils.getFileWithoutComments(bundleContext, "requestBody/2.5.0/update_pastEvents_profile.painless") String mapping = MigrationUtils.extractMappingFromBundles(bundleContext, "profile.json") String newIndexSettings = MigrationUtils.buildIndexCreationRequest(baseSettings, mapping, context, false) - MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, indexPrefix + "-profile", newIndexSettings, updatePastEventScript, context) + MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, indexPrefix + "-profile", newIndexSettings, updatePastEventScript, context, "2.5.0-clean-profile-mapping") }) context.performMigrationStep("2.5.0-clean-session-mapping", () -> { @@ -43,6 +43,6 @@ context.performMigrationStep("2.5.0-clean-session-mapping", () -> { Set<String> sessionIndices = MigrationUtils.getIndexesPrefixedBy(context.getHttpClient(), esAddress, "${indexPrefix}-session-") sessionIndices.each { sessionIndex -> - MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, sessionIndex, newIndexSettings, cleanPastEventScript, context) + MigrationUtils.reIndex(context.getHttpClient(), bundleContext, esAddress, sessionIndex, newIndexSettings, cleanPastEventScript, context, "2.5.0-clean-session-mapping") } }) diff --git a/tools/shell-dev-commands/pom.xml b/tools/shell-dev-commands/pom.xml index d47ab9d75..eea793bf5 100644 --- a/tools/shell-dev-commands/pom.xml +++ b/tools/shell-dev-commands/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>unomi-tools</artifactId> <groupId>org.apache.unomi</groupId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>shell-dev-commands</artifactId> diff --git a/wab/pom.xml b/wab/pom.xml index f72628870..b6e4c6be1 100644 --- a/wab/pom.xml +++ b/wab/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> </parent> <artifactId>unomi-wab</artifactId>
