Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ga-publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ 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') }}
restore-keys: ${{ runner.os }}-m2
- 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
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,27 @@ 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
restore-keys: ${{ runner.os }}-m2
#~ 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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,29 @@ 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
restore-keys: ${{ runner.os }}-m2
#~ 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 }}
#~ CONFIGURE REPO
- 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
Expand All @@ -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: |
Expand Down Expand Up @@ -125,21 +125,21 @@ 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
restore-keys: ${{ runner.os }}-m2
#~ 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 }}
Expand Down Expand Up @@ -171,21 +171,21 @@ 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
restore-keys: ${{ runner.os }}-m2
#~ 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 }}
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.entando</groupId>
<artifactId>entando-maven-root</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Entando Maven Root Parent POM</name>
Expand Down Expand Up @@ -57,8 +57,8 @@
<skipPreDeploymentTests>true</skipPreDeploymentTests>
<!-- Miscellaneous properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<github.organization>entando</github.organization>
<!--Standard Sonar configuration -->
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand All @@ -82,7 +82,7 @@
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-site-plugin.version>3.9.0</maven-site-plugin.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<dependency-check-maven.version>6.1.5</dependency-check-maven.version>
<maven-surefire-report-plugin.version>3.0.0-M4</maven-surefire-report-plugin.version>
<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
Expand Down Expand Up @@ -310,8 +310,8 @@
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<doclint>none</doclint>
<!-- workaround for bug in Openjdk 11 -->
<source>8</source>
<!-- Updated to Java 17 for Jakarta migration -->
<source>${maven.compiler.source}</source>
<detectJavaApiLink>false</detectJavaApiLink>
<quiet>true</quiet>
</configuration>
Expand Down
Loading