Merge branch '2.2.0.release' ci_latest

opfab · Mar 15, 2021 · ba60327 · ba60327
2 parents 47b43b5 + 1630bdd
commit ba60327
Show file tree

Hide file tree

Showing 246 changed files with 5,627 additions and 3,489 deletions.
diff --git a/CICD/prepare_release_version.sh b/CICD/prepare_release_version.sh
@@ -62,7 +62,6 @@ find . -name swagger.yaml | xargs sed -i "s/\(version: *\)$oldVersion/\1$newVers
 # With the current commmand, if the "version" key appears somewhere else in the file it will be affected as well.
 # That's why oldVersion is part of the pattern, as it is less likely that another version key would appear with the exact same value.
 # The issue is that if the value has been mistakenly modified and is not $oldVersion, it won't be updated
-# TODO Find a better solution or add a check
 
 echo "Using $newVersion for lfeoperatorfabric images in dev and docker environment docker-compose files"
 # String example for regexp: image: "lfeoperatorfabric/of-web-ui:0.13.1.RELEASE"

diff --git a/README.adoc b/README.adoc
@@ -86,7 +86,7 @@ cd ./config/docker
 ./docker-compose.sh
 ----
 
-. After a little while, log into the application UI at *localhost:2002/ui/* using admin/test as credentials.
+. After a little while, log into the application UI at *localhost:2002/* using admin/test as credentials.
 +
 WARNING: Don't forget the *final slash* in the URL or you will get an error.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.0.RELEASE
+2.2.0.RELEASE
diff --git a/bin/load_environment_light.sh b/bin/load_environment_light.sh
@@ -11,8 +11,10 @@
 
 source ${BASH_SOURCE%/*}/load_variables.sh
 
+sdk install gradle 6.5.1
 sdk use gradle 6.5.1
 # the java version is externalized because also needed for travis configuration
+sdk install java $(<JAVA_VERSION)-zulu
 sdk use java $(<JAVA_VERSION)-zulu
-sdk use maven 3.5.3
+nvm install v10.16.3
 nvm use v10.16.3
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,6 @@ ext {
             starterWeb              : "org.springframework.boot:spring-boot-starter-web:${versions['spring.boot']}",
             starterWebflux          : "org.springframework.boot:spring-boot-starter-webflux:${versions['spring.boot']}",
             actuator                : "org.springframework.boot:spring-boot-starter-actuator:${versions['spring.boot']}",
-            micrometer              : "io.micrometer:micrometer-registry-prometheus:latest.release",
             starterAop              : "org.springframework.boot:spring-boot-starter-aop:${versions['spring.boot']}",
             starterJetty            : "org.springframework.boot:spring-boot-starter-jetty:${versions['spring.boot']}",
             starterRabbitmq         : "org.springframework.boot:spring-boot-starter-amqp:${versions['spring.boot']}",
@@ -74,14 +73,14 @@ ext {
             feignMock      : "io.github.openfeign:feign-mock:${versions['feign']}",
             feignJackson   : "io.github.openfeign:feign-jackson:${versions['feign']}",
             jacksonAnnotations   : "com.fasterxml.jackson.core:jackson-annotations:${versions['jacksonAnnotations']}",
-            collections4   : "org.apache.commons:commons-collections4:${versions['apache.commons.collections4']}"
+            collections4   : "org.apache.commons:commons-collections4:${versions['apache.commons.collections4']}",
+            micrometer     : "io.micrometer:micrometer-registry-prometheus:${versions['micrometer']}"
     ]
 
     generator = [
             swagger                 : "io.swagger:swagger-codegen-cli:${versions['swagger']}",
             swaggerGeneratorPlugin  : "gradle.plugin.org.hidetake:gradle-swagger-generator-plugin:${versions['swagger.generator.plugin']}",
             swaggerUI               : "org.webjars:swagger-ui:${versions['swaggerUI']}",
-            //TODO Is springFox still used? What for?
             springfoxSwagger2       : "io.springfox:springfox-swagger2:${versions['springfox']}",
             springfoxSwaggerUI      : "io.springfox:springfox-swagger-ui:${versions['springfox']}"
     ]

diff --git a/client/src/main/resources/swagger-templates/pojo.mustache b/client/src/main/resources/swagger-templates/pojo.mustache
@@ -1,9 +1,11 @@
+import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 //@ApiModel(description = "{{{description}}}"){{/description}}
 {{#useBeanValidation}}@Validated{{/useBeanValidation}}
 {{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;

diff --git a/config/dev/docker-compose.yml b/config/dev/docker-compose.yml
@@ -7,15 +7,15 @@ services:
       - "15672:15672"
       - "15674:15674"
   mongodb:
-    image: mongo:4.1.1-xenial
+    image: mongo:4.4.4-bionic
     ports:
       - "27017:27017"
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: password
   keycloak:
-    image: jboss/keycloak:6.0.1
-    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export
+    image: jboss/keycloak:12.0.2
+    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export -Dkeycloak.profile.feature.upload_scripts=enabled
     environment:
       - KEYCLOAK_USER=admin
       - KEYCLOAK_PASSWORD=admin
@@ -26,7 +26,7 @@ services:
       - "89:8080"
       - "90:9990"
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-web-ui:2.2.0.RELEASE"
     #user: ${USER_ID}:${USER_GID}
     ports:
       - "2002:80"
@@ -38,6 +38,6 @@ services:
       - "./nginx.conf:/etc/nginx/conf.d/default.conf"
       - "./loggingResults:/etc/nginx/html/logging"
   ext-app:
-    image: "lfeoperatorfabric/of-external-app:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-external-app:2.2.0.RELEASE"
     ports:
       - "8090:8090"
diff --git a/config/dev/nginx.conf.template b/config/dev/nginx.conf.template
@@ -19,6 +19,11 @@ server {
   add_header 'Access-Control-Allow-Credentials' 'true' always;
   add_header 'Access-Control-Allow-Methods' '*' always;
   add_header 'Access-Control-Allow-Headers' '*' always;
+
+  location / {
+    alias /usr/share/nginx/html/;
+    index index.html index.htm;
+  }
   location /ui/ {
     alias /usr/share/nginx/html/;
     index index.html index.htm;

diff --git a/config/dev/ui-menu.json b/config/dev/ui-menu.json
@@ -6,7 +6,7 @@
       "entries": [
         {
           "id": "uid_test_0",
-          "url": "https://opfab.github.io/",
+          "url": "https://en.wikipedia.org/w/index.php",
           "label": "entry.single",
           "linkType": "BOTH"
         }
@@ -108,4 +108,4 @@
       }
     }
   ]
-}
+}
diff --git a/config/dev/users-dev.yml b/config/dev/users-dev.yml
@@ -49,18 +49,25 @@ operatorfabric.users.default:
       name: ReadOnly
       description: ReadOnly Group
   entities:
-    - id: ENTITY1
-      name: Control Room 1
-      description: Control Room 1
-    - id: ENTITY2
-      name: Control Room 2
-      description: Control Room 2
-    - id: ENTITY3
-      name: Control Room 3
-      description: Control Room 3
-    - id: ENTITY4
-      name: IT Supervision Center 
-      description: IT Supervision Center 
+   - id: ENTITY1
+     name: Control Room 1
+     description: Control Room 1
+     parents : ["ALLCONTROLROOMS"]
+   - id: ENTITY2
+     name: Control Room 2
+     description: Control Room 2
+     parents : ["ALLCONTROLROOMS"]
+   - id: ENTITY3
+     name: Control Room 3
+     description: Control Room 3
+     parents : ["ALLCONTROLROOMS"]
+   - id: ALLCONTROLROOMS
+     name: All Control Rooms 
+     description: All Control Rooms
+     entityAllowedToSendCard: false
+   - id: ENTITY4
+     name: IT Supervision Center 
+     description: IT Supervision Center 
   user-settings:
     - login: operator3
       description: Da Operator Rulez

diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   mongodb:
-    image: mongo:4.1.1-xenial
+    image: mongo:4.4.4-bionic
     ports:
       - "27017:27017"
     environment:
@@ -14,8 +14,8 @@ services:
 #      - "5672:5672"
 #      - "15672:15672"
   keycloak:
-    image: jboss/keycloak:6.0.1
-    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export
+    image: jboss/keycloak:12.0.2
+    command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export -Dkeycloak.profile.feature.upload_scripts=enabled
     environment:
     - KEYCLOAK_USER=admin
     - KEYCLOAK_PASSWORD=admin
@@ -28,7 +28,10 @@ services:
 #    - "90:9990"
   users:
     container_name: users
-    image: "lfeoperatorfabric/of-users-business-service:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-users-business-service:2.2.0.RELEASE"
+    depends_on:
+      - mongodb
+      - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2103:8080"
@@ -43,7 +46,7 @@ services:
     - ${CONFIG_PATH}:/external-config
   businessconfig:
     container_name: businessconfig
-    image: "lfeoperatorfabric/of-businessconfig-business-service:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-businessconfig-business-service:2.2.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
@@ -61,9 +64,10 @@ services:
      - ${CONFIG_PATH}:/external-config
   cards-publication:
     container_name: cards-publication
-    image: "lfeoperatorfabric/of-cards-publication-business-service:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-cards-publication-business-service:2.2.0.RELEASE"
     depends_on:
       - mongodb
+      - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2102:8080"
@@ -78,7 +82,10 @@ services:
       - ${CONFIG_PATH}:/external-config
   cards-consultation:
     container_name: cards-consultation
-    image: "lfeoperatorfabric/of-cards-consultation-business-service:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-cards-consultation-business-service:2.2.0.RELEASE"
+    depends_on:
+      - mongodb
+      - rabbitmq
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2104:8080"
@@ -92,7 +99,7 @@ services:
       - "./cards-consultation-docker.yml:/config/application-docker.yml"
       - ${CONFIG_PATH}:/external-config
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-web-ui:2.2.0.RELEASE"
     ports:
     - "2002:80"
     depends_on:
@@ -105,6 +112,6 @@ services:
       - "./nginx.conf:/etc/nginx/conf.d/default.conf"
   ext-app:
 # External application example, must not be activated in production mode
-    image: "lfeoperatorfabric/of-external-app:2.1.0.RELEASE"
+    image: "lfeoperatorfabric/of-external-app:2.2.0.RELEASE"
     ports:
       - "8090:8090"
diff --git a/config/docker/nginx-cors-permissive.conf b/config/docker/nginx-cors-permissive.conf
@@ -19,6 +19,11 @@ server {
   add_header 'Access-Control-Allow-Credentials' 'true' always;
   add_header 'Access-Control-Allow-Methods' '*' always;
   add_header 'Access-Control-Allow-Headers' '*' always;
+
+  location / {
+    alias /usr/share/nginx/html/;
+    index index.html index.htm;
+  }
   location /ui/ {
     alias /usr/share/nginx/html/;
     index index.html index.htm;

diff --git a/config/docker/nginx.conf b/config/docker/nginx.conf
@@ -13,7 +13,11 @@ server {
   ### CUSTOMIZATION - END
   set $BasicValue "Basic $ClientPairOFAuthentication";
   set $KeycloakOpenIdConnect $KeycloakBaseUrl/auth/realms/$OperatorFabricRealm/protocol/openid-connect;
-  #   access_log /var/log/nginx/host.access.log main;
+
+  location / {
+    alias /usr/share/nginx/html/;
+    index index.html index.htm;
+  }
   location /ui/ {
     alias /usr/share/nginx/html/;
     index index.html index.htm;

diff --git a/config/docker/ui-menu.json b/config/docker/ui-menu.json
@@ -6,7 +6,7 @@
       "entries": [
         {
           "id": "uid_test_0",
-          "url": "https://opfab.github.io/",
+          "url": "https://en.wikipedia.org/w/index.php",
           "label": "entry.single",
           "linkType": "BOTH"
         }
@@ -108,4 +108,4 @@
       }
     }
   ]
-}
+}
diff --git a/config/docker/users-docker.yml b/config/docker/users-docker.yml
@@ -50,15 +50,23 @@ operatorfabric.users.default:
       name: ReadOnly
       description: ReadOnly Group
   entities:
-    - id: ENTITY1
-      name: Control Room 1
-      description: Control Room 1
-    - id: ENTITY2
-      name: Control Room 2
-      description: Control Room 2
-    - id: ENTITY3
-      name: Control Room 3
-      description: Control Room 3
-    - id: ENTITY4
-      name: IT Supervision Center 
-      description: IT Supervision Center
+   - id: ENTITY1
+     name: Control Room 1
+     description: Control Room 1
+     parents : ["ALLCONTROLROOMS"]
+   - id: ENTITY2
+     name: Control Room 2
+     description: Control Room 2
+     parents : ["ALLCONTROLROOMS"]
+   - id: ENTITY3
+     name: Control Room 3
+     description: Control Room 3
+     parents : ["ALLCONTROLROOMS"]
+   - id: ALLCONTROLROOMS
+     name: All Control Rooms 
+     description: All Control Rooms
+     entityAllowedToSendCard: false
+   - id: ENTITY4
+     name: IT Supervision Center 
+     description: IT Supervision Center 
+