From e5f2fd789e95ba0e700022c44ad5f9b3972dd5b3 Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Thu, 28 Dec 2023 17:45:31 +0530
Subject: [PATCH 1/2] Migrate to JDK 17

---
 engine/schema/pom.xml                        | 66 ++++++++++++--------
 plugins/network-elements/brocade-vcs/pom.xml |  2 +-
 plugins/storage/volume/storpool/pom.xml      | 25 ++++----
 pom.xml                                      |  3 +-
 4 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index 4ffef5c532e9..6d5dddcaa945 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -61,9 +61,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.5</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <id>setproperty</id>
@@ -72,12 +72,14 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                def projectVersion = project.properties['project.systemvm.template.version']
-                                String[] versionParts =  projectVersion.tokenize('.')
-                                pom.properties['cs.version'] = versionParts[0] + "." + versionParts[1]
-                                pom.properties['patch.version'] = versionParts[2]
-                            </source>
+                            <scripts>
+                                <script><![CDATA[
+                                    def projectVersion = project.properties['project.systemvm.template.version']
+                                    String[] versionParts =  projectVersion.tokenize('.')
+                                    project.properties.setProperty('cs.version', versionParts[0] + "." + versionParts[1])
+                                    project.properties.setProperty('patch.version', versionParts[2])
+                                ]]></script>
+                            </scripts>
                         </configuration>
                     </execution>
                     <execution>
