From d1f523eb353319830d4ad050b211a106ff91c103 Mon Sep 17 00:00:00 2001 From: vlo-rte Date: Thu, 9 Jan 2025 15:50:50 +0100 Subject: [PATCH] [RELEASE] 4.6.0-RC.RELEASE Signed-off-by: vlo-rte --- VERSION | 2 +- cli/opfabDockerCli.sh | 6 +- cli/src/package.json | 2 +- config/dev/docker-compose.yml | 6 +- config/docker/docker-compose.yml | 26 +-- .../src/main/modeling/swagger.yaml | 2 +- .../src/main/modeling/swagger.yaml | 2 +- .../src/main/modeling/swagger.yaml | 2 +- services/users/src/main/modeling/swagger.yaml | 2 +- ui/main/package.json | 208 +++++++++--------- 10 files changed, 129 insertions(+), 129 deletions(-) diff --git a/VERSION b/VERSION index fc1dd57365..e95d765793 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -SNAPSHOT +4.6.0-RC.RELEASE diff --git a/cli/opfabDockerCli.sh b/cli/opfabDockerCli.sh index 9a3b8c70a2..2b3110b845 100755 --- a/cli/opfabDockerCli.sh +++ b/cli/opfabDockerCli.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2024, RTE (http://www.rte-france.com) +# Copyright (c) 2024-2025, RTE (http://www.rte-france.com) # See AUTHORS.txt # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -11,7 +11,7 @@ CONFIG_FILE=$1 if [[ ! -f "$CONFIG_FILE" ]]; then - docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it lfeoperatorfabric/of-opfab-cli:SNAPSHOT + docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it lfeoperatorfabric/of-opfab-cli:4.6.0-RC.RELEASE exit fi @@ -38,4 +38,4 @@ while IFS= read -r line; do done < "$CONFIG_FILE" # Run the Docker command with the selected configuration -docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it -e ENV_NAME="$ENV_NAME" -e OPFAB_URL="$OPFAB_URL" -e OPFAB_PORT="$OPFAB_PORT" -e OPFAB_LOGIN="$OPFAB_LOGIN" -e OPFAB_PASSWORD="$OPFAB_PASSWORD" lfeoperatorfabric/of-opfab-cli:SNAPSHOT \ No newline at end of file +docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it -e ENV_NAME="$ENV_NAME" -e OPFAB_URL="$OPFAB_URL" -e OPFAB_PORT="$OPFAB_PORT" -e OPFAB_LOGIN="$OPFAB_LOGIN" -e OPFAB_PASSWORD="$OPFAB_PASSWORD" lfeoperatorfabric/of-opfab-cli:4.6.0-RC.RELEASE \ No newline at end of file diff --git a/cli/src/package.json b/cli/src/package.json index 90fc83632c..0b3cb4393d 100644 --- a/cli/src/package.json +++ b/cli/src/package.json @@ -1,6 +1,6 @@ { "name": "opfab-cli", - "version": "SNAPSHOT", + "version": "4.6.0-RC.RELEASE", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/config/dev/docker-compose.yml b/config/dev/docker-compose.yml index 70805f6986..854a801bc2 100755 --- a/config/dev/docker-compose.yml +++ b/config/dev/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.1' services: rabbitmq: container_name: rabbit - image: "lfeoperatorfabric/of-rabbitmq:SNAPSHOT" + image: "lfeoperatorfabric/of-rabbitmq:4.6.0-RC.RELEASE" ports: - "5672:5672" - "15672:15672" @@ -39,7 +39,7 @@ services: mem_limit: 1g web-ui: container_name: web-ui - image: "lfeoperatorfabric/of-web-ui:SNAPSHOT" + image: "lfeoperatorfabric/of-web-ui:4.6.0-RC.RELEASE" ports: - "2002:80" volumes: @@ -49,7 +49,7 @@ services: - "./nginx.conf:/etc/nginx/conf.d/default.conf" ext-app: container_name: external-app - image: "lfeoperatorfabric/of-external-app:SNAPSHOT" + image: "lfeoperatorfabric/of-external-app:4.6.0-RC.RELEASE" ports: - "8090:8090" volumes: diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml index 3ed2bc161e..b65da87fec 100755 --- a/config/docker/docker-compose.yml +++ b/config/docker/docker-compose.yml @@ -11,7 +11,7 @@ services: - "./mongodump:/dump" rabbitmq: container_name: rabbit - image: "lfeoperatorfabric/of-rabbitmq:SNAPSHOT" + image: "lfeoperatorfabric/of-rabbitmq:4.6.0-RC.RELEASE" hostname: rabbit @@ -79,7 +79,7 @@ services: ALLOW_PLAINTEXT_LISTENER: "yes" users: container_name: users - image: "lfeoperatorfabric/of-users-service:SNAPSHOT" + image: "lfeoperatorfabric/of-users-service:4.6.0-RC.RELEASE" depends_on: - mongodb - rabbitmq @@ -95,7 +95,7 @@ services: - ${CONFIG_PATH}:/external-config businessconfig: container_name: businessconfig - image: "lfeoperatorfabric/of-businessconfig-service:SNAPSHOT" + image: "lfeoperatorfabric/of-businessconfig-service:4.6.0-RC.RELEASE" depends_on: - mongodb user: ${USER_ID}:${USER_GID} @@ -111,7 +111,7 @@ services: - ${CONFIG_PATH}:/external-config cards-publication: container_name: cards-publication - image: "lfeoperatorfabric/of-cards-publication-service:SNAPSHOT" + image: "lfeoperatorfabric/of-cards-publication-service:4.6.0-RC.RELEASE" depends_on: - mongodb - rabbitmq @@ -127,7 +127,7 @@ services: - ${CONFIG_PATH}:/external-config cards-consultation: container_name: cards-consultation - image: "lfeoperatorfabric/of-cards-consultation-service:SNAPSHOT" + image: "lfeoperatorfabric/of-cards-consultation-service:4.6.0-RC.RELEASE" depends_on: - mongodb - rabbitmq @@ -144,7 +144,7 @@ services: - ${CONFIG_PATH}:/external-config web-ui: container_name: web-ui - image: "lfeoperatorfabric/of-web-ui:SNAPSHOT" + image: "lfeoperatorfabric/of-web-ui:4.6.0-RC.RELEASE" ports: - "2002:80" depends_on: @@ -158,7 +158,7 @@ services: - "../../src/test/externalWebAppExample:/usr/share/nginx/html/external/appExample" cards-external-diffusion: container_name: cards-external-diffusion - image: "lfeoperatorfabric/of-cards-external-diffusion-service:SNAPSHOT" + image: "lfeoperatorfabric/of-cards-external-diffusion-service:4.6.0-RC.RELEASE" depends_on: - cards-consultation - users @@ -173,7 +173,7 @@ services: - "./common.yml:/usr/app/config/common.yml" cards-reminder: container_name: cards-reminder - image: "lfeoperatorfabric/of-cards-reminder:SNAPSHOT" + image: "lfeoperatorfabric/of-cards-reminder:4.6.0-RC.RELEASE" depends_on: - cards-publication - users @@ -188,7 +188,7 @@ services: - "./common.yml:/usr/app/config/common.yml" supervisor: container_name: supervisor - image: "lfeoperatorfabric/of-supervisor:SNAPSHOT" + image: "lfeoperatorfabric/of-supervisor:4.6.0-RC.RELEASE" depends_on: - cards-publication - users @@ -205,7 +205,7 @@ services: # - "./custom-sounds:/usr/share/nginx/html/assets/sounds" external-devices: container_name: external-devices - image: "lfeoperatorfabric/of-external-devices-service:SNAPSHOT" + image: "lfeoperatorfabric/of-external-devices-service:4.6.0-RC.RELEASE" depends_on: - mongodb - users @@ -224,7 +224,7 @@ services: # External application example ext-app: container_name: external-app - image: "lfeoperatorfabric/of-external-app:SNAPSHOT" + image: "lfeoperatorfabric/of-external-app:4.6.0-RC.RELEASE" ports: - "8090:8090" volumes: @@ -234,7 +234,7 @@ services: # Dummy external devices using Modbus Protocol dummy-modbus-device_1: container_name: dummy-modbus-device_1 - image: "lfeoperatorfabric/of-dummy-modbus-device:SNAPSHOT" + image: "lfeoperatorfabric/of-dummy-modbus-device:4.6.0-RC.RELEASE" user: ${USER_ID}:${USER_GID} ports: - "4031:4030" @@ -243,7 +243,7 @@ services: - ${CONFIG_PATH}:/external-config dummy-modbus-device_2: container_name: dummy-modbus-device_2 - image: "lfeoperatorfabric/of-dummy-modbus-device:SNAPSHOT" + image: "lfeoperatorfabric/of-dummy-modbus-device:4.6.0-RC.RELEASE" user: ${USER_ID}:${USER_GID} ports: - "4032:4030" diff --git a/services/businessconfig/src/main/modeling/swagger.yaml b/services/businessconfig/src/main/modeling/swagger.yaml index f0c5c0e84d..c5589579ba 100755 --- a/services/businessconfig/src/main/modeling/swagger.yaml +++ b/services/businessconfig/src/main/modeling/swagger.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only. - version: SNAPSHOT + version: 4.6.0-RC.RELEASE title: BusinessConfig Management termsOfService: '' contact: diff --git a/services/cards-publication/src/main/modeling/swagger.yaml b/services/cards-publication/src/main/modeling/swagger.yaml index d81cc9086a..c9bf9908ae 100755 --- a/services/cards-publication/src/main/modeling/swagger.yaml +++ b/services/cards-publication/src/main/modeling/swagger.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only. - version: SNAPSHOT + version: 4.6.0-RC.RELEASE title: Card Management API termsOfService: '' contact: diff --git a/services/external-devices/src/main/modeling/swagger.yaml b/services/external-devices/src/main/modeling/swagger.yaml index 6af3594c04..905b58d875 100755 --- a/services/external-devices/src/main/modeling/swagger.yaml +++ b/services/external-devices/src/main/modeling/swagger.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only. - version: SNAPSHOT + version: 4.6.0-RC.RELEASE title: External Devices Management termsOfService: '' contact: diff --git a/services/users/src/main/modeling/swagger.yaml b/services/users/src/main/modeling/swagger.yaml index ac2b597565..5bdc3c6fbb 100755 --- a/services/users/src/main/modeling/swagger.yaml +++ b/services/users/src/main/modeling/swagger.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only. - version: SNAPSHOT + version: 4.6.0-RC.RELEASE title: User Management termsOfService: '' contact: diff --git a/ui/main/package.json b/ui/main/package.json index aa11352eda..8e6eef7d09 100644 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -1,106 +1,106 @@ { - "name": "operatorfabric-ui-main", - "opfabVersion": "SNAPSHOT", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "test": "ng test", - "headless": "ng test --browsers ChromeHeadless --watch=false --code-coverage", - "lint": "npm run lint:ts && npm run lint:css", - "lint:ts": "ng lint", - "lint:css": "stylelint 'src/**/*.*css'", - "prettier": "prettier src/**/* -c", - "e2e": "ng e2e", - "audit": "npm audit --json | $(npm bin)/npm-audit-html --output reports/report.html" - }, - "private": true, - "dependencies": { - "@angular/animations": "18.2.13", - "@angular/common": "18.2.13", - "@angular/compiler": "18.2.13", - "@angular/core": "18.2.13", - "@angular/forms": "18.2.13", - "@angular/localize": "18.2.13", - "@angular/platform-browser": "18.2.13", - "@angular/platform-browser-dynamic": "18.2.13", - "@angular/router": "18.2.13", - "@fortawesome/fontawesome-free": "6.7.2", - "@fullcalendar/angular": "6.1.16", - "@fullcalendar/bootstrap": "6.1.15", - "@fullcalendar/core": "6.1.15", - "@fullcalendar/daygrid": "6.1.15", - "@fullcalendar/interaction": "6.1.15", - "@fullcalendar/rrule": "6.1.15", - "@fullcalendar/timegrid": "6.1.15", - "@ng-bootstrap/ng-bootstrap": "17.0.1", - "@ngx-translate/core": "16.0.4", - "@popperjs/core": "2.11.8", - "@swimlane/ngx-charts": "21.1.2", - "ag-grid-angular": "33.0.3", - "ag-grid-community": "33.0.3", - "angular-oauth2-oidc": "17.0.2", - "bootstrap": "5.3.3", - "chart.js": "4.4.7", - "chartjs-adapter-date-fns": "3.0.0", - "chartjs-plugin-datalabels": "2.2.0", - "date-fns": "4.1.0", - "date-fns-tz": "3.2.0", - "file-saver-es": "2.0.5", - "guid-typescript": "1.0.9", - "handlebars": "4.7.8", - "jwt-decode": "4.0.0", - "lodash-es": "4.17.21", - "ng-event-source": "1.0.14", - "ngx-chips": "3.0.0", - "ngx-daterangepicker-material": "6.0.4", - "ol": "10.2.1", - "quill": "2.0.3", - "rrule": "2.8.1", - "rxjs": "7.8.1", - "virtual-select-plugin": "1.0.46", - "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz" - }, - "devDependencies": { - "@angular-devkit/build-angular": "18.2.12", - "@angular-eslint/builder": "19.0.2", - "@angular-eslint/eslint-plugin": "19.0.2", - "@angular-eslint/eslint-plugin-template": "19.0.2", - "@angular-eslint/schematics": "19.0.2", - "@angular-eslint/template-parser": "19.0.2", - "@angular/cdk": "17.3.10", - "@angular/cli": "18.2.12", - "@angular/compiler-cli": "18.2.13", - "@fortawesome/fontawesome-free": "6.7.2", - "@types/geojson": "^7946.0.10", - "@types/jasmine": "5.1.5", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", - "eslint": "8.57.1", - "eslint-plugin-jest": "28.10.0", - "jasmine-core": "5.5.0", - "jasmine-marbles": "0.9.2", - "karma": "6.4.4", - "karma-chrome-launcher": "3.2.0", - "karma-coverage-istanbul-reporter": "3.0.3", - "karma-jasmine": "5.1.0", - "karma-jasmine-html-reporter": "2.1.0", - "karma-junit-reporter": "2.0.1", - "karma-mocha-reporter": "2.2.5", - "prettier":"3.4.2", - "stylelint": "16.12.0", - "stylelint-config-standard": "36.0.1", - "stylelint-config-standard-scss": "14.0.0", - "typescript": "5.4.5" - }, - "browserslist": [ - "last 10 Chrome major version", - "last 10 Firefox major version", - "last 2 Edge major versions", - "last 2 Safari major versions", - "last 2 iOS major versions", - "last 2 Android major version ", - "Firefox ESR", - "not IE 11" - ] + "name": "operatorfabric-ui-main", + "opfabVersion": "4.6.0-RC.RELEASE", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "headless": "ng test --browsers ChromeHeadless --watch=false --code-coverage", + "lint": "npm run lint:ts && npm run lint:css", + "lint:ts": "ng lint", + "lint:css": "stylelint 'src/**/*.*css'", + "prettier": "prettier src/**/* -c", + "e2e": "ng e2e", + "audit": "npm audit --json | $(npm bin)/npm-audit-html --output reports/report.html" + }, + "private": true, + "dependencies": { + "@angular/animations": "18.2.13", + "@angular/common": "18.2.13", + "@angular/compiler": "18.2.13", + "@angular/core": "18.2.13", + "@angular/forms": "18.2.13", + "@angular/localize": "18.2.13", + "@angular/platform-browser": "18.2.13", + "@angular/platform-browser-dynamic": "18.2.13", + "@angular/router": "18.2.13", + "@fortawesome/fontawesome-free": "6.7.2", + "@fullcalendar/angular": "6.1.16", + "@fullcalendar/bootstrap": "6.1.15", + "@fullcalendar/core": "6.1.15", + "@fullcalendar/daygrid": "6.1.15", + "@fullcalendar/interaction": "6.1.15", + "@fullcalendar/rrule": "6.1.15", + "@fullcalendar/timegrid": "6.1.15", + "@ng-bootstrap/ng-bootstrap": "17.0.1", + "@ngx-translate/core": "16.0.4", + "@popperjs/core": "2.11.8", + "@swimlane/ngx-charts": "21.1.2", + "ag-grid-angular": "33.0.3", + "ag-grid-community": "33.0.3", + "angular-oauth2-oidc": "17.0.2", + "bootstrap": "5.3.3", + "chart.js": "4.4.7", + "chartjs-adapter-date-fns": "3.0.0", + "chartjs-plugin-datalabels": "2.2.0", + "date-fns": "4.1.0", + "date-fns-tz": "3.2.0", + "file-saver-es": "2.0.5", + "guid-typescript": "1.0.9", + "handlebars": "4.7.8", + "jwt-decode": "4.0.0", + "lodash-es": "4.17.21", + "ng-event-source": "1.0.14", + "ngx-chips": "3.0.0", + "ngx-daterangepicker-material": "6.0.4", + "ol": "10.2.1", + "quill": "2.0.3", + "rrule": "2.8.1", + "rxjs": "7.8.1", + "virtual-select-plugin": "1.0.46", + "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz" + }, + "devDependencies": { + "@angular-devkit/build-angular": "18.2.12", + "@angular-eslint/builder": "19.0.2", + "@angular-eslint/eslint-plugin": "19.0.2", + "@angular-eslint/eslint-plugin-template": "19.0.2", + "@angular-eslint/schematics": "19.0.2", + "@angular-eslint/template-parser": "19.0.2", + "@angular/cdk": "17.3.10", + "@angular/cli": "18.2.12", + "@angular/compiler-cli": "18.2.13", + "@fortawesome/fontawesome-free": "6.7.2", + "@types/geojson": "^7946.0.10", + "@types/jasmine": "5.1.5", + "@typescript-eslint/eslint-plugin": "8.16.0", + "@typescript-eslint/parser": "8.16.0", + "eslint": "8.57.1", + "eslint-plugin-jest": "28.10.0", + "jasmine-core": "5.5.0", + "jasmine-marbles": "0.9.2", + "karma": "6.4.4", + "karma-chrome-launcher": "3.2.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-jasmine": "5.1.0", + "karma-jasmine-html-reporter": "2.1.0", + "karma-junit-reporter": "2.0.1", + "karma-mocha-reporter": "2.2.5", + "prettier": "3.4.2", + "stylelint": "16.12.0", + "stylelint-config-standard": "36.0.1", + "stylelint-config-standard-scss": "14.0.0", + "typescript": "5.4.5" + }, + "browserslist": [ + "last 10 Chrome major version", + "last 10 Firefox major version", + "last 2 Edge major versions", + "last 2 Safari major versions", + "last 2 iOS major versions", + "last 2 Android major version ", + "Firefox ESR", + "not IE 11" + ] }