Build: drop EL7 support, support JRE17 for packages and sonar check (#…

…8609) This PR fixes the issue with sonar check ``` Error: Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar (default-cli) on project cloudstack: Error: Error: The version of Java (11.0.22) used to run this analysis is deprecated, and SonarCloud no longer supports it. Please upgrade to Java 17 or later. Error: You can find more information here: https://docs.sonarsource.com/sonarcloud/appendices/scanner-environment/ ``` main changes - Support build/packaging using JDK17 - Still supports JDK11 for building - Support JRE17 for use in production installation - Drop EL7 support The community packages will be still packaged using JDK11. If uses want, they can build by JDK17 as well. Signed-off-by: Wei Zhou <wei.zhou@shapeblue.com> Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Co-authored-by: Rohit Yadav <rohit.yadav@shapeblue.com>
apache · Aug 27, 2024 · d7ca05e · d7ca05e
1 parent b61c3b8
commit d7ca05e
Show file tree

Hide file tree

Showing 44 changed files with 195 additions and 1,147 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
 
       - name: Install Build Dependencies

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -226,7 +226,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
 
       - name: Install Build Dependencies
@@ -284,7 +284,7 @@ jobs:
 
       - name: Start CloudStack Management Server with Simulator
         run: |
-          export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m -Djava.security.egd=file:/dev/urandom  -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver"
+          export MAVEN_OPTS="-Xmx4096m -XX:MaxMetaspaceSize=800m -Djava.security.egd=file:/dev/urandom  -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED"
           echo -e "\nStarting simulator"
           set +e
           mvn -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120 -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log || true &

diff --git 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 JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
 
       - name: Build CloudStack with Quality Checks

diff --git 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@v4
         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
@@ -31,10 +31,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           architecture: x64
           cache: maven

diff --git 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 JDK17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
 
       - name: Cache SonarCloud packages

diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - name: Env details
         run: |

diff --git a/INSTALL.md b/INSTALL.md
@@ -78,7 +78,7 @@ Clear old database (if any) and deploy the database schema:
 
 Export the following variable if you need to run and debug the management server:
 
-    $ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+    $ export MAVEN_OPTS="-Xmx1024m -XX:MaxMetaspaceSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
 
 Start the management server:
 

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: cloudstack
 Section: libs
 Priority: extra
 Maintainer: Wido den Hollander <wido@widodh.nl>
-Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
+Build-Depends: debhelper (>= 9), openjdk-17-jdk | java17-sdk | java17-jdk | zulu-17 | openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
  python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3,
  python (>= 2.7) | python2 (>= 2.7), python3 (>= 3), python-setuptools, python3-setuptools,
  nodejs (>= 12), lsb-release, dh-systemd | debhelper (>= 13)

