AAE-26175 Fix on mvn build cache keys

.github/actions/maven-build-and-tag/action.yml

@@ -116,7 +116,6 @@ runs:
   using: composite
   steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
     - uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
       id: maven-configure
       with:

.github/actions/maven-build/action.yml

@@ -201,6 +201,8 @@ runs:
       shell: bash
       env:
         MAVEN_RESOLVER_TRANSPORT_OPTS: ${{ inputs.maven-resolver-transport-options }}
+        MAVEN_USERNAME: ${{ inputs.maven-username }}
+        MAVEN_PASSWORD: ${{ inputs.maven-password }}
       run: |
         mvn -N jacoco:merge -Djacoco.destFile=${{ steps.get-jacoco-report-path.outputs.path }} ${MAVEN_RESOLVER_TRANSPORT_OPTS}
 
@@ -209,6 +211,8 @@ runs:
       shell: bash
       env:
         MAVEN_RESOLVER_TRANSPORT_OPTS: ${{ inputs.maven-resolver-transport-options }}
+        MAVEN_USERNAME: ${{ inputs.maven-username }}
+        MAVEN_PASSWORD: ${{ inputs.maven-password }}
       run: |
         mvn jacoco:report -Djacoco.dataFile=${{ steps.get-jacoco-report-path.outputs.path }} \
           -Djacoco-report-dir-suffix=${{ inputs.jacoco-report-name }} ${{ inputs.jacoco-report-options }} ${MAVEN_RESOLVER_TRANSPORT_OPTS}

.github/actions/maven-configure/action.yml

@@ -121,5 +121,5 @@ runs:
         path: ~/.m2/build-cache
         key: ${{ env.MAVEN_BUILD_CACHE_KEY }}
         restore-keys: |
-          ${{ runner.os }}-build-cache-${{ inputs.maven-build-cache-key }}-PR-${{ github.event.pull_request.number }}-
-          ${{ runner.os }}-build-cache-${{ inputs.maven-build-cache-key }}-${{ github.base_ref || github.ref_name }}-
+          ${{ runner.os }}-build-cache-${{ inputs.maven-build-cache-key }}-${{ github.event.pull_request.number }}
+          ${{ runner.os }}-build-cache-${{ inputs.maven-build-cache-key }}-${{ env.GITHUB_PR_NUMBER || github.ref_name }}

version.txt

@@ -1 +1 @@
-v9.2.0
+v9.2.1