MatheMatrix · MatheMatrix · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1,13 @@
+-Dzstack.skipPlatformInit=true
+--add-opens java.base/java.util=ALL-UNNAMED
+--add-opens java.base/java.lang=ALL-UNNAMED
+--add-opens java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens java.base/java.text=ALL-UNNAMED
+--add-opens java.base/java.io=ALL-UNNAMED
+--add-opens java.base/java.math=ALL-UNNAMED
+--add-opens java.base/java.net=ALL-UNNAMED
+--add-opens java.base/java.nio=ALL-UNNAMED
+--add-opens java.base/java.security=ALL-UNNAMED
+--add-opens java.base/java.time=ALL-UNNAMED
+--add-opens java.base/sun.nio.ch=ALL-UNNAMED
+--add-opens java.base/sun.security.ssl=ALL-UNNAMED
diff --git a/abstraction/pom.xml b/abstraction/pom.xml
@@ -15,24 +15,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${project.compiler.version}</version>
                 <configuration>
-                    <compilerId>groovy-eclipse-compiler</compilerId>
                     <source>${project.java.version}</source>
                     <target>${project.java.version}</target>
                     <debuglevel>lines,vars,source</debuglevel>
                     <debug>true</debug>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-eclipse-compiler</artifactId>
-                        <version>${groovy.eclipse.compiler}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-eclipse-batch</artifactId>
-                        <version>${groovy.eclipse.batch}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/build/deploydb.sh b/build/deploydb.sh
@@ -70,12 +70,16 @@ mkdir -p ${flyway_sql}
 
 eval "rm -f ${flyway_sql}/*"
 cp ${base}/../conf/db/V0.6__schema.sql ${flyway_sql}
