Merge branch 'develop'

.github/workflows/build.yml

@@ -0,0 +1,48 @@
+name: Build
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew build
+      - name: Publish unit test results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: always()
+        with:
+          files: '**/test-results/**/TEST-*.xml'
+      - name: Perform SonarQube analysis
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew sonarqube --info

.github/workflows/cla.yml

@@ -11,15 +11,15 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        # Alpha Release
+        # Beta Release
         uses: cla-assistant/github-action@v2.1.3-beta
         env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
           PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           path-to-signatures: 'docs/cla/cla.json'
-          path-to-cla-document: 'https://fiware.github.io/contribution-requirements/individual-cla.pdf' # e.g. a CLA or a DCO document
+          path-to-document: 'https://fiware.github.io/contribution-requirements/individual-cla.pdf' # e.g. a CLA or a DCO document
           # branch should not be protected
           branch: 'master'
           allowlist: bobeal,franckLG,HoucemKacem,dependabot,bot*

.github/workflows/zap_scan.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Launh docker-compose stack
         run: docker-compose -f docker-compose.yml up -d
       - name: ZAP Scan
-        uses: zaproxy/action-baseline@v0.4.0
+        uses: zaproxy/action-baseline@v0.5.0
         # Then run the scan against the locally running instance
         with:
           target: 'http://localhost:8080/ngsi-ld/v1/entities'

Jenkinsfile

@@ -66,13 +66,6 @@ pipeline {
                 sh './gradlew build -p subscription-service'
             }
         }
-        stage('Perform SonarCloud analysis') {
-            steps {
-                withSonarQubeEnv('SonarCloud for Stellio') {
-                    sh './gradlew sonarqube'
-                }
-            }
-        }
         /* Jib only allows to add tags and always set the "latest" tag on the Docker images created.
         It's unavoidable to create separate stages for Dockerizing dev services and specify the full to.image path */
         stage('Dockerize Dev Api Gateway') {

README.md

@@ -9,17 +9,20 @@
 [![Docker badge](https://img.shields.io/docker/pulls/stellio/stellio-entity-service.svg)](https://hub.docker.com/r/stellio)
 [![License: Apache-2.0](https://img.shields.io/github/license/stellio-hub/stellio-context-broker.svg)](https://spdx.org/licenses/Apache-2.0.html)
 <br>
-![Release Drafter](https://github.com/stellio-hub/stellio-context-broker/workflows/Release%20Drafter/badge.svg)
+![Build](https://github.com/stellio-hub/stellio-context-broker/workflows/Build/badge.svg)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=stellio-hub_stellio-context-broker&metric=alert_status)](https://sonarcloud.io/dashboard?id=stellio-hub_stellio-context-broker)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4527/badge)](https://bestpractices.coreinfrastructure.org/projects/4527)
 
 Stellio is an NGSI-LD compliant context broker developed by EGM. NGSI-LD is an Open API and Datamodel specification for 
 context management [published by ETSI](https://www.etsi.org/deliver/etsi_gs/CIM/001_099/009/01.02.02_60/gs_CIM009v010202p.pdf).
 
-This project is part of [FIWARE](https://www.fiware.org/). For more information check the FIWARE Catalogue entry for
-[Core Context](https://github.com/Fiware/catalogue/tree/master/core).
+Stellio is a [FIWARE](https://www.fiware.org/) Generic Enabler. Therefore, it can be integrated as part of any platform “Powered by FIWARE”. 
+FIWARE is a curated framework of open source platform components which can be assembled together with other third-party 
+platform components to accelerate the development of Smart Solutions. For more information check the FIWARE Catalogue entry for
+[Core Context](https://github.com/Fiware/catalogue/tree/master/core). The roadmap of this FIWARE GE is described [here](./docs/roadmap.md).
 
-The roadmap of this FIWARE GE is described [here](./docs/roadmap.md).
+You can find more info at the [FIWARE developers](https://developers.fiware.org/) website and the [FIWARE](https://fiware.org/) website.
+The complete list of FIWARE GEs and Incubated FIWARE GEs can be found in the [FIWARE Catalogue](https://catalogue.fiware.org/).
 
 | :books: [Documentation](https://stellio.rtfd.io/) | :whale: [Docker Hub](https://hub.docker.com/orgs/stellio/repositories) | :dart: [Roadmap](./docs/roadmap.md) |
 | ------------------------------------------------- | ---------------------------------------------------------------------- | ----------------------------------- |
@@ -150,7 +153,7 @@ docker run stellio/stellio-entity-service:latest
 
 ## Usage
 
-To start using Stellio, you can follow the [API quick start](API_Quick_Start.md).
+To start using Stellio, you can follow the [API quick start](https://github.com/stellio-hub/stellio-docs/blob/master/docs/quick_start_guide.md).
 
 ## License
 

api-gateway/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-gateway")
-    implementation("org.springframework.cloud:spring-cloud-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
 }
 
@@ -14,4 +13,4 @@ jib.to.image = "stellio/stellio-api-gateway"
 jib.container.jvmFlags = project.ext["jibContainerJvmFlags"] as List<String>
 jib.container.ports = listOf("8080")
 jib.container.creationTime = project.ext["jibContainerCreationTime"].toString()
-jib.container.labels = project.ext["jibContainerLabels"] as Map<String, String>
+jib.container.labels.putAll(project.ext["jibContainerLabels"] as Map<String, String>)