@@ -87,28 +89,38 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                def csVersion = pom.properties['cs.version']
-                                def patch = pom.properties['patch.version']
-                                def templateList = []
-                                templateList.add("systemvmtemplate-${csVersion}.${patch}-kvm")
-                                templateList.add("systemvmtemplate-${csVersion}.${patch}-vmware")
-                                templateList.add("systemvmtemplate-${csVersion}.${patch}-xen")
-                                templateList.add("systemvmtemplate-${csVersion}.${patch}-ovm")
-                                templateList.add("systemvmtemplate-${csVersion}.${patch}-hyperv")
-                                File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt")
-                                def lines = file.readLines()
-                                for (template in templateList) {
-                                    def data = lines.findAll { it.contains(template) }
-                                    if (data != null) {
-                                        def hypervisor =  template.tokenize('-')[-1]
-                                        pom.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
+                            <scripts>
+                                <script><![CDATA[
+                                    def csVersion = project.properties['cs.version']
+                                    def patch = project.properties['patch.version']
+                                    def templateList = []
+                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-kvm")
+                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-vmware")
+                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-xen")
+                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-ovm")
+                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-hyperv")
+                                    File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt")
+                                    def lines = file.readLines()
+                                    for (template in templateList) {
+                                        def data = lines.findAll { it.contains(template) }
+                                        if (data != null) {
+                                            def hypervisor =  template.tokenize('-')[-1]
+                                            project.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
+                                        }
                                     }
-                                }
-                            </source>
+                            ]]></script>
+                            </scripts>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.groovy</groupId>
+                        <artifactId>groovy</artifactId>
+                        <version>4.0.15</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>com.googlecode.maven-download-plugin</groupId>
diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml
index d71d8402ddd8..00f4b6a4d9d4 100644
--- a/plugins/network-elements/brocade-vcs/pom.xml
+++ b/plugins/network-elements/brocade-vcs/pom.xml
@@ -32,7 +32,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <version>0.15.3</version>
                 <executions>
                     <execution>
                         <id>interface</id>
diff --git a/plugins/storage/volume/storpool/pom.xml b/plugins/storage/volume/storpool/pom.xml
index 437e236dc6f4..01290e6cf337 100644
--- a/plugins/storage/volume/storpool/pom.xml
+++ b/plugins/storage/volume/storpool/pom.xml
@@ -65,9 +65,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.5</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <id>set-properties</id>
@@ -76,15 +76,16 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <providerSelection>1.7</providerSelection>
-                            <source>
-                                File git = new File("./.git")
-                                if (!git.exists()) {
-                                    pom.properties['storpool.skip.git.properties'] = 'true'
-                                } else {
-                                    pom.properties['storpool.skip.git.properties'] = 'false'
-                                }
-                            </source>
+                            <scripts>
+                                <script><![CDATA[
+                                    File git = new File("./.git")
+                                    if (!git.exists()) {
+                                        project.properties.setProperty('storpool.skip.git.properties', 'true')
+                                    } else {
+                                        project.properties.setProperty('storpool.skip.git.properties', 'false')
+                                    }
+                                ]]></script>
+                            </scripts>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 2f3061d35136..ae169c0eb030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <!-- Build properties -->
-        <cs.jdk.version>11</cs.jdk.version>
+        <cs.jdk.version>17</cs.jdk.version>
         <cs.target.dir>target</cs.target.dir>
         <cs.replace.properties>build/replace.properties</cs.replace.properties>
         <argLine>-Djava.security.egd=file:/dev/./urandom -noverify</argLine>
@@ -183,7 +183,6 @@
         <cs.xstream.version>1.4.20</cs.xstream.version>
         <org.springframework.version>5.3.26</org.springframework.version>
         <cs.ini.version>0.5.4</cs.ini.version>
-        <cs.gmaven.version>1.12.0</cs.gmaven.version>
     </properties>
 
     <distributionManagement>

From a8656523c524d676b362914fdbd23239f61278ac Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Thu, 28 Dec 2023 18:18:49 +0530
Subject: [PATCH 2/2] Migrate to OpenJDK 21

---
 .github/workflows/build.yml            | 4 ++--
 .github/workflows/ci.yml               | 2 +-
 .github/workflows/codecov.yml          | 4 ++--
 .github/workflows/main-sonar-check.yml | 4 ++--
 .github/workflows/rat.yml              | 4 ++--
 .github/workflows/sonar-check.yml      | 4 ++--
 pom.xml                                | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1be892f45772..793c541c56a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,10 +32,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           architecture: x64
           cache: maven
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6edc7bdb20a..4d363372bf60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -205,7 +205,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           architecture: x64
           cache: maven
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 430d62df8def..00da8c2ee001 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -36,11 +36,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK11
+      - name: Set up JDK21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
           cache: 'maven'
 
       - name: Build CloudStack with Quality Checks
diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml
index cc27309f8a53..59ee7783e404 100644
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@ -36,11 +36,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK11
+      - name: Set up JDK17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
 
       - name: Cache SonarCloud packages
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
index 64fa4c3da0ca..265b122f4d95 100644
--- a/.github/workflows/rat.yml
+++ b/.github/workflows/rat.yml
@@ -31,10 +31,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           architecture: x64
           cache: maven
diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml
index a8282f251454..5683e856d9bb 100644
--- a/.github/workflows/sonar-check.yml
+++ b/.github/workflows/sonar-check.yml
@@ -38,11 +38,11 @@ jobs:
           ref: "refs/pull/${{ github.event.number }}/merge"
           fetch-depth: 0
 
-      - name: Set up JDK11
+      - name: Set up JDK21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache SonarCloud packages
diff --git a/pom.xml b/pom.xml
index ae169c0eb030..f02daa85c004 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <!-- Build properties -->
-        <cs.jdk.version>17</cs.jdk.version>
+        <cs.jdk.version>21</cs.jdk.version>
         <cs.target.dir>target</cs.target.dir>
         <cs.replace.properties>build/replace.properties</cs.replace.properties>
         <argLine>-Djava.security.egd=file:/dev/./urandom -noverify</argLine>
@@ -153,8 +153,8 @@
         <cs.jaxb.version>2.3.0</cs.jaxb.version>
         <cs.jaxws.version>2.3.2-1</cs.jaxws.version>
         <cs.jersey-client.version>2.26</cs.jersey-client.version>
-        <cs.jetty.version>9.4.51.v20230217</cs.jetty.version>
-        <cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
+        <cs.jetty.version>9.4.53.v20231009</cs.jetty.version>
+        <cs.jetty-maven-plugin.version>9.4.53.v20231009</cs.jetty-maven-plugin.version>
         <cs.jna.version>5.5.0</cs.jna.version>
         <cs.joda-time.version>2.12.5</cs.joda-time.version>
         <cs.jpa.version>2.2.1</cs.jpa.version>
@@ -181,7 +181,7 @@
         <cs.xapi.version>6.2.0-3.1</cs.xapi.version>
         <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
         <cs.xstream.version>1.4.20</cs.xstream.version>
-        <org.springframework.version>5.3.26</org.springframework.version>
+        <org.springframework.version>5.3.31</org.springframework.version>
         <cs.ini.version>0.5.4</cs.ini.version>
     </properties>