Merge branch '2.1.x'

.github/workflows/composites/env-variables/action.yaml

@@ -6,5 +6,19 @@ runs:
     - name: set env variables
       shell: bash
       run: |
+        
+        baseRef=$GITHUB_BASE_REF
+        if [[ ! -z $baseRef ]]; then
+          echo "This is a PR to branch : $baseRef"
+          echo "BASE_BRANCH=$(echo $baseRef)" >> $GITHUB_ENV
+        else 
+          raw=${{ github.ref }}
+          echo "${raw}"
+          branch=${raw##*/}
+          echo "This is a merge to branch : ${branch}"
+          echo "BASE_BRANCH=$(echo ${branch})" >> $GITHUB_ENV
+        fi
+        
         echo "BRANCH_NAME=$(echo $GITHUB_HEAD_REF)" >> $GITHUB_ENV
+        echo "BASE_BRANCH_NAME=$(echo $GITHUB_BASE_REF)" >> $GITHUB_ENV
         echo "DOCKER_IMAGES_KEY=$(echo $GITHUB_RUN_ID)" >> $GITHUB_ENV

.github/workflows/composites/setup-jdk1.8/action.yaml

@@ -0,0 +1,9 @@
+name: setup project with jdk-8
+description: setup project with jdk-8
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: '8'

.github/workflows/composites/setup-jdk17/action.yaml

@@ -0,0 +1,9 @@
+name: setup project with jdk-17
+description: setup project with jdk-17
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: '17'