Update from master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve.
+
+If the bug is a security issue, please **do not fill an issue**, and instead send a mail to <[email protected]>.
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**geOrchestra version or branch**
+
+eg: 17.12 or 18.06 or master ?
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/dependabot.yml

@@ -0,0 +1,32 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  target-branch: master
+  assignees:
+  - RemiDesgrange
+  ignore:
+  - dependency-name: org.webjars:extjs
+    versions:
+    - "> 4.1.1a"
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  target-branch: master
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  target-branch: 20.1.x
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  target-branch: 22.0.x

.github/resources/m2-settings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0   http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <mirrors>
+    <mirror>
+      <id>artifactory-georchestra</id>
+      <mirrorOf>*</mirrorOf>
+      <url>https://artifactory.georchestra.org/artifactory/maven</url>
+    </mirror>
+  </mirrors>
+</settings>

.github/workflows/analytics.yml

@@ -0,0 +1,81 @@
+name: "analytics"
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "commons/**"
+      - "analytics/**"
+  pull_request:
+    paths:
+      - "commons/**"
+      - "analytics/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+    - name: "Checking out"
+      uses: actions/checkout@v1
+
+    - name: "Setting up Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: '8.x'
+
+    - name: "Configuring Maven"
+      run: |
+          mkdir -p $HOME/.m2
+          cp .github/resources/m2-settings.xml $HOME/.m2/settings.xml
+
+    - name: "Maven repository caching"
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: "Installing & checking formatting"
+      run: ./mvnw --no-transfer-progress -B -P-all,analytics -Dfmt.action=validate install -Dadditionalparam=-Xdoclint:none -DskipTests
+
+    - name: "Running tests"
+      working-directory: analytics/
+      run: ../mvnw --no-transfer-progress clean verify -Pit -Dfmt.skip=true -Dadditionalparam=-Xdoclint:none
+
+    - name: Getting image tag
+      if: github.repository == 'georchestra/georchestra'
+      id: version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+    - name: "Building docker image"
+      if: github.repository == 'georchestra/georchestra'
+      working-directory: analytics/
+      run: ../mvnw --no-transfer-progress clean package docker:build -Pdocker,log4j-logstash,sentry-log4j -DdockerImageName=georchestra/analytics:${{ steps.version.outputs.VERSION }} -DskipTests
+
+    - name: "Logging in docker.io"
+      if: github.repository == 'georchestra/georchestra'
+      uses: azure/docker-login@v1
+      with:
+        username: '${{ secrets.DOCKER_HUB_USERNAME }}'
+        password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
+
+    - name: "Pushing latest to docker.io"
+      if: github.ref == 'refs/heads/master' && github.repository == 'georchestra/georchestra'
+      run: |
+        docker tag georchestra/analytics:${{ steps.version.outputs.VERSION }} georchestra/analytics:latest
+        docker push georchestra/analytics:latest
+
+    - name: "Pushing release branch to docker.io"
+      if: contains(github.ref, 'refs/heads/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/analytics:${{ steps.version.outputs.VERSION }}
+
+    - name: "Pushing release tag to docker.io"
+      if: contains(github.ref, 'refs/tags/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/analytics:${{ steps.version.outputs.VERSION }}
+
+    - name: "Remove SNAPSHOT jars from repository"
+      run: |
+        find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}

.github/workflows/atlas.yml

@@ -0,0 +1,81 @@
+name: "atlas"
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "commons/**"
+      - "atlas/**"
+  pull_request:
+    paths:
+      - "commons/**"
+      - "atlas/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+    - name: "Checking out"
+      uses: actions/checkout@v1
+
+    - name: "Setting up Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: '8.x'
+
+    - name: "Configuring Maven"
+      run: |
+          mkdir -p $HOME/.m2
+          cp .github/resources/m2-settings.xml $HOME/.m2/settings.xml
+
+    - name: "Maven repository caching"
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: "Installing & checking formatting"
+      run: ./mvnw --no-transfer-progress -B -P-all,atlas -Dfmt.action=validate install -Dadditionalparam=-Xdoclint:none -DskipTests
+
+    - name: "Running tests"
+      working-directory: atlas/
+      run: ../mvnw --no-transfer-progress clean verify -Pit -Dfmt.skip=true -Dadditionalparam=-Xdoclint:none
+
+    - name: Getting image tag
+      if: github.repository == 'georchestra/georchestra'
+      id: version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+    - name: "Building docker image"
+      if: github.repository == 'georchestra/georchestra'
+      working-directory: atlas/
+      run: ../mvnw --no-transfer-progress clean package docker:build -Pdocker,log4j-logstash,sentry-log4j -DdockerImageName=georchestra/atlas:${{ steps.version.outputs.VERSION }} -DskipTests
+
+    - name: "Logging in docker.io"
+      uses: azure/docker-login@v1
+      if: github.repository == 'georchestra/georchestra'
+      with:
+        username: '${{ secrets.DOCKER_HUB_USERNAME }}'
+        password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
+
+    - name: "Pushing latest to docker.io"
+      if: github.ref == 'refs/heads/master' && github.repository == 'georchestra/georchestra'
+      run: |
+        docker tag georchestra/atlas:${{ steps.version.outputs.VERSION }} georchestra/atlas:latest
+        docker push georchestra/atlas:latest
+
+    - name: "Pushing release branch to docker.io"
+      if: contains(github.ref, 'refs/heads/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/atlas:${{ steps.version.outputs.VERSION }}
+
+    - name: "Pushing release tag to docker.io"
+      if: contains(github.ref, 'refs/tags/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/atlas:${{ steps.version.outputs.VERSION }}
+
+    - name: "Remove SNAPSHOT jars from repository"
+      run: |
+        find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}

.github/workflows/console.yml

@@ -0,0 +1,94 @@
+name: "console"
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "ldap/**"
+      - "postgresql/**"
+      - "commons/**"
+      - "ldap-account-management/**"
+      - "console/**"
+  pull_request:
+    paths:
+      - "ldap/**"
+      - "postgresql/**"
+      - "commons/**"
+      - "ldap-account-management/**"
+      - "console/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+    - name: "Checking out"
+      uses: actions/checkout@v1
+
+    - name: "Setting up Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: '8.x'
+
+    - name: "Configuring Maven"
+      run: |
+          mkdir -p $HOME/.m2
+          cp .github/resources/m2-settings.xml $HOME/.m2/settings.xml
+
+    - name: "Maven repository caching"
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: "Installing & checking formatting"
+      run: ./mvnw install -pl :console --also-make -P-all,console --no-transfer-progress -B -Dfmt.action=validate -Dadditionalparam=-Xdoclint:none -DskipTests
+      # note "-pl :console --also-make" builds only the project and its dependencies
+
+    - name: "Building LDAP and PostgreSQL docker images"
+      if: github.repository == 'georchestra/georchestra'
+      run: |
+        docker build -t georchestra/ldap:latest ./ldap
+        docker build -t georchestra/database:latest ./postgresql
+
+    - name: "Running tests"
+      working-directory: console/
+      run: ../mvnw verify --no-transfer-progress -Dfmt.skip=true -Dadditionalparam=-Xdoclint:none -Dskip.npm
+
+    - name: Getting image tag
+      if: github.repository == 'georchestra/georchestra'
+      id: version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+    - name: "Building docker image"
+      if: github.repository == 'georchestra/georchestra'
+      working-directory: console/
+      run: ../mvnw --no-transfer-progress clean package docker:build -Pdocker,log4j-logstash,sentry-log4j -DdockerImageName=georchestra/console:${{ steps.version.outputs.VERSION }} -DskipTests
+
+    - name: "Logging in docker.io"
+      if: github.repository == 'georchestra/georchestra'
+      uses: azure/docker-login@v1
+      with:
+        username: '${{ secrets.DOCKER_HUB_USERNAME }}'
+        password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
+
+    - name: "Pushing latest to docker.io"
+      if: github.ref == 'refs/heads/master' && github.repository == 'georchestra/georchestra'
+      run: |
+        docker tag georchestra/console:${{ steps.version.outputs.VERSION }} georchestra/console:latest
+        docker push georchestra/console:latest
+
+    - name: "Pushing release branch to docker.io"
+      if: contains(github.ref, 'refs/heads/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/console:${{ steps.version.outputs.VERSION }}
+
+    - name: "Pushing release tag to docker.io"
+      if: contains(github.ref, 'refs/tags/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/console:${{ steps.version.outputs.VERSION }}
+
+    - name: "Remove SNAPSHOT jars from repository"
+      run: |
+        find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}

.github/workflows/database.yml

@@ -0,0 +1,49 @@
+name: "PostGreSQL"
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "postgresql/**"
+  pull_request:
+    paths:
+      - "postgresql/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+    - name: "Checking out"
+      uses: actions/checkout@v1
+
+    - name: Getting image tag
+      id: version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+
+    - name: "Docker build database"
+      if: github.repository == 'georchestra/georchestra'
+      working-directory: postgresql/
+      run: docker build -t georchestra/database:${{ steps.version.outputs.VERSION }} .
+
+    - name: "Logging in docker.io"
+      if: github.repository == 'georchestra/georchestra'
+      uses: azure/docker-login@v1
+      with:
+        username: '${{ secrets.DOCKER_HUB_USERNAME }}'
+        password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
+
+    - name: "Pushing latest to docker.io"
+      if: github.ref == 'refs/heads/master' && github.repository == 'georchestra/georchestra'
+      run: |
+        docker tag georchestra/database:${{ steps.version.outputs.VERSION }} georchestra/database:latest
+        docker push georchestra/database:latest
+
+    - name: "Pushing release branch to docker.io"
+      if: contains(github.ref, 'refs/heads/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/database:${{ steps.version.outputs.VERSION }}
+
+    - name: "Pushing release tag to docker.io"
+      if: contains(github.ref, 'refs/tags/22.') && github.repository == 'georchestra/georchestra'
+      run: |
+        docker push georchestra/database:${{ steps.version.outputs.VERSION }}