-cp ${base}/../conf/db/upgrade/* ${flyway_sql}
+for f in ${base}/../conf/db/upgrade/*; do
+  [ "$(basename "$f")" = "beforeValidate.sql" ] && continue
+  cp "$f" ${flyway_sql}
+done
 
+tz_param="?serverTimezone=Asia/Shanghai"
 if [[ ! -n $host ]] || [[ ! -n $port ]];then
-  url="jdbc:mysql://localhost:3306/zstack"
+  url="jdbc:mysql://localhost:3306/zstack${tz_param}"
 else
-  url="jdbc:mysql://$host:$port/zstack"
+  url="jdbc:mysql://$host:$port/zstack${tz_param}"
 fi
 ${flyway} -user=${user} -password=${password} -url=${url} clean
 
@@ -90,9 +94,9 @@ eval "rm -f ${flyway_sql}/*"
 cp ${base}/../conf/db/V0.6__schema_buildin_httpserver.sql ${flyway_sql}
 
 if [[ ! -n $host ]] || [[ ! -n $port ]];then
-  url="jdbc:mysql://localhost:3306/zstack_rest"
+  url="jdbc:mysql://localhost:3306/zstack_rest${tz_param}"
 else
-  url="jdbc:mysql://$host:$port/zstack_rest"
+  url="jdbc:mysql://$host:$port/zstack_rest${tz_param}"
 fi
 ${flyway} -user=${user} -password=${password} -url=${url} clean
 ${flyway} -outOfOrder=true -user=${user} -password=${password} -url=${url} migrate

diff --git a/build/pom.xml b/build/pom.xml
@@ -18,7 +18,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>2.3</version>
+                        <version>3.4.0</version>
                         <configuration>
                             <packagingExcludes>
                                 %regex[WEB-INF/lib/maven(?!-artifact).*.jar],
@@ -29,7 +29,6 @@
                                 WEB-INF/lib/regexp*.jar,
                                 WEB-INF/lib/jtidy*.jar,
                                 WEB-INF/lib/servlet-api*.jar,
-                                WEB-INF/lib/c3p0-0.9.1.1.jar,
                                 WEB-INF/lib/reflections-0.9.8.jar,
                                 WEB-INF/lib/groovy-2.4.7.jar,
                                 WEB-INF/lib/sisu-guava-0.9.9.jar,
@@ -670,7 +669,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.4.0</version>
                 <configuration>
                     <packagingExcludes>
                         %regex[WEB-INF/lib/maven(?!-artifact).*.jar],
@@ -681,7 +680,6 @@
                         WEB-INF/lib/regexp*.jar,
                         WEB-INF/lib/jtidy*.jar,
                         WEB-INF/lib/servlet-api*.jar,
-                        WEB-INF/lib/c3p0-0.9.1.1.jar,
                         WEB-INF/lib/reflections-0.9.8.jar,
                         WEB-INF/lib/groovy-2.4.7.jar,
                     </packagingExcludes>

diff --git a/compute/pom.xml b/compute/pom.xml
@@ -18,29 +18,55 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${project.compiler.version}</version>
                 <configuration>
-                    <compilerId>groovy-eclipse-compiler</compilerId>
                     <source>${project.java.version}</source>
                     <target>${project.java.version}</target>
                     <debuglevel>lines,vars,source</debuglevel>
                     <debug>true</debug>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-eclipse-compiler</artifactId>
-                        <version>${groovy.eclipse.compiler}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-eclipse-batch</artifactId>
-                        <version>${groovy.eclipse.batch}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<sources>
+						<fileset>
+							<directory>${project.basedir}/src/main/java</directory>
+							<includes>
+								<include>**/*.groovy</include>
+							</includes>
+						</fileset>
+					</sources>
+				</configuration>
+				<executions>
+					<execution>
+						<id>groovy-stubs</id>
+						<goals><goal>generateStubs</goal><goal>removeStubs</goal></goals>
+					</execution>
+					<execution>
+						<id>groovy-compile</id>
+						<goals><goal>compile</goal></goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.groovy</groupId>
+						<artifactId>groovy</artifactId>
+						<version>${groovy.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <version>${aspectj.plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>

diff --git a/compute/src/main/java/org/zstack/compute/allocator/AttachedL2NetworkAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/AttachedL2NetworkAllocatorFlow.java
@@ -14,8 +14,8 @@
 import org.zstack.header.network.l2.*;
 import org.zstack.header.network.l3.L3NetworkInventory;
 
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/compute/src/main/java/org/zstack/compute/allocator/AttachedPrimaryStorageAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/AttachedPrimaryStorageAllocatorFlow.java
@@ -17,7 +17,7 @@
 import org.zstack.utils.function.Function;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 import java.util.Set;
 import static org.zstack.utils.clouderrorcode.CloudOperationsErrorCode.*;

diff --git a/...ain/java/org/zstack/compute/allocator/BackupStorageSelectPrimaryStorageAllocatorFlow.java b/...ain/java/org/zstack/compute/allocator/BackupStorageSelectPrimaryStorageAllocatorFlow.java
@@ -18,7 +18,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 import static org.zstack.core.Platform.inerr;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/DesignatedHostAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/DesignatedHostAllocatorFlow.java
@@ -15,7 +15,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.ArrayList;
 import java.util.List;
 import static org.zstack.utils.clouderrorcode.CloudOperationsErrorCode.*;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java b/compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java
@@ -45,8 +45,8 @@
 import org.zstack.utils.function.Function;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.Callable;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java b/compute/src/main/java/org/zstack/compute/allocator/HostCapacityReserveManagerImpl.java
@@ -18,7 +18,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostCapacityUpdater.java b/compute/src/main/java/org/zstack/compute/allocator/HostCapacityUpdater.java
@@ -10,8 +10,8 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.LockModeType;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 /**

diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostCpuOverProvisioningManagerImpl.java b/compute/src/main/java/org/zstack/compute/allocator/HostCpuOverProvisioningManagerImpl.java
@@ -15,7 +15,7 @@
 import org.zstack.utils.CollectionUtils;
 import org.zstack.utils.function.Function;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java
@@ -18,8 +18,8 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 import java.util.*;
 import java.util.stream.Collectors;
 import static org.zstack.utils.clouderrorcode.CloudOperationsErrorCode.*;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/LeastVmPreferredSortFlow.java b/compute/src/main/java/org/zstack/compute/allocator/LeastVmPreferredSortFlow.java
@@ -11,7 +11,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/compute/src/main/java/org/zstack/compute/allocator/PrimaryStoragePrioritySortFlow.java b/compute/src/main/java/org/zstack/compute/allocator/PrimaryStoragePrioritySortFlow.java
@@ -16,7 +16,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;

diff --git a/compute/src/main/java/org/zstack/compute/allocator/QuotaAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/QuotaAllocatorFlow.java
@@ -19,7 +19,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.core.db.SimpleQuery;
 import org.zstack.header.host.*;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.*;
 
 

diff --git a/...te/src/main/java/org/zstack/compute/allocator/StoppedVmAwareLeastVmPreferredSortFlow.java b/...te/src/main/java/org/zstack/compute/allocator/StoppedVmAwareLeastVmPreferredSortFlow.java
@@ -14,7 +14,7 @@
 import org.zstack.header.vm.VmInstanceState;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/...e/src/main/java/org/zstack/compute/cluster/arch/ClusterResourceConfigInitializerImpl.java b/...e/src/main/java/org/zstack/compute/cluster/arch/ClusterResourceConfigInitializerImpl.java
@@ -16,7 +16,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 
 /**

diff --git a/compute/src/main/java/org/zstack/compute/host/HostManagerImpl.java b/compute/src/main/java/org/zstack/compute/host/HostManagerImpl.java
@@ -50,7 +50,7 @@
 import org.zstack.utils.function.ForEachFunction;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;

diff --git a/compute/src/main/java/org/zstack/compute/host/HostTrackImpl.java b/compute/src/main/java/org/zstack/compute/host/HostTrackImpl.java
@@ -25,7 +25,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;

diff --git a/compute/src/main/java/org/zstack/compute/vm/ImageBackupStorageSelector.java b/compute/src/main/java/org/zstack/compute/vm/ImageBackupStorageSelector.java
@@ -8,7 +8,7 @@
 import org.zstack.header.image.ImageStatus;
 import org.zstack.header.storage.backup.BackupStorageStatus;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 /**

diff --git a/compute/src/main/java/org/zstack/compute/vm/StaticIpOperator.java b/compute/src/main/java/org/zstack/compute/vm/StaticIpOperator.java
@@ -28,7 +28,7 @@
 import org.zstack.utils.network.IPv6NetworkUtils;
 import org.zstack.utils.network.NetworkUtils;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java
@@ -35,7 +35,7 @@
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java b/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java
@@ -49,9 +49,9 @@
 import org.zstack.utils.logging.CLogger;
 import org.zstack.utils.network.IPv6Constants;
 
-import javax.persistence.Query;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmCdRomUpgradeExtension.java b/compute/src/main/java/org/zstack/compute/vm/VmCdRomUpgradeExtension.java
@@ -18,7 +18,7 @@
 import org.zstack.identity.Account;
 import java.util.HashMap;
 import java.util.Map;
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmDeleteVolumeFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmDeleteVolumeFlow.java
@@ -23,7 +23,7 @@
 import org.zstack.utils.function.Function;
 import org.zstack.utils.logging.CLogger;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmExtraInfoGetter.java b/compute/src/main/java/org/zstack/compute/vm/VmExtraInfoGetter.java
@@ -10,7 +10,7 @@
 import org.zstack.core.db.SQL;
 import org.zstack.header.volume.VolumeType;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 /**