diff --git a/developer/pom.xml b/developer/pom.xml
@@ -28,6 +28,12 @@
         <version>4.20.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${cs.mysql.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
@@ -108,28 +114,25 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.2.1</version>
-                        <dependencies>
-                            <!-- specify the dependent jdbc driver here -->
-                            <dependency>
-                                <groupId>com.mysql</groupId>
-                                <artifactId>mysql-connector-j</artifactId>
-                                <version>${cs.mysql.version}</version>
-                            </dependency>
-                        </dependencies>
+                        <version>${cs.exec-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
                                 <id>create-schema</id>
                                 <goals>
-                                    <goal>java</goal>
+                                    <goal>exec</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+                            <executable>java</executable>
+                            <workingDirectory>${basedir}/..</workingDirectory>
                             <includePluginDependencies>true</includePluginDependencies>
                             <arguments>
+                                <argument>--add-opens=java.base/java.lang=ALL-UNNAMED</argument>
+                                <argument>-classpath</argument>
+                                <classpath />
+                                <argument>com.cloud.upgrade.DatabaseCreator</argument>
                                 <!-- db properties file -->
                                 <argument>${basedir}/../utils/conf/db.properties</argument>
                                 <argument>${basedir}/../utils/conf/db.properties.override</argument>
@@ -177,27 +180,25 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.2.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.mysql</groupId>
-                                <artifactId>mysql-connector-j</artifactId>
-                                <version>${cs.mysql.version}</version>
-                            </dependency>
-                        </dependencies>
+                        <version>${cs.exec-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
                                 <id>create-schema-simulator</id>
                                 <goals>
-                                    <goal>java</goal>
+                                    <goal>exec</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+                            <executable>java</executable>
+                            <workingDirectory>${basedir}/..</workingDirectory>
                             <includePluginDependencies>true</includePluginDependencies>
                             <arguments>
+                                <argument>--add-opens=java.base/java.lang=ALL-UNNAMED</argument>
+                                <argument>-classpath</argument>
+                                <classpath />
+                                <argument>com.cloud.upgrade.DatabaseCreator</argument>
                                 <!-- db properties file -->
                                 <argument>${basedir}/../utils/conf/db.properties</argument>
                                 <argument>${basedir}/../utils/conf/db.properties.override</argument>
@@ -235,27 +236,25 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.2.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.mysql</groupId>
-                                <artifactId>mysql-connector-j</artifactId>
-                                <version>${cs.mysql.version}</version>
-                            </dependency>
-                        </dependencies>
+                        <version>${cs.exec-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>process-resources</phase>
                                 <id>create-schema-simulator</id>
                                 <goals>
-                                    <goal>java</goal>
+                                    <goal>exec</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+                            <executable>java</executable>
+                            <workingDirectory>${basedir}/..</workingDirectory>
                             <includePluginDependencies>true</includePluginDependencies>
                             <arguments>
+                                <argument>--add-opens=java.base/java.lang=ALL-UNNAMED</argument>
+                                <argument>-classpath</argument>
+                                <classpath />
+                                <argument>com.cloud.upgrade.DatabaseCreator</argument>
                                 <!-- db properties file -->
                                 <argument>${basedir}/../utils/conf/db.properties</argument>
                                 <argument>${basedir}/../utils/conf/db.properties.override</argument>

diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
@@ -61,9 +61,16 @@
     <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>${cs.gmavenplus.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-all</artifactId>
+                        <version>${cs.groovy.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>setproperty</id>
@@ -72,12 +79,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.getProperty('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,27 +96,29 @@
                             <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) {
-                                        if (data.size() > 0) {
-                                            def hypervisor =  template.tokenize('-')[-1]
-                                            pom.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
+                            <scripts>
+                                <script><![CDATA[
+                                    def csVersion = project.properties.getProperty('cs.version')
+                                    def patch = project.properties.getProperty('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) {
+                                            if (data.size() > 0) {
+                                                def hypervisor =  template.tokenize('-')[-1]
+                                                project.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
+                                            }
                                         }
                                     }
-                                }
-                            </source>
+                                ]]></script>
+                            </scripts>
                         </configuration>
                     </execution>
                 </executions>
@@ -135,7 +146,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>${cs.exec-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>systemvm-template-metadata</id>

diff --git a/engine/service/pom.xml b/engine/service/pom.xml
@@ -66,6 +66,11 @@
     <build>
         <finalName>engine</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+            </plugin>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>

diff --git a/...ion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java b/...ion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.never;
@@ -55,8 +54,6 @@ public class AncientDataMotionStrategyTest {
     @Mock
     PrimaryDataStoreTO dataStoreTO;
     @Mock
-    ConfigKey<Boolean> vmwareKey;
-    @Mock
     StorageManager storageManager;
     @Mock
     StoragePool storagePool;
@@ -66,24 +63,18 @@ public class AncientDataMotionStrategyTest {
 
     @Before
     public void setup() throws Exception {
-        replaceVmwareCreateCloneFullField();
-
-        when(vmwareKey.valueIn(POOL_ID)).thenReturn(FULL_CLONE_FLAG);
+        overrideDefaultConfigValue(StorageManager.VmwareCreateCloneFull, String.valueOf(FULL_CLONE_FLAG));
 
         when(dataTO.getHypervisorType()).thenReturn(HypervisorType.VMware);
         when(dataTO.getDataStore()).thenReturn(dataStoreTO);
         when(dataStoreTO.getId()).thenReturn(POOL_ID);
         when(storageManager.getStoragePool(POOL_ID)).thenReturn(storagePool);
     }
 
-    private void replaceVmwareCreateCloneFullField() throws Exception {
-        Field field = StorageManager.class.getDeclaredField("VmwareCreateCloneFull");
-        field.setAccessible(true);
-        // remove final modifier from field
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-        field.set(null, vmwareKey);
+    private void overrideDefaultConfigValue(final ConfigKey configKey, final String value) throws IllegalAccessException, NoSuchFieldException {
+        final Field f = ConfigKey.class.getDeclaredField("_defaultValue");
+        f.setAccessible(true);
+        f.set(configKey, value);
     }
 
     @Test