diff --git a/.github/workflows/ga-publication.yml b/.github/workflows/ga-publication.yml index fb801c7..1b4c334 100644 --- a/.github/workflows/ga-publication.yml +++ b/.github/workflows/ga-publication.yml @@ -41,7 +41,7 @@ jobs: --id "CHECKOUT FOR GA PUBLICATION" \ --lcd "$LOCAL_CLONE_DIR" - name: "Cache Maven packages" - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -49,7 +49,7 @@ jobs: - name: "Configure GA Repository" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 server-id: maven-central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f47532c..49623de 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -89,13 +89,13 @@ jobs: ; ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV #~ JDK - - name: "Set up JDK 11" + - name: "Set up JDK 17" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 #~ MAVEN CACHE - name: "Cache Maven packages" - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2 @@ -103,13 +103,13 @@ jobs: #~ BUILD CACHE - name: "Cache Build Dir" id: build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: "${{ env.LOCAL_CLONE_DIR }}/target/" key: ${{ runner.os }}-build-${{ env.BUILD_CACHE_KEY }} #~ SONAR CACHE - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar @@ -144,14 +144,14 @@ jobs: ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR" ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV #~ JDK - - name: "Set up JDK 11" + - name: "Set up JDK 17" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 #~ MAVEN CACHE - name: "Cache Maven packages" id: maven-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-matrix-${{ matrix.scan-type }} @@ -162,7 +162,7 @@ jobs: #~ BUILD CACHE - name: "Cache Build Dir" id: build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: "${{ env.LOCAL_CLONE_DIR}}/target/" key: ${{ runner.os }}-build-${{ env.BUILD_CACHE_KEY }} diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index 07d472b..57f739a 100644 --- a/.github/workflows/publication.yml +++ b/.github/workflows/publication.yml @@ -50,13 +50,13 @@ jobs: ; ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV #~ JDK - - name: "Set up JDK 11" + - name: "Set up JDK 17" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 #~ MAVEN CACHE - name: "Cache Maven packages" - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2 @@ -64,7 +64,7 @@ jobs: #~ BUILD CACHE - name: "Cache Build Dir" id: build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: "${{ env.LOCAL_CLONE_DIR }}/target/" key: ${{ runner.os }}-build-${{ env.BUILD_CACHE_KEY }} @@ -72,7 +72,7 @@ jobs: - name: "Configure Entando Nexus Repository" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 server-id: internal-nexus server-username: NEXUS_USERNAME server-password: NEXUS_PASSWORD @@ -85,14 +85,14 @@ jobs: NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} #~ UPDATE THE BOM (if required) - - name: "BOM Update" - if: steps.CHECKOUT.outputs.BOM_UPDATE_FLAG == 'true' && steps.START.outputs.BOM == 'true' - run: | - ~/ppl-run bom update-bom \ - --id "UPDATE-BOM" \ - --lcd "$LOCAL_CLONE_DIR" \ - --token "$ENTANDO_BOT_TOKEN" \ - ; + #- name: "BOM Update" + # if: steps.CHECKOUT.outputs.BOM_UPDATE_FLAG == 'true' && steps.START.outputs.BOM == 'true' + # run: | + # ~/ppl-run bom update-bom \ + # --id "UPDATE-BOM" \ + # --lcd "$LOCAL_CLONE_DIR" \ + # --token "$ENTANDO_BOT_TOKEN" \ + # ; #~ PUBLISH TO DOCKER - name: "Publish docker" run: | @@ -125,13 +125,13 @@ jobs: ; ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV #~ JDK - - name: "Set up JDK 11" + - name: "Set up JDK 17" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 #~ MAVEN CACHE - name: "Cache Maven packages" - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2 @@ -139,7 +139,7 @@ jobs: #~ BUILD CACHE - name: "Cache Build Dir" id: build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: "${{ env.LOCAL_CLONE_DIR }}/target/" key: ${{ runner.os }}-build-${{ env.BUILD_CACHE_KEY }} @@ -171,13 +171,13 @@ jobs: ; ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV #~ JDK - - name: "Set up JDK 11" + - name: "Set up JDK 17" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 #~ MAVEN CACHE - name: "Cache Maven packages" - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2 @@ -185,7 +185,7 @@ jobs: #~ BUILD CACHE - name: "Cache Build Dir" id: build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: "${{ env.LOCAL_CLONE_DIR }}/target/" key: ${{ runner.os }}-build-${{ env.BUILD_CACHE_KEY }} diff --git a/pom.xml b/pom.xml index 3586d45..77af022 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.entando entando-maven-root - 7.2.0-SNAPSHOT + 7.4.0-SNAPSHOT pom Entando Maven Root Parent POM @@ -57,8 +57,8 @@ true UTF-8 - 1.8 - 1.8 + 17 + 17 entando https://sonarcloud.io @@ -82,7 +82,7 @@ 3.0.0 3.0.0-M3 3.9.0 - 0.8.6 + 0.8.8 6.1.5 3.0.0-M4 2.0.0 @@ -310,8 +310,8 @@ ${maven-javadoc-plugin.version} none - - 8 + + ${maven.compiler.source} false true