Merge branch 'develop' into 'release/1.7.1'

Develop

See merge request !116

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - test
   - sonar
   - build
+  - mend
 
 test:
   stage: test
@@ -64,4 +65,25 @@ build_and_push_release_image:
       docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REPOSITORY
       docker build -t $DOCKER_REPOSITORY_LOCAL:$IMAGE_TAG .
       docker push $DOCKER_REPOSITORY_LOCAL:$IMAGE_TAG
-      docker logout $DOCKER_REPOSITORY
+      docker logout $DOCKER_REPOSITORY
\ No newline at end of file
+
+mend:
+  stage: mend
+  image: openjdk:17-jdk-slim
+  only:
+    - /^release/
+  variables:
+    PRODUCT_NAME: "nmaas"
+    PROJECT_NAME: "nmaas-portal"
+  script:
+    - |
+      export PRODUCT_VERSION=$(echo $CI_COMMIT_BRANCH | cut -c 9-)
+      export PROJECT_VERSION=$PRODUCT_VERSION
+      apt-get update && apt-get install -y curl gnupg
+      curl -sL https://deb.nodesource.com/setup_11.x  | bash -
+      apt-get -y install nodejs
+      npm install -g @angular/cli
+      npm ci
+      chmod +x ./gradlew
+      curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
+      java -jar wss-unified-agent.jar -userKey ${MEND_USER_KEY} -apiKey ${MEND_API_KEY} -projectVersion ${PROJECT_VERSION} -project ${PROJECT_NAME} -productVersion ${PRODUCT_VERSION} -product ${PRODUCT_NAME} -c ./ws/ws.config -d ./
\ No newline at end of file

package-lock.json

 {
   "name": "nmaas-portal",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nmaas-portal",
-      "version": "1.7.0",
+      "version": "1.7.1",
       "license": "Apache 2.0",
       "dependencies": {
         "@angular/animations": "17.3.12",

package.json

 {
   "name": "nmaas-portal",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "Apache 2.0",
   "angular-cli": {},
   "scripts": {

ws/run_ws.sh

-#!/bin/sh
-
-echo "Downloading WhiteSource agent..."
-curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
-
-echo "Running WhiteSource scan..."
-java -jar wss-unified-agent.jar -userKey ${USER_KEY} -apiKey ${API_KEY} -projectVersion ${PROJECT_VERSION} -projectToken ${PROJECT_TOKEN} -productVersion ${PRODUCT_VERSION} -productToken ${PRODUCT_TOKEN} -c ws.config -d ../
\ No newline at end of file