From 73046786ac3fe4a469bb8df5c95e355e09e281dd Mon Sep 17 00:00:00 2001
From: Eugenio Santoboni <eugenio.santoboni@gmail.com>
Date: Thu, 16 Nov 2023 17:18:22 +0100
Subject: [PATCH 1/2] ENG-5316: Jump to java 17 version # Conflicts: #
 pom.xml

---
 .github/workflows/ga-publication.yml |  2 +-
 .github/workflows/pr.yml             |  8 ++++----
 .github/workflows/publication.yml    | 14 +++++++-------
 pom.xml                              |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ga-publication.yml b/.github/workflows/ga-publication.yml
index 590e9a2..243a3b9 100644
--- a/.github/workflows/ga-publication.yml
+++ b/.github/workflows/ga-publication.yml
@@ -46,7 +46,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 ff6810e..e2335a8 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -72,10 +72,10 @@ jobs:
             --token "$ENTANDO_BOT_TOKEN" \
           ;
       #~ 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
@@ -119,10 +119,10 @@ jobs:
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
           ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
       #~ 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
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
index cc1fbe9..bc82098 100644
--- a/.github/workflows/publication.yml
+++ b/.github/workflows/publication.yml
@@ -50,10 +50,10 @@ jobs:
             .. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
           ;
       #~ 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
@@ -65,7 +65,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
@@ -117,10 +117,10 @@ jobs:
             .. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
           ;
       #~ 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
@@ -155,10 +155,10 @@ jobs:
             .. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
           ;
       #~ 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
diff --git a/pom.xml b/pom.xml
index 46232f8..11bda9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,9 +60,9 @@
         <github.organization>entando-k8s</github.organization>
         <preDeploymentTestGroups></preDeploymentTestGroups>
         <postDeploymentTestGroups></postDeploymentTestGroups>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.javadoc.source>11</maven.javadoc.source>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.javadoc.source>17</maven.javadoc.source>
         <skipLicenseDownload>false</skipLicenseDownload>
         <checkstyleConfigLocation>
             https://raw.githubusercontent.com/entando-k8s/entando-quarkus-parent/ACTIVE-CHECKSTYLE/checkstyle.xml
@@ -528,7 +528,7 @@
                     <configuration>
                         <skip>true</skip>
                         <doclint>none</doclint>
-                        <source>11</source>
+                        <source>17</source>
                         <detectJavaApiLink>false</detectJavaApiLink>
                         <quiet>true</quiet>
                     </configuration>

From c9b83bba2b137d74bd58c8a30e98ce805fc79e3d Mon Sep 17 00:00:00 2001
From: Eugenio Santoboni <eugenio.santoboni@gmail.com>
Date: Fri, 1 Dec 2023 12:02:47 +0100
Subject: [PATCH 2/2] ENG-5347: Jump to 7.3.1 version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11bda9f..fb96b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>entando-maven-root</artifactId>
-        <version>7.2.0</version>
+        <version>7.3.1-ENG-5347-PR-22</version>
         <relativePath/>
     </parent>
     <groupId>org.entando</groupId>
     <artifactId>entando-quarkus-parent</artifactId>
-    <version>7.3.0</version>
+    <version>7.3.1</version>
     <packaging>pom</packaging>
 
     <name>Entando Quarkus Parent POM</name>