Skip to content

The Unified and Autonomous Development Platform

fix: Unable to delete obsolete project directories on Windows with Java 25 (OD-2574)

Robin Shen25e3991ba97d
diff --git a/pom.xml b/pom.xml
index aa3efbb8d8..c3f7312711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.2.3</version>
</parent>
<artifactId>server</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@@ -320,7 +320,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.0.1-jre</version>
+ <version>33.5.0-jre</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -646,8 +646,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.0.14</commons.version>
- <agent.version>2.2.19</agent.version>
+ <commons.version>3.0.15</commons.version>
+ <agent.version>2.2.20</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 65153facbc..e5b12cfe04 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<build>
<plugins>
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 1a4da18f2b..bafa6a636a 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/SubscriptionService.java b/server-core/src/main/java/io/onedev/server/SubscriptionService.java
index 99469b136f..72421e0b15 100644
--- a/server-core/src/main/java/io/onedev/server/SubscriptionService.java
+++ b/server-core/src/main/java/io/onedev/server/SubscriptionService.java
@@ -3,7 +3,7 @@ package io.onedev.server;
import io.onedev.server.annotation.NoDBAccess;
import org.apache.wicket.Component;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface SubscriptionService {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 753b583f40..258b962bc4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -14,7 +14,7 @@ import java.util.Stack;
import java.util.function.Consumer;
import java.util.function.Function;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.ConstraintViolation;
import javax.validation.Valid;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java
index 227215cc01..a82a6196bd 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface BuildSpecAware {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index a69c4c348e..14a756282d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -10,7 +10,7 @@ import java.util.List;
import java.util.Stack;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.ConstraintViolation;
import javax.validation.ValidationException;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index e1d5a270e3..c5cbbc434a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.Min;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java
index 619e309eb1..051f75400b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspec.ParamSpecAware;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java
index 5c3d9a834a..3683b7d9e4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
index 491ac03aef..8215486be7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
@@ -10,7 +10,7 @@ import io.onedev.server.model.PullRequest;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
index 272d057cc4..d10cf07620 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.ValidationException;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
index 4e047750b7..ba24dde7ae 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
@@ -14,7 +14,7 @@ import static io.onedev.server.model.Build.NAME_TAG;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
index 8de19556bb..1b2c28197f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
index 72d3fec7f8..19ee237751 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_BRANCH;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
index e5853e1b97..a0e8a4e10d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_BRANCH;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
index b3802f8b97..115e01e860 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
index acf979d351..3166d00501 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
index 5cd2aa5baf..af3b30f33a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
index ab03397694..750251d035 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
index 17c920171b..87eeb48055 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
index 5ff28c7590..57f19abf5b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
index 0cda40fe1b..b8a8c894b4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
index 77eb1f9701..ffc7cd3363 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
index 8113443c43..141ff7eb06 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
index 87c3d65794..c348b26717 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
index 57db0af41e..c74988cd76 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_PROJECT;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
index b8c2cc3aa3..d766d0f632 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
index 2147aacf60..85c02b3683 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
index 5698beff64..499c4400ca 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_TAG;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
index 3ad14edca1..4e8412b5ab 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_TAG;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
index 5520c97a36..7f363cf589 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
index 7cf3b713ed..42299206f6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
index 465f64a219..cc10856277 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
@@ -5,7 +5,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.job.log.StyleBuilder;
import io.onedev.server.web.asset.emoji.Emojis;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/BuildProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/BuildProvider.java
index c96f8f658e..40e760d62d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/BuildProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/BuildProvider.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.projectdependency;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index aaf3aedbb7..50146b5e8a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -17,7 +17,7 @@ import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.WicketUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
index 25d1f6ba71..c053b7d3bb 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
index 83de013a4f..77926e7dbe 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.retrycondition;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
index da0e2caaaa..d299afeb23 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
index d5ecf2addf..db2b7ba62c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
index 51b75de33d..510f18899a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
@@ -10,7 +10,7 @@ import static io.onedev.server.model.Build.NAME_LOG;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryContext.java
index 326ce84719..01623e5836 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryContext.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import io.onedev.server.model.Build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class RetryContext {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java
index f5b994056f..ceba5c809e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java
@@ -16,7 +16,7 @@ import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index b74172a6a2..97ec93dc17 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -20,7 +20,7 @@ import io.onedev.server.web.util.WicketUtils;
import org.apache.wicket.Component;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index 1465382a2e..293e4d3fc0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -15,7 +15,7 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
import org.eclipse.jgit.lib.Repository;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
index 5fe0f38b14..ed62b151f3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
@@ -17,7 +17,7 @@ import org.apache.commons.lang.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import java.io.Serializable;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValueProvider.java
index 9172c69aef..a8db6f18ae 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValueProvider.java
@@ -4,7 +4,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValuesProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValuesProvider.java
index 2ec7523ba1..9d224613bf 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValuesProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ValuesProvider.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.instance;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
index c454d6c76c..bd880e51af 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.annotation.Multiline;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
index 2e7a924e4c..22954cd2c7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import org.eclipse.jgit.lib.AnyObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
index ad174bf2ca..0b0d2d3f7b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java
index d277fceef7..1b6d8e391f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java
@@ -4,7 +4,7 @@ import java.io.File;
import java.util.Collection;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.KubernetesHelper;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
index fc4eff6443..8828c7fa63 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
@@ -10,7 +10,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.io.File;
import java.io.UnsupportedEncodingException;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/Interpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/Interpreter.java
index c0e8346db5..6246bbf2d6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/Interpreter.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/Interpreter.java
@@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java
index f3145fe4ff..a5cae90edc 100644
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspecmodel.inputspec;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
index 82c08cadba..9dff2482e7 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.web.util.WicketUtils;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
index b53811fffe..e055ea314e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
index 8587cf8412..2fa7535873 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
@@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Size;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
index 088a7db77b..8443eea491 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import com.google.common.collect.Lists;
diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java
index bd3cbbe3b3..cf186bad7a 100644
--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java
+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java
@@ -6,7 +6,7 @@ import com.hazelcast.cp.IAtomicLong;
import io.onedev.server.annotation.NoDBAccess;
import io.onedev.server.replica.ProjectReplica;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/codequality/BlobTarget.java b/server-core/src/main/java/io/onedev/server/codequality/BlobTarget.java
index 45584c50a4..7999465568 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/BlobTarget.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/BlobTarget.java
@@ -7,7 +7,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.*;
import static java.util.Comparator.comparingInt;
diff --git a/server-core/src/main/java/io/onedev/server/codequality/CodeProblemContribution.java b/server-core/src/main/java/io/onedev/server/codequality/CodeProblemContribution.java
index 27c96c53dd..e24b04520c 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/CodeProblemContribution.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/CodeProblemContribution.java
@@ -2,7 +2,7 @@ package io.onedev.server.codequality;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.server.model.Build;
diff --git a/server-core/src/main/java/io/onedev/server/codequality/CoverageStatus.java b/server-core/src/main/java/io/onedev/server/codequality/CoverageStatus.java
index af922d4352..a730ac9632 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/CoverageStatus.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/CoverageStatus.java
@@ -1,6 +1,6 @@
package io.onedev.server.codequality;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public enum CoverageStatus {
diff --git a/server-core/src/main/java/io/onedev/server/codequality/LineCoverageContribution.java b/server-core/src/main/java/io/onedev/server/codequality/LineCoverageContribution.java
index 6bdcdb2823..c5350585c4 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/LineCoverageContribution.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/LineCoverageContribution.java
@@ -2,7 +2,7 @@ package io.onedev.server.codequality;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.server.model.Build;
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 5ebfa43c72..dcc1f8890e 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -35,6 +35,7 @@ import java.util.concurrent.Callable;
import static io.onedev.server.persistence.PersistenceUtils.*;
import static java.lang.Integer.parseInt;
import static java.lang.String.valueOf;
+import static java.lang.System.lineSeparator;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.io.FileUtils.writeStringToFile;
import static org.hibernate.cfg.AvailableSettings.DIALECT;
@@ -124,11 +125,12 @@ public class Upgrade extends AbstractPlugin {
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.text=ALL-UNNAMED",
"--add-opens=java.desktop/java.awt.font=ALL-UNNAMED",
- "--add-modules=java.se",
+ "--add-modules=java.se",
"--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
+ "-Djdk.io.File.allowDeleteReadOnlyFiles=true",
"-classpath", "*", bootstrapClass,
command);
cmdline.addArgs(commandArgs);
@@ -944,6 +946,10 @@ public class Upgrade extends AbstractPlugin {
wrapperConf = wrapperConf.replace(
"wrapperConfwrapper.java.additional.30=--add-modules=java.se",
"wrapper.java.additional.30=--add-modules=java.se");
+
+ if (!wrapperConf.contains("-Djdk.io.File.allowDeleteReadOnlyFiles=true")) {
+ wrapperConf += lineSeparator() + "wrapper.java.additional.150=-Djdk.io.File.allowDeleteReadOnlyFiles=true";
+ }
var lines = Splitter.on('\n').trimResults().splitToList(wrapperConf);
if (lines.stream().noneMatch(it -> it.contains("-XX:MaxRAMPercentage"))) {
diff --git a/server-core/src/main/java/io/onedev/server/data/DataService.java b/server-core/src/main/java/io/onedev/server/data/DataService.java
index 383173045d..66e3e35ef4 100644
--- a/server-core/src/main/java/io/onedev/server/data/DataService.java
+++ b/server-core/src/main/java/io/onedev/server/data/DataService.java
@@ -4,7 +4,7 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.util.init.ManualConfig;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.sql.Connection;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index b3a1120c58..7fe765fcb3 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -35,7 +35,7 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Singleton;
import org.apache.commons.io.IOUtils;
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
index 7439a7aeb7..054f7de4a0 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
@@ -9,7 +9,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.ObjectUtils.Null;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/BuildReference.java b/server-core/src/main/java/io/onedev/server/entityreference/BuildReference.java
index 56d3c01dd4..b0727a07ea 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/BuildReference.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/BuildReference.java
@@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class BuildReference extends EntityReference {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java b/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java
index 851477d29e..157116c618 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java
@@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/IssueReference.java b/server-core/src/main/java/io/onedev/server/entityreference/IssueReference.java
index 5415a06bb1..df128329e0 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/IssueReference.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/IssueReference.java
@@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class IssueReference extends EntityReference {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
index f7864d150e..46be80492f 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
@@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import java.util.function.BiFunction;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.unbescape.html.HtmlEscape;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/PullRequestReference.java b/server-core/src/main/java/io/onedev/server/entityreference/PullRequestReference.java
index 09b5d3b95d..d4b8618f8a 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/PullRequestReference.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/PullRequestReference.java
@@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class PullRequestReference extends EntityReference {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeService.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeService.java
index 3a30c49e1e..ab3de23277 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeService.java
@@ -1,6 +1,6 @@
package io.onedev.server.entityreference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceUtils.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceUtils.java
index 60b7ac800c..5ad970441d 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceUtils.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceUtils.java
@@ -12,7 +12,7 @@ import java.util.Set;
import java.util.function.BiFunction;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.jsoup.nodes.Document;
import org.jsoup.select.NodeTraversor;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java
index d176a860e2..d306a19005 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java
@@ -1,6 +1,6 @@
package io.onedev.server.entityreference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.CodeComment;
diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.java
index 46acd1e8da..1d364d30ef 100644
--- a/server-core/src/main/java/io/onedev/server/event/Event.java
+++ b/server-core/src/main/java/io/onedev/server/event/Event.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.websocket.PageKey;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class Event {
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
index 2be6e78ead..82f7c8bf78 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
@@ -11,7 +11,7 @@ import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.web.UrlService;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Date;
import java.util.Optional;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
index 8864b9110d..4883ff9a94 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
@@ -2,7 +2,7 @@ package io.onedev.server.event.project;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
index c93a3c314b..32a094be46 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
@@ -13,7 +13,7 @@ import io.onedev.server.model.User;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class BuildEvent extends ProjectEvent implements CommitAware {
diff --git a/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentStatusChanged.java
index 8bc00612ad..a925965a1a 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentStatusChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentStatusChanged.java
@@ -1,6 +1,6 @@
package io.onedev.server.event.project.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.CodeCommentStatusChangeService;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
index db0ef8e639..76e8c08ab3 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
@@ -13,7 +13,7 @@ import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
import io.onedev.server.web.UrlService;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
index 93dcc13b49..d3de953a54 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
@@ -1,6 +1,6 @@
package io.onedev.server.event.project.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java
index 9284f71926..8a467546f0 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java
@@ -1,6 +1,6 @@
package io.onedev.server.event.project.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.CodeCommentStatusChangeService;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestEvent.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestEvent.java
index b26977e8cd..00a9536e26 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestEvent.java
@@ -2,7 +2,7 @@ package io.onedev.server.event.project.pullrequest;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.PullRequestService;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java
index 36555fc3fb..37185b57df 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java
@@ -3,7 +3,7 @@ package io.onedev.server.event.project.pullrequest;
import java.text.MessageFormat;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.UserService;
diff --git a/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java b/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java
index d0ed396fef..528accb8b3 100644
--- a/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java
@@ -4,7 +4,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.exception.handler.ExceptionHandler;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.MultivaluedMap;
import java.io.IOException;
diff --git a/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java b/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java
index 29761baa17..95dcb1e570 100644
--- a/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java
+++ b/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java
@@ -1,6 +1,6 @@
package io.onedev.server.exception;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/git/Blob.java b/server-core/src/main/java/io/onedev/server/git/Blob.java
index a26ba22311..6f385984c8 100644
--- a/server-core/src/main/java/io/onedev/server/git/Blob.java
+++ b/server-core/src/main/java/io/onedev/server/git/Blob.java
@@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.tika.mime.MediaType;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobChange.java b/server-core/src/main/java/io/onedev/server/git/BlobChange.java
index 9224b75b2e..82af8a7d2d 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobChange.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobChange.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.util.DiffPlanarRange;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -134,13 +134,11 @@ public abstract class BlobChange implements Serializable {
return getProject().getBlob(newBlobIdent, true);
}
- @Nullable
- public Blob.Text getOldText() {
+ public Blob.@Nullable Text getOldText() {
return getOldBlob().getText();
}
- @Nullable
- public Blob.Text getNewText() {
+ public Blob.@Nullable Text getNewText() {
return getNewBlob().getText();
}
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobIdent.java b/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
index d1c8210c38..00f56ea5ef 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
@@ -3,7 +3,7 @@ package io.onedev.server.git;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index cd2a337429..f5c5e1286e 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -31,7 +31,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BooleanSupplier;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.Filter;
diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
index bf61493805..85732892df 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;
diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommand.java b/server-core/src/main/java/io/onedev/server/git/SshCommand.java
index 4ebd0d1447..deeab42e22 100644
--- a/server-core/src/main/java/io/onedev/server/git/SshCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/SshCommand.java
@@ -16,7 +16,7 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.shiro.util.ThreadContext;
import org.apache.sshd.common.channel.ChannelOutputStream;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java b/server-core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
index cfbb2a9ee1..95c42a17bc 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
@@ -3,7 +3,7 @@ package io.onedev.server.git.command;
import java.io.File;
import java.io.OutputStream;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java b/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java
index 324aae3b65..cf4bc3fdae 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/BlameCommand.java
@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
import org.apache.commons.collections4.map.ReferenceMap;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
index 92adf612de..83d01c7319 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.FileExtension;
import io.onedev.commons.utils.match.Matcher;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java
index eac3d8146c..5f31eb88c4 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/GetRawTagCommand.java
@@ -13,7 +13,7 @@ import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.git.CommandUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class GetRawTagCommand {
diff --git a/server-core/src/main/java/io/onedev/server/git/command/LogCommit.java b/server-core/src/main/java/io/onedev/server/git/command/LogCommit.java
index 9c62bda520..84f58b9924 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/LogCommit.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/LogCommit.java
@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java b/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java
index b02ebae5fa..d47424199b 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/ReceivePackCommand.java
@@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
index 32d3c55ce8..08b54b594b 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
@@ -10,7 +10,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import io.onedev.server.git.command.RevListCommand.Order;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class RevListOptions implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java b/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java
index f8e62e1252..1649d325b1 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/UploadPackCommand.java
@@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;
diff --git a/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java b/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java
index 2a8756d406..a5063f25ad 100644
--- a/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java
+++ b/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java
@@ -1,6 +1,6 @@
package io.onedev.server.git.exception;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java
index 7a07790b26..a9600d095b 100644
--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java
+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java
@@ -18,7 +18,7 @@ import org.apache.shiro.util.ThreadContext;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.ServletException;
diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveChecker.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveChecker.java
index 7e0f2643b5..99b1ff3d60 100644
--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveChecker.java
+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveChecker.java
@@ -5,7 +5,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
@ExtensionPoint
public interface GitPreReceiveChecker {
diff --git a/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java b/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java
index a2ea59ce0e..3b47fcd2e5 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/CommitMessageError.java
@@ -4,7 +4,7 @@ import static io.onedev.server.git.GitUtils.abbreviateSHA;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
index 26c4e92711..b05f7be71e 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
@@ -26,7 +26,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/git/service/GitService.java b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
index eb5f8e20e5..f5cc23ec85 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/GitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
@@ -13,7 +13,7 @@ import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
import java.util.EnumSet;
diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/SignatureVerificationService.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/SignatureVerificationService.java
index 591fd7ef69..d45239f153 100644
--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/SignatureVerificationService.java
+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/SignatureVerificationService.java
@@ -2,7 +2,7 @@ package io.onedev.server.git.signatureverification;
import org.eclipse.jgit.revwalk.RevObject;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface SignatureVerificationService {
diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSigningKey.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSigningKey.java
index 0fcdedc7aa..68dcee190d 100644
--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSigningKey.java
+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSigningKey.java
@@ -2,7 +2,7 @@ package io.onedev.server.git.signatureverification.gpg;
import org.bouncycastle.openpgp.PGPPublicKey;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
public interface GpgSigningKey {
diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgVerificationFailed.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgVerificationFailed.java
index 0a31f8d9de..3505b726f3 100644
--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgVerificationFailed.java
+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgVerificationFailed.java
@@ -7,7 +7,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.revwalk.RevObject;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.util.GpgUtils.getEmailAddresses;
diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshVerificationFailed.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshVerificationFailed.java
index 7045d1168b..fdc832a907 100644
--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshVerificationFailed.java
+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshVerificationFailed.java
@@ -7,7 +7,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.revwalk.RevObject;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class SshVerificationFailed implements VerificationFailed {
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index a26adc1482..99f14f63cd 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultResourceAllocator.java b/server-core/src/main/java/io/onedev/server/job/DefaultResourceAllocator.java
index 9e26441296..52c382633f 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultResourceAllocator.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultResourceAllocator.java
@@ -13,7 +13,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
index 1e19bc36ea..a4d1b9fbec 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
@@ -120,7 +120,7 @@ public class JobAuthorizationContext {
stack.get().pop();
}
- @javax.annotation.Nullable
+ @org.jspecify.annotations.Nullable
public static JobAuthorizationContext get() {
if (!stack.get().isEmpty()) {
return stack.get().peek();
diff --git a/server-core/src/main/java/io/onedev/server/job/JobService.java b/server-core/src/main/java/io/onedev/server/job/JobService.java
index 129736bdfb..2e9c206d02 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobService.java
@@ -4,7 +4,7 @@ import java.io.File;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/job/log/LogService.java b/server-core/src/main/java/io/onedev/server/job/log/LogService.java
index 52d7c466de..b0efece9f3 100644
--- a/server-core/src/main/java/io/onedev/server/job/log/LogService.java
+++ b/server-core/src/main/java/io/onedev/server/job/log/LogService.java
@@ -4,7 +4,7 @@ import java.io.InputStream;
import java.util.List;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.job.log.JobLogEntryEx;
diff --git a/server-core/src/main/java/io/onedev/server/job/log/LogTask.java b/server-core/src/main/java/io/onedev/server/job/log/LogTask.java
index 2c607a9c03..d424626b04 100644
--- a/server-core/src/main/java/io/onedev/server/job/log/LogTask.java
+++ b/server-core/src/main/java/io/onedev/server/job/log/LogTask.java
@@ -1,6 +1,6 @@
package io.onedev.server.job.log;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
index 97c285ba6c..a31bc17127 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.job.match;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
index 118331983d..ddc6256695 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
@@ -7,7 +7,7 @@ import static io.onedev.server.job.match.JobMatchParser.OnBranch;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java
index 1f74465319..e7de1c5fff 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java
@@ -1,6 +1,6 @@
package io.onedev.server.job.match;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
index af868bd2e5..67ca4fd79b 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.job.match;
import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
index ed518dff20..22bf920226 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.job.match;
import static io.onedev.server.model.Build.NAME_PROJECT;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
index c47dace143..ac5e5980e6 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.mail.Authenticator;
diff --git a/server-core/src/main/java/io/onedev/server/mail/MailService.java b/server-core/src/main/java/io/onedev/server/mail/MailService.java
index 4cc2c471c1..6ab1233fe1 100644
--- a/server-core/src/main/java/io/onedev/server/mail/MailService.java
+++ b/server-core/src/main/java/io/onedev/server/mail/MailService.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.concurrent.Future;
import java.util.function.Consumer;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.mail.Message;
import io.onedev.server.model.Issue;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
index 6ea1a3ef14..add6ef8f5f 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
index f43e4ac566..5df09bd7f5 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.ProjectService;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java
index 6a21d5e098..5fdbc2ed28 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java
@@ -25,7 +25,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.resource.AttachmentResource;
import org.jsoup.nodes.Element;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/HtmlProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/HtmlProcessor.java
index 631d336644..5c537356a7 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/HtmlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/HtmlProcessor.java
@@ -1,6 +1,6 @@
package io.onedev.server.markdown;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.jsoup.nodes.Document;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/MarkdownService.java b/server-core/src/main/java/io/onedev/server/markdown/MarkdownService.java
index 0de68c141b..71eb8a66e8 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/MarkdownService.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MarkdownService.java
@@ -5,7 +5,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Set;
public interface MarkdownService {
diff --git a/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
index fe9f351848..b07d2dcccd 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
@@ -1,6 +1,6 @@
package io.onedev.server.markdown;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
index 010bd94680..3206025588 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
@@ -2,7 +2,7 @@ package io.onedev.server.markdown;
import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java
index 0051d1bd18..c76ee09900 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.TextNode;
diff --git a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
index 7db68c8a19..1de560cc80 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
@@ -2,7 +2,7 @@ package io.onedev.server.markdown;
import java.net.URISyntaxException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index 746ac27b9a..62d82eb683 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
diff --git a/server-core/src/main/java/io/onedev/server/model/AccessToken.java b/server-core/src/main/java/io/onedev/server/model/AccessToken.java
index 1a1211cd27..bc1caea334 100644
--- a/server-core/src/main/java/io/onedev/server/model/AccessToken.java
+++ b/server-core/src/main/java/io/onedev/server/model/AccessToken.java
@@ -11,7 +11,7 @@ import org.apache.shiro.subject.Subject;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java b/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java
index a692c76cb6..793a8701a5 100644
--- a/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java
+++ b/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java
@@ -1,6 +1,6 @@
package io.onedev.server.model;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
diff --git a/server-core/src/main/java/io/onedev/server/model/Alert.java b/server-core/src/main/java/io/onedev/server/model/Alert.java
index d0298fa1f5..3a1093b4dc 100644
--- a/server-core/src/main/java/io/onedev/server/model/Alert.java
+++ b/server-core/src/main/java/io/onedev/server/model/Alert.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import io.onedev.server.annotation.Editable;
import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
diff --git a/server-core/src/main/java/io/onedev/server/model/Audit.java b/server-core/src/main/java/io/onedev/server/model/Audit.java
index 5b8e670e9f..b3cad73f50 100644
--- a/server-core/src/main/java/io/onedev/server/model/Audit.java
+++ b/server-core/src/main/java/io/onedev/server/model/Audit.java
@@ -5,7 +5,7 @@ import static io.onedev.server.model.Audit.PROP_DATE;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 993f094b32..2fd987a488 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -37,7 +37,6 @@ import java.util.Set;
import java.util.Stack;
import java.util.UUID;
-import javax.annotation.Nullable;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.CascadeType;
@@ -59,6 +58,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Restrictions;
+import org.jspecify.annotations.Nullable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Preconditions;
@@ -79,8 +79,6 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspecmodel.inputspec.Input;
import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.cluster.ClusterService;
-import io.onedev.server.service.AccessTokenService;
-import io.onedev.server.service.BuildService;
import io.onedev.server.entityreference.BuildReference;
import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.git.GitUtils;
@@ -93,6 +91,8 @@ import io.onedev.server.model.support.TimeGroups;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.search.entity.SortField;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AccessTokenService;
+import io.onedev.server.service.BuildService;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.FilenameUtils;
import io.onedev.server.util.artifact.ArtifactInfo;
@@ -878,8 +878,8 @@ public class Build extends ProjectBelonging
}
return fixedIssueIds;
}
-
- public Collection<RevCommit> getCommits(@Nullable Build.Status sincePrevStatus) {
+
+ public Collection<RevCommit> getCommits(Build.@Nullable Status sincePrevStatus) {
if (commitsCache == null)
commitsCache = new HashMap<>();
if (!commitsCache.containsKey(sincePrevStatus)) {
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
index 98a7b0b086..0b60cade65 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
@@ -1,6 +1,6 @@
package io.onedev.server.model;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildParam.java b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
index cd039193f2..42995665da 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import static io.onedev.server.model.BuildParam.PROP_NAME;
import static io.onedev.server.model.BuildParam.PROP_VALUE;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
index 9ee6230541..93ea369eae 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index cdacc767f5..4b4bc5830d 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -13,7 +13,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Embedded;
diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
index 4fa79d6b0f..f0210b0e93 100644
--- a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index deeafa379a..19c2cc3305 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -40,7 +40,7 @@ import java.util.Stack;
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.mail.internet.InternetAddress;
import javax.persistence.CascadeType;
import javax.persistence.Column;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueComment.java b/server-core/src/main/java/io/onedev/server/model/IssueComment.java
index b56fb3c504..3c2caa810a 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueComment.java
@@ -5,7 +5,7 @@ import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
import java.util.ArrayList;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.mail.internet.InternetAddress;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueField.java b/server-core/src/main/java/io/onedev/server/model/IssueField.java
index 351e125d64..ccbe97c778 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueField.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueField.java
@@ -5,7 +5,7 @@ import static io.onedev.server.model.IssueField.PROP_ORDINAL;
import static io.onedev.server.model.IssueField.PROP_TYPE;
import static io.onedev.server.model.IssueField.PROP_VALUE;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
index 29a75711e2..acd5b54586 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java
index b72216e23b..78c895c313 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java
@@ -2,7 +2,7 @@ package io.onedev.server.model;
import io.onedev.server.model.support.TimeGroups;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.*;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWork.java b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
index 847dc6a097..1f407812b3 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueWork.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
@@ -4,7 +4,7 @@ import static io.onedev.server.model.IssueWork.PROP_DATE;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/Iteration.java b/server-core/src/main/java/io/onedev/server/model/Iteration.java
index f540a9ddc3..a155449c34 100644
--- a/server-core/src/main/java/io/onedev/server/model/Iteration.java
+++ b/server-core/src/main/java/io/onedev/server/model/Iteration.java
@@ -6,7 +6,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
index 0bc9ac6b7e..697244e2c3 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/Pack.java b/server-core/src/main/java/io/onedev/server/model/Pack.java
index b10a27271d..ea36132d9e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Pack.java
+++ b/server-core/src/main/java/io/onedev/server/model/Pack.java
@@ -7,7 +7,7 @@ import io.onedev.server.model.support.LabelSupport;
import io.onedev.server.pack.PackSupport;
import io.onedev.server.search.entity.SortField;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.*;
import java.io.Serializable;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/model/PackBlob.java b/server-core/src/main/java/io/onedev/server/model/PackBlob.java
index 9b7e53cb48..e14ab74b6c 100644
--- a/server-core/src/main/java/io/onedev/server/model/PackBlob.java
+++ b/server-core/src/main/java/io/onedev/server/model/PackBlob.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java
index 8fc65ad3ff..2975ef2937 100644
--- a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index d93fcbac53..368d8a38b3 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -25,7 +25,7 @@ import java.util.Stack;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 07ad066afd..48b60ba5dc 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -49,7 +49,7 @@ import java.util.Stack;
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.CascadeType;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
index eb4604a7ff..326168709c 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
@@ -3,7 +3,7 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.java
index 43708827be..6f960034ba 100644
--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java
+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java
@@ -5,7 +5,7 @@ import java.security.GeneralSecurityException;
import java.security.PublicKey;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 532c717f90..cf6e872a28 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -15,7 +15,7 @@ import java.util.Optional;
import java.util.Stack;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java b/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java
index e717348deb..db899d7ffb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java
@@ -4,7 +4,7 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Patterns;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
@Editable
diff --git a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java
index 7fd6c7a134..f1d38c041c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
index 49126fb61b..0aca04f0c4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
@@ -5,7 +5,7 @@ import io.onedev.server.util.diff.WhitespaceOption;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java b/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java
index ba7edfdaaa..6a094f4df7 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support;
import java.io.Serializable;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.FetchType;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/Mark.java b/server-core/src/main/java/io/onedev/server/model/support/Mark.java
index 8b5ae9f41f..70f292cacf 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/Mark.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/Mark.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
index 915cb9e538..7adfea4cca 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support;
import java.io.Serializable;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
index b5ecf9cc73..d5e6a23f84 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.MappedSuperclass;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java
index e209cfa6dd..a372417216 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.NamedAgentQuery;
import io.onedev.server.search.entity.agent.AgentQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
index 7b5853e4c3..36b970ec8b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 50d23d017f..8a73b3e6b2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPackSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPackSetting.java
index cae6000c45..ceab19b6f4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPackSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPackSetting.java
@@ -5,7 +5,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.model.support.pack.NamedPackQuery;
import io.onedev.server.pack.PackSupport;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java
index 842f5df2ee..ae229b3979 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.model.support.NamedProjectQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
index 6e2319b4d6..3d43433ae2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java
index 3f55784471..634e9995c2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GpgSetting.java
@@ -7,7 +7,7 @@ import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRing;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import java.io.Serializable;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/PasswordPolicy.java b/server-core/src/main/java/io/onedev/server/model/support/administration/PasswordPolicy.java
index 503782eb37..edb99f2310 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/PasswordPolicy.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/PasswordPolicy.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
index 4b4a686276..686d8c24ce 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotNull;
import org.slf4j.Logger;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index be0ecac60a..c04cbc09aa 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
index 9b2766e1fc..842c17aaa1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.administration.authenticator;
import java.io.Serializable;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class Authenticated implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index a1f494d41f..cd9834a8f5 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -19,7 +19,7 @@ import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.util.WicketUtils;
import org.eclipse.jetty.http.HttpStatus;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailConnector.java
index 3ccecd191e..f87a8676ff 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailConnector.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailConnector.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.administration.mailservice;
import java.io.Serializable;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.Editable;
import io.onedev.server.mail.InboxMonitor;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java
index 39a668287a..1d5ebf9c9d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoAuthenticated.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration.sso;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
index f2fce09895..5f100fbbb8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
@@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.OneDev;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
index f47ef07e88..c9a09581e6 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
@@ -14,7 +14,7 @@ import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java b/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
index ba5a19506b..2cc5e1168c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
@@ -4,7 +4,7 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Numeric;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
@Editable
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 1e2f475ba7..70cd3ba92f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
index 427857c381..ac3b18491c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index 62c28662c3..4b47a18525 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.OneDev;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java
index a6ec77a2c4..0c574429ab 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java
@@ -9,7 +9,7 @@ import io.onedev.server.annotation.RadioChoice;
import io.onedev.server.service.SettingService;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
index eb2a2357ad..b2b10466b9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Group;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
index 84a78c203c..18d0c04b54 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
@@ -4,7 +4,7 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.User;
import io.onedev.server.notification.ActivityDetail;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
index 40584aec13..61c08f8423 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
@@ -8,7 +8,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import javax.ws.rs.BadRequestException;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
index 2e974473e2..ddb788cebb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/ManualSpec.java
@@ -9,7 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java
index baaf4fc70a..cd02f2ae87 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.pack;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
index ef7e10be73..3be1d68fb0 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.pullrequest;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java
index d399fb728b..21503a71c4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.pullrequest;
import io.onedev.server.model.PullRequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
index 4f496e8fe2..a9edec6054 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
@@ -1,6 +1,6 @@
package io.onedev.server.model.support.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
index e60106c1a9..21c866db69 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
@@ -8,7 +8,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.commons.bootstrap.Bootstrap;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
index 554bf8f82d..ac8db74cfc 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.notification.ActivityDetail;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
index 32df9e060e..e6e4cdd333 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import io.onedev.server.notification.ActivityDetail;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
index 53d5fbd89f..29398133f6 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
@@ -1,6 +1,6 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class PullRequestMergeData extends PullRequestChangeData {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index 2d9dda73fc..1ec06c421b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -9,7 +9,7 @@ import io.onedev.server.annotation.Patterns;
import io.onedev.server.service.BuildService;
import io.onedev.server.web.util.SuggestionUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/widget/TabState.java b/server-core/src/main/java/io/onedev/server/model/support/widget/TabState.java
index 069fcba353..db19ab7b10 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/widget/TabState.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/widget/TabState.java
@@ -1,6 +1,6 @@
package io.onedev.server.model.support.widget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public class TabState implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/widget/TabStateSupport.java b/server-core/src/main/java/io/onedev/server/model/support/widget/TabStateSupport.java
index db4f5fa572..662cacb55a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/widget/TabStateSupport.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/widget/TabStateSupport.java
@@ -1,6 +1,6 @@
package io.onedev.server.model.support.widget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public interface TabStateSupport<T extends TabState> extends Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index cda42711d9..519a4961d0 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -20,7 +20,7 @@ import org.apache.shiro.authz.Permission;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index 3e373058d9..d660d5e008 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -21,7 +21,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/notification/NotificationUtils.java b/server-core/src/main/java/io/onedev/server/notification/NotificationUtils.java
index e7b813ea68..ff9a13fdd1 100644
--- a/server-core/src/main/java/io/onedev/server/notification/NotificationUtils.java
+++ b/server-core/src/main/java/io/onedev/server/notification/NotificationUtils.java
@@ -13,7 +13,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import org.unbescape.html.HtmlEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java
index 1c044bc110..52cb241455 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java
@@ -17,7 +17,7 @@ import org.apache.shiro.authz.Permission;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java b/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java
index ac6e86e746..d74432fb23 100644
--- a/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java
+++ b/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java
@@ -2,7 +2,7 @@ package io.onedev.server.notification;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class Unsubscribable implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/pack/PackService.java b/server-core/src/main/java/io/onedev/server/pack/PackService.java
index 4dabe5be10..6c09d64132 100644
--- a/server-core/src/main/java/io/onedev/server/pack/PackService.java
+++ b/server-core/src/main/java/io/onedev/server/pack/PackService.java
@@ -2,7 +2,7 @@ package io.onedev.server.pack;
import io.onedev.commons.loader.ExtensionPoint;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryService.java b/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryService.java
index 53a6a8c943..7fa7e35c47 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryService.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryService.java
@@ -16,7 +16,7 @@
package io.onedev.server.persistence;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.SessionFactory;
import org.hibernate.boot.Metadata;
diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionService.java b/server-core/src/main/java/io/onedev/server/persistence/SessionService.java
index f98c60af16..ed5a360135 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/SessionService.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionService.java
@@ -18,7 +18,7 @@ package io.onedev.server.persistence;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.Session;
diff --git a/server-core/src/main/java/io/onedev/server/persistence/TransactionService.java b/server-core/src/main/java/io/onedev/server/persistence/TransactionService.java
index 205ac19606..7e81b10d13 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/TransactionService.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/TransactionService.java
@@ -18,7 +18,7 @@ package io.onedev.server.persistence;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.Session;
import org.hibernate.Transaction;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java
index b88a887c50..32af18e34f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java
@@ -12,7 +12,7 @@ import io.onedev.server.util.artifact.ArtifactInfo;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.*;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
index 692c351406..f399e94d9e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.EntityNotFoundException;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index bab6141c7b..3285556651 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.Id;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index 34493a54f3..4a84affffc 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -9,7 +9,7 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
index 4a11a8f7f2..cef2c7285e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
index d41ef57cbb..5670b4778e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
index 5770127986..829535afd0 100644
--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
@@ -9,7 +9,7 @@ import io.onedev.server.model.support.BuildMetric;
import io.onedev.server.search.entity.EntityQuery;
import org.antlr.v4.runtime.*;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexService.java b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexService.java
index 7b42f2c98f..d1a583e1ea 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/CodeIndexService.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeIndexService.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.code;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchService.java b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchService.java
index f148009c9f..9eba4e915f 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchService.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchService.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.code;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java
index 0e10f6196a..c0c42833e1 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java
@@ -17,7 +17,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
index 5e69ec7634..53e0482a77 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.code.hit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
index b1724a1b11..c2dc5404dc 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.code.hit;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
index ae0e9d5c63..822013e8c7 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.code.hit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
index ef550f61fc..dbcfcfc548 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
@@ -8,7 +8,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
index 35f8413db1..c64ffb1baa 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
@@ -8,7 +8,7 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.treewalk.TreeWalk;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public class FileQuery extends BlobQuery {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
index 2660fa3898..c21e9e0a21 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
@@ -11,7 +11,7 @@ import org.apache.lucene.search.WildcardQuery;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.Model;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Optional;
import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
index 291652f5be..983d283fb0 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
@@ -11,7 +11,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.treewalk.TreeWalk;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public class SymbolQuery extends BlobQuery {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
index d5ad4caa7d..462767afaf 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
@@ -11,7 +11,7 @@ import org.apache.lucene.search.WildcardQuery;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.Model;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
index ebbe9ae7bf..dc4ef40b49 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
@@ -8,7 +8,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.treewalk.TreeWalk;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
index 1dab6a6f56..0c5a143830 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.ObjectLoader;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
index 264798df78..aff8900b44 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class LeafLiterals implements Literals {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
index 84db404dc2..a04c3e1dca 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
index d9efd0b29b..3278ad870d 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class LiteralVisitor extends PCREBaseVisitor<Literals> {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
index 3bf8d793df..6ef765737a 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
@@ -11,7 +11,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/Revision.java b/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
index 2eb468022b..63800d8219 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
@@ -11,7 +11,7 @@ import static io.onedev.server.search.commit.CommitQueryLexer.UNTIL;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.revwalk.RevCommit;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 839d00f39f..98d1794c0a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -7,7 +7,7 @@ import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.Path;
import javax.validation.ValidationException;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
index 7f1cbc2be7..c45ece32fb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
index 78b500e374..37200894df 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
@@ -19,7 +19,7 @@ import static io.onedev.server.search.entity.agent.AgentQueryParser.Paused;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
index b513fb749f..d879e40301 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
index c915748ed7..6c100d547f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
@@ -9,7 +9,7 @@ import static io.onedev.server.search.entity.agent.AgentQueryLexer.EverUsedSince
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
index 5912ff4fee..0cb1488cd6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.agent;
import static io.onedev.server.search.entity.agent.AgentQueryLexer.Is;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
index 1c64da04c4..98ac204530 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
index 4876cf00c9..49f7be638b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
index 91285ad10e..0fc72fdcb9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
index 1ac5456699..e28c7cd24b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
index dbb32b7e17..ae3ee21895 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
@@ -8,7 +8,7 @@ import static io.onedev.server.search.entity.agent.AgentQueryLexer.NotUsedSince;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
index 7623a20a94..29db8ef36a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
index ef4c1b8074..95f56acdb9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.agent;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
index 10f80ba84f..d2b20e3f11 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
index bb434714c1..a6b2218464 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
index 32240e3e63..c9681cf5b3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
index ee9476c6cc..4268c0f37f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
index 7f2db257a5..7e0eb0e3d3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.agent;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
index e523c94f03..e60293c96e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
index 86e44f8a27..84173c79fe 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 5a7abfde6b..54bd609db6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -41,7 +41,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
index 610566d640..322cde55f9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
index b07673eb15..9bf9bb4d65 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
index 275d55feb0..4bfe0dd927 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index e5d906a293..71dceca057 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
index c9e0f43bdd..5ed1774b1f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
index ee2005c26e..6070f34a1d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index b59469d560..d3e7846ac7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index e17553e452..983bb99c7d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
index f493238aec..681e231716 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 008ea56d3a..27003afe65 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
index f2382c5893..1735eef5be 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 89530de2eb..06705be722 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
index 18387ed760..e195714ffb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
index c20748a7be..f245c3fd78 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
index 49c0b5b8ac..5081310498 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
index e79480fcd9..abe1da6755 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
index ab80151e78..05abb98581 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
index 77d287ffaa..2200d4192f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
index b5f4c434e9..058bd72de7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
index a60f273aca..4cbb71793a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
index de89431f8c..8cee0a0196 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
index e932101756..538563de68 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index 541baccea4..f60016a136 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 3ed08cb1f9..bce19b7743 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index 64c4138ed8..a6667995ad 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
index d5a43397df..db74cd1be8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index f804088270..41e1d037db 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java
index e11c366f78..d57b76cea5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
index 0749baeb62..1dd89ca8a7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
index 0bff625412..5316ba56ad 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
index 1e58aca83a..34c1ddcb71 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
index 0ef0bf3c1a..1b74bb8ad7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index cb08355ae8..3c007bc919 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
index 7896890763..89ea412200 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
index 0c062d2f56..7cf20c022f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index e708a98720..da946ec3e8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index 73ce576c5a..30dc589171 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index e465222fc2..acba541b22 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index a4cbd56c52..de02445986 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java
index 7e09121155..52c33d938f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
index ba39e48870..3da54420ad 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
index ea2ef06647..54035d328b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
index 62f0448cee..14860d56f6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
index aa966cb68a..4e52ab7587 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
index ca8ca4e141..e79a27e9e2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index 037b8bc4d3..2fb7444314 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
index ead7409b42..e03a3c19ea 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
index 8c74085318..e375551c0e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index aa5cf94c7d..d47471eafb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index 59e0205375..3934d26e4b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -5,7 +5,7 @@ import static io.onedev.commons.utils.match.WildcardUtils.matchString;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
index 1f313b172a..ba0ec3ae72 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
index 57415d3975..1ef3874067 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.codecomment;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
index ddd93d0aca..a4aab5424a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index e292435207..05d1d4652d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index d7c58d9ad5..8ca535748d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -5,7 +5,7 @@ import static io.onedev.commons.utils.match.WildcardUtils.matchString;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
index 1d79e5dc42..5df3e68999 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
index e5f0a4abcb..29706577bf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
index ada835ca1f..a8fd8a6a74 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
index adbf608c2d..266120b32d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
index 3ec320eaf7..cbd539ff34 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
index bf72302ba8..e9737ca8aa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index 13dbf4024e..0b1947074b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
index d34a4a95f7..d648b89222 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
import static io.onedev.server.model.Issue.PROP_TOTAL_ESTIMATED_TIME;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
index 0be4b9dced..a08da5f19c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index 2a0c52975e..6567ec2e4f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 19d23cfd04..06024f7274 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -6,7 +6,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
index 05ef8c50aa..874b00cd2f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
index 5c8a4c7acc..227d4a431f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
index a7c30d2512..e665fe4484 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
index 9585936528..6c261fe063 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
index 06704f8599..8f0e0504bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
index 41fa5db70a..01de00dcc2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
index c9b31b6193..f857d10633 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
index 3e4c597bef..5cd06db048 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
index 086375f977..ccca94796b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
index c45e8b2362..a67674d392 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
index 81b00cc6c4..d676c02817 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
index 9734e48c8b..6c3eee80b9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index a2e6135429..10d95706cf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -56,7 +56,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryUpdater.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryUpdater.java
index 4572008c30..8b3daab925 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryUpdater.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryUpdater.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
index 3b4e2a84f7..cbd4a2cc84 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
index aeafc0a9c3..2d19538443 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
index c94615bd6c..f603272276 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
index 749a2a3993..93069b2117 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
@@ -9,7 +9,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
index adc5263ed5..3d4580dc60 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
index 799a5887ee..920b6180e5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
index 638ee3cffd..dc642f3038 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.model.Issue.NAME_PROGRESS;
import static io.onedev.server.model.Issue.PROP_PROGRESS;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
index 0ccee58c34..503940a7ba 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
index be7f238317..444ffec7b2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
index 39c60d32ca..740cd71394 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
index 274b6cef17..e8e6955105 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
index 0b536a10db..e9a631b84c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
index b1702cff90..3b77f84bf3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
index 5de1db0ab8..5fcb6ca118 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
import static io.onedev.server.model.Issue.PROP_TOTAL_SPENT_TIME;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 7b39b369f5..04ea78fa9a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 4c725d4929..2207103ada 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index a5c84c3ade..8e8e4fb402 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java
index 9451f9560e..7684750e79 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
index 88ea616852..59666463b5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
index 304b72f0a4..44208fd095 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
index 4500c78854..6e1834f277 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index 6b1736e68b..b6fd9ac5ed 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index 0cefac36fd..39836b94e7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
index 662b7e8a20..fa4569f6ec 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
index f2cd5e317e..ba837c39eb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.issue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
index 647adb1716..660d0974ea 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
index c3465867b6..5a48a9dc9f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
index e3bb8428ea..71ec67e360 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pack;
import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
index d19431d82a..76548a7dde 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
@@ -19,7 +19,7 @@ import static io.onedev.server.search.entity.pack.PackQueryParser.PublishedByMe;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
index f21af4d6a5..7dda313dc6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
index b5186d1823..35105fd00f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pack;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
index dc23b55551..0917b083b2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pack;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
index fbafcbea48..0387648219 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pack;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
index 58d272b915..21570a34fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
index ce3c4bb65c..f332e8cee9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
index 8eb093789a..32fc51ae81 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
index 213d0e5fd7..14682b7393 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pack;
import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
index 9548eed610..87e02751de 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
index 71f13d6be8..20be3624e9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
index d23c9c5b43..e0100ca67a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
index 9357a58b76..d2158edead 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
index cf4005d1ce..8859b27b5f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
@@ -5,7 +5,7 @@ import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
index 2e6404ac14..9ad9d8a733 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
index 88d11aa094..07e58f079b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
index 206de7bf76..99e25549ba 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
index ea90500919..b3152c9a03 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
index 1433816941..1137b70225 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.project;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
index 27d17b8568..14c2b50827 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
index eb1404fa40..978a0c358a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index 8ba5e9d3e0..8897a0c27c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
index 26a2b5f79d..a635fb5581 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
index e784d54a73..84114db5e5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
index 9b100e5125..b2c4e2158d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.project;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java
index 457f7c536e..439bf6949b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
index 43518be817..cfa6a1bd47 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index c2aaafcd5e..df5503c13b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -22,7 +22,7 @@ import static io.onedev.server.search.entity.project.ProjectQueryParser.WithoutE
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
index 52ece313f0..708da602b4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
index 0e9ffcf27d..906f7374c2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
index 6e6087d483..2295774454 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index fd65efa2fb..1531b5dfc0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index 133da236fa..f00df0d42d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java
index 25ea98e080..b63eadb65d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
index c9a1c1c82d..4cf9dac8b3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index f6bc47d205..36108ff65b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java
index e930e767a6..2d7cb00f1b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 06a96ff4cb..e135778eec 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index 65c8c9ca6c..e4e102bfd1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index f502d40bb5..c3382f4072 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -5,7 +5,7 @@ import static io.onedev.commons.utils.match.WildcardUtils.matchString;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
index 1fb7cc8e92..cfa9b4d837 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
index 3d87f4dafa..974a80b90e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
index 218c9deff8..9f7c2d9792 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index 95da0f468e..3c2458a20f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index 023e09dea9..1cc3a79ccb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
index a91fab091d..2ed4cb26c8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
index 6edf9683bc..52066a4c09 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index 2017a90a27..835c6622fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index 0f07b01927..3d446b32fb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
index d94da6d423..c4f124b64b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
index eb1898afbb..f76a0fbae5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
index dfa158e299..5b11364d7d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
index afb033166d..4b1770ddc3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
index 4bdbeec062..5e64d75c06 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredBy;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index ec377a811d..d348c12512 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index a5fb277a46..d6c8421f05 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Collection;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
index 87b1e03f71..f0694af671 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
index d34c5c3ed1..e9a181a52a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
index 685f822911..002a8c3237 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
index 322f520818..11ed1bf388 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index d3baa592f9..6e0dcf3e5b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index 8ffe958f32..c92ff2597e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
index d76daad2ca..12c0ef4849 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
index 654ed6599d..903c84661f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index 2f2b98fc11..559e0b1e1d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 076d747627..1417d66e35 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -49,7 +49,7 @@ import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
index 05f61dd1e9..cbbd992ba0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
index 931a798d7b..8db5f34dbf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index 7c0ccf2ce7..9d3109b5d3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
index 4e92a2464f..2005db0d7b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
index c6808fff60..40a1352254 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
index b61ba3b379..e8f2e05625 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index b29823df02..a714105eec 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index 7b7d86ed99..953aeae9b5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index 28c94361ba..a4f2db1ca9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index a2417b4c57..2b7723615e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 90d23cd943..0e8c7c44d5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index d1078976f3..c41e51098a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java
index 6b53ddd5e3..dae269d5bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
index 017e040b09..1551b98451 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index 8fc4bf919c..5825d3b3d0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
index 83deebbbfd..cfcaf40f01 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
index c521c52766..bd70730f0a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
index b5b8a180fd..220e52c679 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 0f503c69e2..6fbda84e8a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
index 08d6b45db1..50df9dc457 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
index 49ef191adc..b6664e4dde 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
index 99d336cff1..ff1cc530d6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
index 1abc6db995..d57cdc8f67 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index 2e0ca215ed..7c98dd7ddd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
index 2f8e202a91..45909e7843 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
index 232a8e6968..185df03faf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
index 1dba305c37..c5e6a765fa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedBy;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextService.java
index 261ad7bf02..f942ddd9e0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextService.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entitytext;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Project;
import io.onedev.server.model.CodeComment;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java
index f2b0398903..29b58f7def 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java
@@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java
index ea4554e466..5bcd51d3a7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java
@@ -15,7 +15,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java
index 092c899b10..8cb9ed0224 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java
index 411e52eb31..35de12ea17 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import org.apache.lucene.analysis.Analyzer;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextService.java
index eefd47a486..2910fdba01 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextService.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entitytext;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Issue;
import io.onedev.server.util.ProjectScope;
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextService.java
index 4eedaa412f..949521ef02 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextService.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextService.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.entitytext;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 5daeeeab69..3aad5c2d4a 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -9,7 +9,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java b/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
index 83085455a5..5c4b6bcee9 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/BasePermission.java
@@ -3,7 +3,7 @@ package io.onedev.server.security.permission;
import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface BasePermission extends Permission {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
index 76e148c7ce..7c374a9ff8 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
@@ -3,7 +3,7 @@ package io.onedev.server.security.permission;
import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
public class EditIssueField implements BasePermission {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
index 300daa0eeb..e41b2c8d84 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
@@ -4,7 +4,7 @@ import io.onedev.server.model.LinkSpec;
import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class EditIssueLink implements BasePermission {
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
index c624856015..c01b71860c 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
@@ -6,7 +6,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/AccessTokenService.java b/server-core/src/main/java/io/onedev/server/service/AccessTokenService.java
index 2607a1f401..355f1d399c 100644
--- a/server-core/src/main/java/io/onedev/server/service/AccessTokenService.java
+++ b/server-core/src/main/java/io/onedev/server/service/AccessTokenService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import io.onedev.server.model.AccessToken;
import io.onedev.server.model.User;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface AccessTokenService extends EntityService<AccessToken> {
diff --git a/server-core/src/main/java/io/onedev/server/service/AgentService.java b/server-core/src/main/java/io/onedev/server/service/AgentService.java
index eebb552984..f3dce65bc9 100644
--- a/server-core/src/main/java/io/onedev/server/service/AgentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/AgentService.java
@@ -7,7 +7,7 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.criteria.Criteria;
import org.eclipse.jetty.websocket.api.Session;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/service/AgentTokenService.java b/server-core/src/main/java/io/onedev/server/service/AgentTokenService.java
index 784dfaedf0..3a8bd7aadb 100644
--- a/server-core/src/main/java/io/onedev/server/service/AgentTokenService.java
+++ b/server-core/src/main/java/io/onedev/server/service/AgentTokenService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import io.onedev.server.model.AgentToken;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public interface AgentTokenService extends EntityService<AgentToken> {
diff --git a/server-core/src/main/java/io/onedev/server/service/AlertService.java b/server-core/src/main/java/io/onedev/server/service/AlertService.java
index 6e59f5e236..e0efcd02db 100644
--- a/server-core/src/main/java/io/onedev/server/service/AlertService.java
+++ b/server-core/src/main/java/io/onedev/server/service/AlertService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import io.onedev.server.model.Alert;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface AlertService extends EntityService<Alert> {
diff --git a/server-core/src/main/java/io/onedev/server/service/AuditService.java b/server-core/src/main/java/io/onedev/server/service/AuditService.java
index 83ae1d2ed8..26dadbc13d 100644
--- a/server-core/src/main/java/io/onedev/server/service/AuditService.java
+++ b/server-core/src/main/java/io/onedev/server/service/AuditService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.service.support.AuditQuery;
import io.onedev.server.model.Audit;
diff --git a/server-core/src/main/java/io/onedev/server/service/BuildMetricService.java b/server-core/src/main/java/io/onedev/server/service/BuildMetricService.java
index 0c0539c4ff..a8e1e45e0f 100644
--- a/server-core/src/main/java/io/onedev/server/service/BuildMetricService.java
+++ b/server-core/src/main/java/io/onedev/server/service/BuildMetricService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
diff --git a/server-core/src/main/java/io/onedev/server/service/BuildParamService.java b/server-core/src/main/java/io/onedev/server/service/BuildParamService.java
index 476435e5c5..236122ff08 100644
--- a/server-core/src/main/java/io/onedev/server/service/BuildParamService.java
+++ b/server-core/src/main/java/io/onedev/server/service/BuildParamService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/service/BuildService.java b/server-core/src/main/java/io/onedev/server/service/BuildService.java
index 2079b4ab37..e9c9cd11c3 100644
--- a/server-core/src/main/java/io/onedev/server/service/BuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/BuildService.java
@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.subject.Subject;
@@ -38,9 +38,9 @@ public interface BuildService extends EntityService<Build> {
Build findLastFinished(Project project, String jobName, @Nullable String refName);
@Nullable
- Build findStreamPrevious(Build build, @Nullable Build.Status status);
+ Build findStreamPrevious(Build build, Build.@Nullable Status status);
- Collection<Long> queryStreamPreviousNumbers(Build build, @Nullable Build.Status status, int limit);
+ Collection<Long> queryStreamPreviousNumbers(Build build, Build.@Nullable Status status, int limit);
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
@Nullable String refName, @Nullable Optional<PullRequest> request,
@@ -94,7 +94,7 @@ public interface BuildService extends EntityService<Build> {
void delete(Collection<Build> builds);
- Collection<Build> query(Agent agent, @Nullable Build.Status status);
+ Collection<Build> query(Agent agent, Build.@Nullable Status status);
List<ProjectBuildStatusStat> queryStatusStats(Collection<Project> projects);
diff --git a/server-core/src/main/java/io/onedev/server/service/CodeCommentService.java b/server-core/src/main/java/io/onedev/server/service/CodeCommentService.java
index 04dfd22622..f9a8ce3d34 100644
--- a/server-core/src/main/java/io/onedev/server/service/CodeCommentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/CodeCommentService.java
@@ -5,7 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/service/CodeCommentStatusChangeService.java b/server-core/src/main/java/io/onedev/server/service/CodeCommentStatusChangeService.java
index 78b0dddde1..aee70cb3e6 100644
--- a/server-core/src/main/java/io/onedev/server/service/CodeCommentStatusChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/service/CodeCommentStatusChangeService.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/service/DashboardService.java b/server-core/src/main/java/io/onedev/server/service/DashboardService.java
index 79cafa133e..13e66b4aba 100644
--- a/server-core/src/main/java/io/onedev/server/service/DashboardService.java
+++ b/server-core/src/main/java/io/onedev/server/service/DashboardService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import io.onedev.server.model.Dashboard;
import io.onedev.server.model.User;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java b/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java
index e2c5e122a1..01959bcb2c 100644
--- a/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java
+++ b/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java
@@ -1,6 +1,6 @@
package io.onedev.server.service;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/service/GpgKeyService.java b/server-core/src/main/java/io/onedev/server/service/GpgKeyService.java
index 5a3c1034d6..4667125273 100644
--- a/server-core/src/main/java/io/onedev/server/service/GpgKeyService.java
+++ b/server-core/src/main/java/io/onedev/server/service/GpgKeyService.java
@@ -1,6 +1,6 @@
package io.onedev.server.service;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.git.signatureverification.gpg.GpgSigningKey;
import io.onedev.server.model.GpgKey;
diff --git a/server-core/src/main/java/io/onedev/server/service/GroupService.java b/server-core/src/main/java/io/onedev/server/service/GroupService.java
index c9952ea063..1dc127c41a 100644
--- a/server-core/src/main/java/io/onedev/server/service/GroupService.java
+++ b/server-core/src/main/java/io/onedev/server/service/GroupService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Group;
diff --git a/server-core/src/main/java/io/onedev/server/service/IssueChangeService.java b/server-core/src/main/java/io/onedev/server/service/IssueChangeService.java
index c97ab5d3a7..73f461ef9b 100644
--- a/server-core/src/main/java/io/onedev/server/service/IssueChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/service/IssueChangeService.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
diff --git a/server-core/src/main/java/io/onedev/server/service/IssueService.java b/server-core/src/main/java/io/onedev/server/service/IssueService.java
index 5028907fe9..51b8df626d 100644
--- a/server-core/src/main/java/io/onedev/server/service/IssueService.java
+++ b/server-core/src/main/java/io/onedev/server/service/IssueService.java
@@ -5,7 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/service/IssueWatchService.java b/server-core/src/main/java/io/onedev/server/service/IssueWatchService.java
index 803b9fc8b4..5cf7662b05 100644
--- a/server-core/src/main/java/io/onedev/server/service/IssueWatchService.java
+++ b/server-core/src/main/java/io/onedev/server/service/IssueWatchService.java
@@ -5,7 +5,7 @@ import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
import io.onedev.server.util.watch.WatchStatus;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
public interface IssueWatchService extends EntityService<IssueWatch> {
diff --git a/server-core/src/main/java/io/onedev/server/service/IssueWorkService.java b/server-core/src/main/java/io/onedev/server/service/IssueWorkService.java
index cb5c186876..efd8a9e983 100644
--- a/server-core/src/main/java/io/onedev/server/service/IssueWorkService.java
+++ b/server-core/src/main/java/io/onedev/server/service/IssueWorkService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.shiro.subject.Subject;
diff --git a/server-core/src/main/java/io/onedev/server/service/IterationService.java b/server-core/src/main/java/io/onedev/server/service/IterationService.java
index 992abfbbf2..7dea70cfee 100644
--- a/server-core/src/main/java/io/onedev/server/service/IterationService.java
+++ b/server-core/src/main/java/io/onedev/server/service/IterationService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface IterationService extends EntityService<Iteration> {
diff --git a/server-core/src/main/java/io/onedev/server/service/JobCacheService.java b/server-core/src/main/java/io/onedev/server/service/JobCacheService.java
index b496a1ce47..8715bfe63f 100644
--- a/server-core/src/main/java/io/onedev/server/service/JobCacheService.java
+++ b/server-core/src/main/java/io/onedev/server/service/JobCacheService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import io.onedev.server.model.JobCache;
import org.apache.commons.lang3.tuple.Pair;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/service/LabelSpecService.java b/server-core/src/main/java/io/onedev/server/service/LabelSpecService.java
index 5761c99bd2..dc9fbb5516 100644
--- a/server-core/src/main/java/io/onedev/server/service/LabelSpecService.java
+++ b/server-core/src/main/java/io/onedev/server/service/LabelSpecService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import io.onedev.server.model.LabelSpec;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public interface LabelSpecService extends EntityService<LabelSpec> {
diff --git a/server-core/src/main/java/io/onedev/server/service/LinkSpecService.java b/server-core/src/main/java/io/onedev/server/service/LinkSpecService.java
index c1457cae8c..046917d14c 100644
--- a/server-core/src/main/java/io/onedev/server/service/LinkSpecService.java
+++ b/server-core/src/main/java/io/onedev/server/service/LinkSpecService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import io.onedev.server.model.LinkSpec;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public interface LinkSpecService extends EntityService<LinkSpec> {
diff --git a/server-core/src/main/java/io/onedev/server/service/PackBlobService.java b/server-core/src/main/java/io/onedev/server/service/PackBlobService.java
index 2855697536..c814292388 100644
--- a/server-core/src/main/java/io/onedev/server/service/PackBlobService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PackBlobService.java
@@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.NoDBAccess;
import io.onedev.server.model.Pack;
diff --git a/server-core/src/main/java/io/onedev/server/service/PackService.java b/server-core/src/main/java/io/onedev/server/service/PackService.java
index a998690056..e08b1f0f65 100644
--- a/server-core/src/main/java/io/onedev/server/service/PackService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PackService.java
@@ -5,7 +5,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.shiro.subject.Subject;
diff --git a/server-core/src/main/java/io/onedev/server/service/PendingSuggestionApplyService.java b/server-core/src/main/java/io/onedev/server/service/PendingSuggestionApplyService.java
index 35684851a3..206a0c10b2 100644
--- a/server-core/src/main/java/io/onedev/server/service/PendingSuggestionApplyService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PendingSuggestionApplyService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/service/ProjectService.java b/server-core/src/main/java/io/onedev/server/service/ProjectService.java
index d7823911cb..d01447d863 100644
--- a/server-core/src/main/java/io/onedev/server/service/ProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/ProjectService.java
@@ -8,7 +8,7 @@ import java.util.Set;
import java.util.concurrent.Future;
import java.util.function.Consumer;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java
index cbf57a97bc..03d09b2c56 100644
--- a/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestChangeService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestReviewService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestReviewService.java
index e785c99962..b00a8cc27b 100644
--- a/server-core/src/main/java/io/onedev/server/service/PullRequestReviewService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestReviewService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
index af2ca00f37..611d038908 100644
--- a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
@@ -5,7 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.subject.Subject;
diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestWatchService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestWatchService.java
index 0f23b971de..f6763febbd 100644
--- a/server-core/src/main/java/io/onedev/server/service/PullRequestWatchService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestWatchService.java
@@ -1,6 +1,6 @@
package io.onedev.server.service;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestWatch;
diff --git a/server-core/src/main/java/io/onedev/server/service/RoleService.java b/server-core/src/main/java/io/onedev/server/service/RoleService.java
index 2ac57d7ce3..ec04db80b1 100644
--- a/server-core/src/main/java/io/onedev/server/service/RoleService.java
+++ b/server-core/src/main/java/io/onedev/server/service/RoleService.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
diff --git a/server-core/src/main/java/io/onedev/server/service/SettingService.java b/server-core/src/main/java/io/onedev/server/service/SettingService.java
index f8456e534f..d832a5a286 100644
--- a/server-core/src/main/java/io/onedev/server/service/SettingService.java
+++ b/server-core/src/main/java/io/onedev/server/service/SettingService.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.NoDBAccess;
import io.onedev.server.model.Setting;
diff --git a/server-core/src/main/java/io/onedev/server/service/SshKeyService.java b/server-core/src/main/java/io/onedev/server/service/SshKeyService.java
index 1824dc435c..957a0217d6 100644
--- a/server-core/src/main/java/io/onedev/server/service/SshKeyService.java
+++ b/server-core/src/main/java/io/onedev/server/service/SshKeyService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/service/SsoAccountService.java b/server-core/src/main/java/io/onedev/server/service/SsoAccountService.java
index df387a3bca..a0ebe33446 100644
--- a/server-core/src/main/java/io/onedev/server/service/SsoAccountService.java
+++ b/server-core/src/main/java/io/onedev/server/service/SsoAccountService.java
@@ -1,6 +1,6 @@
package io.onedev.server.service;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.SsoAccount;
import io.onedev.server.model.SsoProvider;
diff --git a/server-core/src/main/java/io/onedev/server/service/SsoProviderService.java b/server-core/src/main/java/io/onedev/server/service/SsoProviderService.java
index 70c8971229..baca61b47b 100644
--- a/server-core/src/main/java/io/onedev/server/service/SsoProviderService.java
+++ b/server-core/src/main/java/io/onedev/server/service/SsoProviderService.java
@@ -1,6 +1,6 @@
package io.onedev.server.service;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.SsoProvider;
diff --git a/server-core/src/main/java/io/onedev/server/service/StopwatchService.java b/server-core/src/main/java/io/onedev/server/service/StopwatchService.java
index 8ad0c7bc01..6fcfa0a3da 100644
--- a/server-core/src/main/java/io/onedev/server/service/StopwatchService.java
+++ b/server-core/src/main/java/io/onedev/server/service/StopwatchService.java
@@ -4,7 +4,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Stopwatch;
import io.onedev.server.model.User;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface StopwatchService extends EntityService<Stopwatch> {
diff --git a/server-core/src/main/java/io/onedev/server/service/UserInvitationService.java b/server-core/src/main/java/io/onedev/server/service/UserInvitationService.java
index 8513b11b68..5c221077f3 100644
--- a/server-core/src/main/java/io/onedev/server/service/UserInvitationService.java
+++ b/server-core/src/main/java/io/onedev/server/service/UserInvitationService.java
@@ -2,7 +2,7 @@ package io.onedev.server.service;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.UserInvitation;
diff --git a/server-core/src/main/java/io/onedev/server/service/UserService.java b/server-core/src/main/java/io/onedev/server/service/UserService.java
index 9eb02143cc..62aba503d5 100644
--- a/server-core/src/main/java/io/onedev/server/service/UserService.java
+++ b/server-core/src/main/java/io/onedev/server/service/UserService.java
@@ -3,7 +3,7 @@ package io.onedev.server.service;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.User;
import io.onedev.server.util.facade.UserCache;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
index 9f18f98aa4..eac22300fd 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
@@ -16,7 +16,7 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java
index 79079306d6..bd270b106b 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.EntityManagerFactory;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java
index cb2c2be8e5..d821da626a 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
index 1b2123db42..0a36eb7452 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
@@ -39,7 +39,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
index f4647995a4..36307d46bb 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java
index b5e81d1707..e314821072 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java
@@ -4,7 +4,7 @@ import static org.hibernate.criterion.Restrictions.eq;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java
index b9316699cd..730c7c4b82 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java
@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
index 190197e494..d1a0a3edc1 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
@@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultJobCacheService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultJobCacheService.java
index 362c11dee3..9854baa4c0 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultJobCacheService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultJobCacheService.java
@@ -26,7 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
index 15b7e5ba60..a654e68ee1 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
index 69086bbff8..19b60d8612 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
@@ -58,7 +58,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.locks.Lock;
import java.util.function.Consumer;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java
index 6a21281436..edbe08f9d0 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java
@@ -5,7 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index c0fa0f8935..97a3d997f8 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -32,7 +32,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java
index 353acd894f..4b196d40ff 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java
index 857c27e88e..7891072296 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java
@@ -13,7 +13,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.Validator;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java
index 9ad0827a06..a3205a7ede 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/server-core/src/main/java/io/onedev/server/service/support/AuditQuery.java b/server-core/src/main/java/io/onedev/server/service/support/AuditQuery.java
index cc80267ccd..c910c6f564 100644
--- a/server-core/src/main/java/io/onedev/server/service/support/AuditQuery.java
+++ b/server-core/src/main/java/io/onedev/server/service/support/AuditQuery.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.User;
diff --git a/server-core/src/main/java/io/onedev/server/ssh/CommandCreator.java b/server-core/src/main/java/io/onedev/server/ssh/CommandCreator.java
index b564d954d9..3ac330669f 100644
--- a/server-core/src/main/java/io/onedev/server/ssh/CommandCreator.java
+++ b/server-core/src/main/java/io/onedev/server/ssh/CommandCreator.java
@@ -2,7 +2,7 @@ package io.onedev.server.ssh;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.sshd.server.command.Command;
diff --git a/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java b/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java
index fd383936eb..adfe1eb247 100644
--- a/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java
+++ b/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java
@@ -1,6 +1,6 @@
package io.onedev.server.updatecheck;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Singleton;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/updatecheck/UpdateCheckService.java b/server-core/src/main/java/io/onedev/server/updatecheck/UpdateCheckService.java
index 09e54b6bfc..86c0cc553f 100644
--- a/server-core/src/main/java/io/onedev/server/updatecheck/UpdateCheckService.java
+++ b/server-core/src/main/java/io/onedev/server/updatecheck/UpdateCheckService.java
@@ -1,6 +1,6 @@
package io.onedev.server.updatecheck;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface UpdateCheckService {
diff --git a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
index 88778e9762..9dd449454c 100644
--- a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
@@ -4,7 +4,7 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.WordUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java b/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java
index 58eb34189c..fc7e95dc12 100644
--- a/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java
+++ b/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java
@@ -1,6 +1,6 @@
package io.onedev.server.util;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java
index 6b26a11ce6..3e83f7a7f6 100644
--- a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java
+++ b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java
@@ -3,7 +3,7 @@ package io.onedev.server.util;
import java.io.Serializable;
import java.util.Stack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
diff --git a/server-core/src/main/java/io/onedev/server/util/ContentDetector.java b/server-core/src/main/java/io/onedev/server/util/ContentDetector.java
index bf3995bb74..7c41490ba5 100644
--- a/server-core/src/main/java/io/onedev/server/util/ContentDetector.java
+++ b/server-core/src/main/java/io/onedev/server/util/ContentDetector.java
@@ -4,7 +4,7 @@ import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/DateUtils.java
index e301927397..969ad6eee5 100644
--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/DateUtils.java
@@ -11,7 +11,7 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Application;
import org.joda.time.format.ISODateTimeFormat;
diff --git a/server-core/src/main/java/io/onedev/server/util/EditContext.java b/server-core/src/main/java/io/onedev/server/util/EditContext.java
index 59658fd43f..c2ca3f22ed 100644
--- a/server-core/src/main/java/io/onedev/server/util/EditContext.java
+++ b/server-core/src/main/java/io/onedev/server/util/EditContext.java
@@ -5,7 +5,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Stack;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.util.WicketUtils;
diff --git a/server-core/src/main/java/io/onedev/server/util/FileExtension.java b/server-core/src/main/java/io/onedev/server/util/FileExtension.java
index c95842ecdf..e050fe0e6c 100644
--- a/server-core/src/main/java/io/onedev/server/util/FileExtension.java
+++ b/server-core/src/main/java/io/onedev/server/util/FileExtension.java
@@ -1,6 +1,6 @@
package io.onedev.server.util;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class FileExtension {
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java b/server-core/src/main/java/io/onedev/server/util/HttpUtils.java
index 44b00d7cde..b621b5687e 100644
--- a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/HttpUtils.java
@@ -2,7 +2,7 @@ package io.onedev.server.util;
import org.apache.commons.codec.binary.Base64;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
diff --git a/server-core/src/main/java/io/onedev/server/util/IssueTimes.java b/server-core/src/main/java/io/onedev/server/util/IssueTimes.java
index 3340a62c89..376d89dbd0 100644
--- a/server-core/src/main/java/io/onedev/server/util/IssueTimes.java
+++ b/server-core/src/main/java/io/onedev/server/util/IssueTimes.java
@@ -1,6 +1,6 @@
package io.onedev.server.util;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public class IssueTimes implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
index 547232b848..4c859da4ef 100644
--- a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
@@ -5,7 +5,7 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
diff --git a/server-core/src/main/java/io/onedev/server/util/ManualConfigStep.java b/server-core/src/main/java/io/onedev/server/util/ManualConfigStep.java
index 4dc89f85ed..975856d8b3 100644
--- a/server-core/src/main/java/io/onedev/server/util/ManualConfigStep.java
+++ b/server-core/src/main/java/io/onedev/server/util/ManualConfigStep.java
@@ -2,7 +2,7 @@ package io.onedev.server.util;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.html.form.FormComponent;
diff --git a/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
index 392fff96a4..975e838960 100644
--- a/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
+++ b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
@@ -2,7 +2,7 @@ package io.onedev.server.util;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/util/Pair.java b/server-core/src/main/java/io/onedev/server/util/Pair.java
index 466f952e45..78488b2df4 100644
--- a/server-core/src/main/java/io/onedev/server/util/Pair.java
+++ b/server-core/src/main/java/io/onedev/server/util/Pair.java
@@ -8,7 +8,7 @@ import java.util.Map;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class Pair<L, R> implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/Path.java b/server-core/src/main/java/io/onedev/server/util/Path.java
index b346a2d773..a0ae85f973 100644
--- a/server-core/src/main/java/io/onedev/server/util/Path.java
+++ b/server-core/src/main/java/io/onedev/server/util/Path.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.collect.Lists;
diff --git a/server-core/src/main/java/io/onedev/server/util/ProgrammingLanguageDetector.java b/server-core/src/main/java/io/onedev/server/util/ProgrammingLanguageDetector.java
index 2c0f89230f..1148ac4d65 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProgrammingLanguageDetector.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProgrammingLanguageDetector.java
@@ -3,7 +3,7 @@ package io.onedev.server.util;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class ProgrammingLanguageDetector {
private static final Map<String, String> PROGRAMMING_LANGUAGES = new HashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java
index 4e947e6495..c4013b653d 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java
@@ -2,7 +2,7 @@ package io.onedev.server.util;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
index f740b66456..94e73767dc 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
import java.util.Stack;
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedQuery.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedQuery.java
index aeebbc3ec8..0f5e0c341f 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedQuery.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedQuery.java
@@ -4,7 +4,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.service.ProjectService;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class ProjectScopedQuery {
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java
index e9667c2291..3667ce18d6 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java
@@ -7,7 +7,7 @@ import io.onedev.server.model.Project;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public class ProjectScopedRevision implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/ReflectionUtils.java b/server-core/src/main/java/io/onedev/server/util/ReflectionUtils.java
index 10b4f161e1..a437b9e451 100644
--- a/server-core/src/main/java/io/onedev/server/util/ReflectionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/ReflectionUtils.java
@@ -16,7 +16,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
diff --git a/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java b/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java
index c9265825f8..128fdc8677 100644
--- a/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java
+++ b/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java
@@ -3,7 +3,7 @@ package io.onedev.server.util;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.exception.ObjectNotFoundException;
diff --git a/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java b/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
index 0e38664320..b8a226613f 100644
--- a/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
+++ b/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
@@ -9,7 +9,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GroovyScript;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
/**
* Use abstract class instead of interface here as otherwise groovy can not invoke static methods defined here
diff --git a/server-core/src/main/java/io/onedev/server/util/Similarities.java b/server-core/src/main/java/io/onedev/server/util/Similarities.java
index 9058310c07..2c34b9f5d9 100644
--- a/server-core/src/main/java/io/onedev/server/util/Similarities.java
+++ b/server-core/src/main/java/io/onedev/server/util/Similarities.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class Similarities<T> extends ArrayList<T> {
diff --git a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java b/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
index add1e09fdc..a2229c3cac 100644
--- a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
+++ b/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
@@ -2,7 +2,7 @@ package io.onedev.server.util;
import io.onedev.server.model.Build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public class StatusInfo implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java
index 5a1ebc2b1a..6ad83a686c 100644
--- a/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java
+++ b/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.artifact;
import io.onedev.server.rest.annotation.Api;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java
index eb7bfa9505..8abaee9407 100644
--- a/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java
+++ b/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.artifact;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public class DirectoryInfo extends ArtifactInfo {
diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java
index a18f0fc29c..f2885f25d7 100644
--- a/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java
+++ b/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.artifact;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class FileInfo extends ArtifactInfo {
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
index 1b51166c15..847adbfe2e 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
index 6ad06e9340..cbfa9a6e1c 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
@@ -7,7 +7,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
index 458bd17ace..48aa242a05 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
index 9c693688cc..b61c1f54b1 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
index 28566fd4e6..e252cdf9b2 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffRenderer.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.diff;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
import org.unbescape.html.HtmlEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffSupport.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
index c373d96b58..e9f9d7fb8d 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.diff;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface DiffSupport extends Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java b/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
index bcf216c808..e1d610a91c 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
@@ -9,7 +9,7 @@ import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
index 6e4487b550..5884964da1 100644
--- a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
+++ b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.diff;
import java.util.function.Function;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenCache.java b/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenCache.java
index ff2649920c..be427f303f 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenCache.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.facade;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.MapProxy;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenFacade.java
index e06ec3a412..f092e1a599 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/AccessTokenFacade.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.facade;
import io.onedev.server.model.AccessToken;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Date;
public class AccessTokenFacade extends EntityFacade {
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
index ae38e98123..30b01e4522 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.facade;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java
index 578c6d9033..c071a3868a 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.facade;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class EmailAddressFacade extends EntityFacade {
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/GroupCache.java b/server-core/src/main/java/io/onedev/server/util/facade/GroupCache.java
index da6f301ae3..0fe4908180 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/GroupCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/GroupCache.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.facade;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.MapProxy;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java
index fa989eefb5..da0ba3ad8b 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.facade;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class LinkSpecFacade extends EntityFacade {
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
index 439d722afe..ac69113b4b 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.collect.Sets;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
index 5397960595..87617a9357 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.facade;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.code.GitPackConfig;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java b/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java
index 15d828795a..7cea8bfa65 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.facade;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.util.MapProxy;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java
index 133dee74ea..59feef7701 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java
@@ -7,7 +7,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.UserService;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java
index e0c1e6a64e..d1936bfc81 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.facade;
import io.onedev.server.model.User;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class UserFacade extends EntityFacade {
diff --git a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
index 813cf94465..7b83a5e9c5 100644
--- a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
+++ b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class ManualConfig implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
index 44fa919fd5..539e98241f 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
index 233197ca13..fc1a88d538 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
@@ -14,7 +14,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
index 28b3fc3a19..141b458e51 100644
--- a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
@@ -5,7 +5,7 @@ import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.DirectoryReader;
diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
index 35119786c3..d094cfda6f 100644
--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -8,7 +8,7 @@ import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;
import org.antlr.v4.runtime.*;
import org.apache.tools.ant.DirectoryScanner;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index e796307435..98b827725c 100644
--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -13,7 +13,7 @@ import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.Requireme
import org.antlr.v4.runtime.*;
import org.antlr.v4.runtime.tree.TerminalNode;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.*;
public class ReviewRequirement {
diff --git a/server-core/src/main/java/io/onedev/server/util/usage/Usage.java b/server-core/src/main/java/io/onedev/server/util/usage/Usage.java
index 44a6561dd3..8a7e4b9655 100644
--- a/server-core/src/main/java/io/onedev/server/util/usage/Usage.java
+++ b/server-core/src/main/java/io/onedev/server/util/usage/Usage.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class Usage implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
index 14399cf4d3..70891a8afc 100644
--- a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.java
index caa85ebdc7..63cbee6a9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java
@@ -5,7 +5,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpSession;
import org.apache.shiro.SecurityUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java
index 0b22cc966b..565f29de28 100644
--- a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java
+++ b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.ajaxlistener;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarService.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarService.java
index 6678115b87..afcd1f7744 100644
--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarService.java
+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarService.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.avatar;
import java.io.File;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 71eabb8565..702d990731 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 6f230d913e..36cf5f096f 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -57,7 +57,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
index 1ed3ddb882..8d784e22a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
index 671db22315..139f86f1d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.behavior.dropdown;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
index 3be9fe71b3..6f05ffff6d 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.behavior.infinitescroll;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
index 866d7a0b6f..05eeb2f089 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
@@ -8,7 +8,7 @@ import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
import org.antlr.v4.runtime.*;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
index 88ee6e97b0..eb38b02728 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.behavior.sortable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
index 9b62ce99dc..fbc1d752d2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
@@ -5,7 +5,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.imageio.ImageIO;
import javax.xml.bind.DatatypeConverter;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
index 79cd0c1941..67db41751f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
index 53c3ee33d9..3a940cd75f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java
index c021b27968..59553fd8a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java
@@ -5,7 +5,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java
index fe181bb18f..f2923892e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java
index aad65152eb..dd2de65692 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
index cd896325fb..356d8de751 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
@@ -11,7 +11,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public abstract class AffinalBranchPicker extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
index 583b0fe451..8209103e75 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.image.ExternalImage;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
index f903c33454..e49a1e8905 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.build.choice;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.Hibernate;
import org.json.JSONException;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
index 4ed28a3711..1d867a1122 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index b54cc796dd..bf34a94727 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -12,7 +12,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java
index 8b49e7eb1a..86bee792b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index cee6703f99..8ef67bc18d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -12,7 +12,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
public class BuildStatusIcon extends SpriteImage {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java
index d3aee3a75a..0d272b6f8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.chart.line;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java
index 75dfdbccdb..b40e52594d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.chart.line;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java
index 47c7cecddc..54c09daea0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.chart.line;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
index 329f5de7a0..a3f51294c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.chart.pie;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.CallbackParameter;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 8887374ef6..fd6c322bdd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 807aa30e41..2e257db7b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -8,7 +8,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
index 29bf9334e1..85b00dca81 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
@@ -7,7 +7,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.web.page.admin.ServerDetailPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java
index bf1bd22d51..4858704602 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.commandpalette;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class SuggestionContent implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
index ed3576f9df..4f984229e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 0d1c12f403..ee65193f0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -12,7 +12,7 @@ import java.util.Map;
import java.util.Stack;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
index 45a7a7cf5e..5a3a196647 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
@@ -18,7 +18,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 55ac6037a2..79f002574a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java
index a6713d2533..607d377752 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.commit.status;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface CommitStatusSupport {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
index 572c7f9cd0..1b03b084f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
index 112fc6ac06..4076f41819 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.datatable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
index 5b91979116..d07cfb5b6b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.diff;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.tika.mime.MediaType;
import org.apache.wicket.markup.html.panel.Panel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobAnnotationSupport.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobAnnotationSupport.java
index 5ad24f6f81..9b930634e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobAnnotationSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobAnnotationSupport.java
@@ -9,7 +9,7 @@ import io.onedev.server.web.util.DiffPlanarRange;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
index a5cddd1e2a..ed7213dea1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.tika.mime.MediaType;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 228b6e7ba4..50e8714431 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -14,7 +14,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffCodeCommentInfo.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffCodeCommentInfo.java
index 08eed3e5cf..a368ee3ddb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffCodeCommentInfo.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/DiffCodeCommentInfo.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.diff.blob.text;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.CodeComment;
import io.onedev.server.web.util.DiffPlanarRange;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionAnnotationSupport.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionAnnotationSupport.java
index e08a826007..97783f8859 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionAnnotationSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionAnnotationSupport.java
@@ -9,7 +9,7 @@ import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.support.Mark;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 71ebf4dd40..4ebf8870a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -18,7 +18,7 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import org.apache.commons.codec.binary.Hex;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
index 5bdef1f997..a2de982b88 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java
@@ -19,7 +19,7 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Bytes;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.UUID;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
index 0db3eaf7cc..2dda004d7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
index 983da4ba29..8e7da5d12d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
index 3bc26ea70d..1dab87e632 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.floating;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
index 25a7bf6a6e..5dfbdba61c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
index 53a9aca9f8..c5c11e0543 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.Hibernate;
import org.json.JSONException;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
index d82b9cfd09..65c2886122 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
@@ -11,7 +11,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class CreateIssuePanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index fc09e44604..a413c56a4c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -9,7 +9,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 0bc5725de0..997de0df31 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index 7ce4df65e1..1568d1ce5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import org.apache.wicket.AttributeModifier;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
index ecc4c4da90..30975e4a0d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 776b28e2fe..d6b868402d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
index 237402abf3..f8d8eb23a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
@@ -11,7 +11,7 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java
index a25ce868b2..d56a6d9eb1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java
@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class QueriedIssuesProgressPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 0e8aaef0bd..a552230e28 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.issue.title;
import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
index d5fca53ba4..c0ac8b4334 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.cycle.RequestCycle;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java
index 2c79abd7a8..066a897d47 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java
@@ -16,7 +16,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
index 3a7ba36cca..26bc9d6f26 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
index b34eba0a8b..2cfef64c61 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.job;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 22e2a54a47..2dcc23d0c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -26,7 +26,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
index d6149ca802..03cf8e9e80 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
@@ -8,7 +8,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index 49dffd5112..7863fc5161 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Optional;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
index 7e85d83a5b..9748e2b958 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.link;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java
index 714183b706..9f771fd2ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java
@@ -14,7 +14,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.cycle.RequestCycle;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class DropdownLink extends AjaxLink<Void> {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index d17a3c776a..da78778b7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -14,7 +14,7 @@ import java.util.Map;
import java.util.Set;
import javax.activation.MimetypesFileTypeMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 22111377d2..1b07a25d87 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index f0d2578b55..3071c24850 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -41,7 +41,7 @@ import org.hibernate.StaleStateException;
import org.unbescape.html.HtmlEscape;
import org.unbescape.javascript.JavaScriptEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java
index e8ab39e588..a4e182c50e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.markdown;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
index 49221cc654..b8c4076867 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuItem.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.menu;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
index 1b998532cb..e5d5830984 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
@@ -8,7 +8,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public abstract class MenuLink extends DropdownLink {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
index 8adf62e99b..da314580a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.menu;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.java
index 0371d7c6ab..f469d875f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.modal.confirm;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
index e006b4247a..d4f37bec5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.modal.confirm;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java
index 65c36e7f3b..f8c0ef0476 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.offcanvas;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java
index 7266672089..289c78debe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasCardSupportPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.offcanvas;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java
index 81385e86d3..578a425d4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.offcanvas;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index e9541e8bba..c42299664b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -11,7 +11,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java
index 60edbbfc56..8aaf937fc6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.navigation.paging.IPageable;
import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class OnePagingNavigator extends AjaxPagingNavigator {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java
index f6eaf88f36..ac25441ef3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java
@@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
index 87be62d677..bea985dcf5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 112bc0c083..eeb7dcd1ac 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -16,7 +16,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.util.WicketUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
index b9f686b22f..e06189a4d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
@@ -32,7 +32,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public abstract class ProjectSelector extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
index fd56905afc..9f1903de94 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.pullrequest.choice;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.hibernate.Hibernate;
import org.json.JSONException;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 5bd69b33a8..f4716d2a66 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -13,7 +13,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
index cb2a238671..09f1fd3aff 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java
@@ -11,7 +11,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public abstract class AffinalRevisionPicker extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java
index cce890d0bb..c3e72fc2f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.revision;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
index bf9e8e509a..cc0a8fa3dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
@@ -42,7 +42,7 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.revwalk.RevCommit;
import org.unbescape.html.HtmlEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.text.MessageFormat;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java
index 01c60b580a..6639ab5b20 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.savedquery;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.NamedQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
index 69eeee46ae..b84fafb2af 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.savedquery;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index 6d2e120448..6dcf8e2d72 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java
index 8040a8ef8f..e78fba5407 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.sourceformat;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java
index b845f84754..b660802828 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.suggestionapply;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
index f03ea7ef8c..ef98c995f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImage.java
@@ -5,7 +5,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImageWrapper.java b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImageWrapper.java
index 0a255f7bc2..bfe7e89245 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImageWrapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/svg/SpriteImageWrapper.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.svg;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.html.panel.Panel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
index 7fe209e443..704a649531 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java
@@ -4,7 +4,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class ActionTab extends Tab {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
index 097ac64e3b..453780ba1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class AjaxActionTab extends ActionTab {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
index ca1e2d7f25..8f1abaab4d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.tabbable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
index 448566402a..421cad08d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/Tab.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.component.tabbable;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
index a9d2a5c31f..f8a43fecf8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java
index 3d40a3740b..25b46b597c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java
@@ -12,7 +12,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
index beff548f46..317ad820fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
index 81b68a84b6..447ee888c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
index 0c0c142486..f0d5da1fae 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
index 09bf410feb..48ff6b1e08 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
index ca26e5dd50..ecb6553387 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
index b97cd4b8b5..5ef6c03673 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.util.watch.WatchStatus;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class WatchStatusPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java
index 91dd046d53..dd1ec6a27b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java
@@ -9,7 +9,7 @@ package io.onedev.server.web.component.wizard;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index 1d69894b18..67983f973a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -5,7 +5,7 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.annotation.Editable;
import io.onedev.server.util.BeanUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java
index aeebd63e40..5dbcad8060 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import io.onedev.commons.loader.ExtensionPoint;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
@ExtensionPoint
public interface EditSupport extends Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index 2d56e8aec9..73188199eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -6,7 +6,7 @@ import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
index 805d75b48d..c17118e327 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.editable;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index cd0f8f97f9..c6717d31e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index 29f31b5b1b..f92627d49f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.lang.reflect.Method;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
index 5b2ce603fc..af5852b009 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
@@ -17,7 +17,7 @@ import org.apache.wicket.util.convert.ConversionException;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class BuildSingleChoiceEditor extends PropertyEditor<Long> {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
index fb0f91bb4e..d5ac908e83 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
@@ -8,7 +8,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java
index a2b7e4a3dc..bc1ca892f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java
@@ -30,7 +30,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
index 7404aa9c54..826c8db476 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java
index b61177e6eb..e17b500b59 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.mapper;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.core.request.mapper.MapperUtils;
import org.apache.wicket.request.Request;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ServerDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ServerDetailPage.java
index 4f4695a595..5c8509f722 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ServerDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ServerDetailPage.java
@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class ServerDetailPage extends AdministrationPage {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
index 4158aff23f..6e71d90507 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
@@ -6,7 +6,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.codec.binary.Base64;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
index 4e8036e2aa..743d82f96e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.page.admin.buildsetting.agent;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
index 7de37c1d06..4ba0130311 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
@@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index 861c759a2a..40a8526932 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -9,7 +9,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
index 3dd8ec2dfa..5e87898940 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java
index f44c66f881..9f14c0db38 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
index 7105603add..7bbb5cb737 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -6,7 +6,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
index 44dd6f61a3..6ceea02b92 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.issuesetting.transitionspec;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
index 96784fd483..285125fbce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Validator;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
index b98377cd57..656a066da4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
@@ -14,7 +14,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 075c2abe72..42f1bf513c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Locale;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.servlet.http.Cookie;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index d67977f90f..175a528662 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java
index 5f4b57e833..9d76bc4463 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.lang.reflect.Method;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleProvider.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleProvider.java
index 50a8efde84..aa45893c0a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleProvider.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.help;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
index 4c5a91a0e4..76513ea00d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.visit.IVisitor;
import org.glassfish.jersey.server.ResourceConfig;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 0b6648f41f..7dfb98a906 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
index d806340b5b..3e98844dc5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.help;
import java.lang.reflect.Type;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class ValueInfo {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index 0eb3cda506..d03ed1f523 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
index 163cacc8c2..d422f96846 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.page.layout;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java
index 2bad4b0196..9cbb63d55a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java
@@ -6,7 +6,7 @@ import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProje
import io.onedev.server.web.util.WicketUtils;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
index 2637d27478..08d7738f5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index b7fbc58dd1..3b81c40bb6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index a51975f026..df5c8168c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -15,7 +15,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index 4cd554fea1..915d0550e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxChannel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index 87d5e231c5..0563c151cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.blob.render;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.java
index 2f166ae3fb..8ed9020ad9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.blob.render;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 6c977f7acd..2ed62ae521 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -9,7 +9,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
index ec615c1637..696bbf8cb3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
@@ -21,7 +21,7 @@ import org.apache.wicket.request.resource.AbstractResource;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index 20316ca55c..90b1372779 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
index 80bd887625..dbf4a41dc1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
index c2a3613f8a..f34a6b75ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
@@ -10,7 +10,7 @@ import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;
import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;
import org.apache.wicket.Component;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
import java.util.stream.IntStream;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java
index 161f31d3f4..49fca3155d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.project.blob.render.renderers.markdown;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index fb69ef32a8..9a737478fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -13,7 +13,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index a7f475cc98..a46fa4691e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.java
index d9837ca205..70a05a9a39 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.project.blob.render.view;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
index 9f46a66033..4f61a2b4e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
@@ -32,7 +32,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index c62616e550..b95196803b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -43,7 +43,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index eee7dbb4f8..0c93b2563b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -16,7 +16,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.validator.routines.PercentValidator;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 8ceee9d1db..3172c76997 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
index f30911f753..7878f370cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
index 651ea83891..1c5fa1ae0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
@@ -14,7 +14,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java
index d28152d3f8..c9339668aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java
@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public class BuildReportTab extends BuildTab {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
index 23c29af777..17150003fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index cc05bb6141..525fb8086f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -30,7 +30,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 4e73da4b8f..c8e83cf77d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -79,7 +79,7 @@ import org.eclipse.jgit.revwalk.RevObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index d60b7dd6ed..d8fd6fc324 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 5be2d6671b..c302884723 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
index 26e0fd4626..c2acc42afe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.issues.boards;
import java.util.HashSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 978943bb88..97149f9a3c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -34,7 +34,7 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 1915299fae..a75f8912af 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -56,7 +56,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index f20eb606d4..2473db3c99 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index 0bb0a246c9..62d7cd44cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -9,7 +9,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 265eecad55..ae0986644c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -9,7 +9,7 @@ import java.text.MessageFormat;
import java.util.Date;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IterationSelection.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IterationSelection.java
index 74c84a8803..c9330c8a31 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IterationSelection.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IterationSelection.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.issues.boards;
import io.onedev.server.model.Iteration;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface IterationSelection {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 48bdcf9136..6d4acf1e9e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
index aedf335e43..d6f691a352 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.issues.detail;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java
index fba31bbace..f3c1cc8a82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java
@@ -6,7 +6,7 @@ import static io.onedev.server.web.component.iteration.burndown.BurndownIndicato
import java.io.Serializable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java
index 97e6d1afa3..ab4ec35f64 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java
@@ -17,7 +17,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java
index df9ec00951..524188a8ef 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.issues.iteration;
import static io.onedev.server.web.translation.Translation._T;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index a511b2bee1..cd2f3f54a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -10,7 +10,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
index 8a9360d059..885187da42 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 4b6a31d315..721a3c54a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index eb29dd790e..859a745fb4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -16,7 +16,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index 0ffe0df0bf..4096344619 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -54,7 +54,7 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.*;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
index 11125a2088..945854d953 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
@@ -19,7 +19,7 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
index 49fd90e490..777d9e4a98 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.unbescape.html.HtmlEscape;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public abstract class ObsoleteUpdateAwarePanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
index 233b3953ac..066bf8a8b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.model.PropertyModel;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.List;
public abstract class OperationCommentPanel extends ObsoleteUpdateAwarePanel {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
index 8231446b0c..8a805cdb7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.setting.general;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.annotation.ProjectPath;
import io.onedev.server.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
index 4b0fb7fd01..ebb1f8c3f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.setting.pluginsettings;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Validator;
import org.apache.wicket.Component;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
index 845099de09..5866c38164 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
@@ -36,7 +36,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
index 6e4381cedf..6a7925ed57 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetPage.java
index 4342f199f1..c4ff11c082 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetPage.java
@@ -29,7 +29,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java
index 04d0249f8e..c03900e470 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.simple;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.head.CssHeaderItem;
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
index 0f43843ae4..c65bc443b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
@@ -30,7 +30,7 @@ import org.eclipse.jgit.lib.Repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.EntityNotFoundException;
import javax.ws.rs.core.HttpHeaders;
import java.io.ByteArrayInputStream;
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
index df7ef439d0..6e9a5909c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
@@ -11,7 +11,7 @@ import java.io.IOException;
import java.net.URLEncoder;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tika.mime.MimeTypes;
diff --git a/server-core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.java b/server-core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.java
index a68811c361..25fe05a6a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.java
+++ b/server-core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.resourcebundle;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IReferenceHeaderItem;
diff --git a/server-core/src/main/java/io/onedev/server/web/upload/UploadService.java b/server-core/src/main/java/io/onedev/server/web/upload/UploadService.java
index 95bc2c5096..62ad360152 100644
--- a/server-core/src/main/java/io/onedev/server/web/upload/UploadService.java
+++ b/server-core/src/main/java/io/onedev/server/web/upload/UploadService.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.upload;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface UploadService {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/AnnotationSupport.java b/server-core/src/main/java/io/onedev/server/web/util/AnnotationSupport.java
index 41697be68b..5b7a7b119c 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/AnnotationSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/AnnotationSupport.java
@@ -9,7 +9,7 @@ import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.support.Mark;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
index f963f40e1b..686176684a 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.util;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.ProjectService;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/EditParamsAware.java b/server-core/src/main/java/io/onedev/server/web/util/EditParamsAware.java
index 853d9324a3..29e8b1893f 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/EditParamsAware.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/EditParamsAware.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.util;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.Page;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java b/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java
index 070ff85b40..dd706d30d1 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.util;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.search.entity.issue.IssueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java
index 24b500f62c..c0e038cb07 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.util;
import io.onedev.server.model.Project;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
public interface ProjectAware {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/QuerySaveSupport.java b/server-core/src/main/java/io/onedev/server/web/util/QuerySaveSupport.java
index 81f24eb0d7..0c952abda0 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/QuerySaveSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/QuerySaveSupport.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.util;
import java.io.Serializable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java
index 684c34892b..c39a2ffafe 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java
@@ -4,7 +4,7 @@ import io.onedev.server.model.support.TimeGroups;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.Path;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 47539a8554..ac0dc30a8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -19,7 +19,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
index 44199285eb..48a1870663 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
@@ -16,7 +16,7 @@ import org.apache.wicket.request.IRequestHandlerDelegate;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.AbstractResource;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
index 71bfb3f043..eee24435da 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java
index 894f56982b..f9acd7b663 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java
@@ -26,7 +26,7 @@ import org.quartz.SimpleScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.io.ObjectStreamException;
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketService.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketService.java
index d5489f2bf5..dad3578985 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketService.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketService.java
@@ -4,7 +4,7 @@ import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import io.onedev.server.web.page.base.BasePage;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.Collection;
public interface WebSocketService {
diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
index d6b7f6c81f..c6b701b185 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/AbstractEnvironmentService.java
@@ -10,7 +10,7 @@ import jetbrains.exodus.backup.VirtualFileDescriptor;
import jetbrains.exodus.env.*;
import org.eclipse.jgit.lib.ObjectId;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java
index 4952e88ccf..bd1f099c88 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.client.Client;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java
index 6fa9b6a4b3..66f796b9df 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/PullRequestInfoService.java
@@ -2,7 +2,7 @@ package io.onedev.server.xodus;
import java.util.Collection;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/VisitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/VisitInfoService.java
index 45a5154d29..bbe36e29b1 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/VisitInfoService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/VisitInfoService.java
@@ -3,7 +3,7 @@ package io.onedev.server.xodus;
import java.io.File;
import java.util.Date;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;
diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
index 3c3b94a238..bbfd82174d 100644
--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
+++ b/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
index b643199673..dd7fb07888 100644
--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
@@ -19,7 +19,7 @@ import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.io.IOException;
diff --git a/server-ee b/server-ee
index 6b69d55401..18ee158027 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 6b69d554017581172476f5abfae242aa28195145
+Subproject commit 18ee1580279735010236a36a7cf410630e35412d
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 0f796a1581..01e6aff0f9 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index d5485df63f..42b7e0889a 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index d3c3344f72..05b6a69e7a 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
index 8627a2afef..13ea092687 100644
--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.naming.AuthenticationException;
import javax.naming.CompositeName;
import javax.naming.Context;
diff --git a/server-plugin/server-plugin-buildspec-bazel/pom.xml b/server-plugin/server-plugin-buildspec-bazel/pom.xml
index eeee0d49ee..2c4d91ebdb 100644
--- a/server-plugin/server-plugin-buildspec-bazel/pom.xml
+++ b/server-plugin/server-plugin-buildspec-bazel/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-cmake/pom.xml b/server-plugin/server-plugin-buildspec-cmake/pom.xml
index f264a4756f..0e1a8dd64d 100644
--- a/server-plugin/server-plugin-buildspec-cmake/pom.xml
+++ b/server-plugin/server-plugin-buildspec-cmake/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xml
index 25c14f4dd4..fb561924f0 100644
--- a/server-plugin/server-plugin-buildspec-dotnet/pom.xml
+++ b/server-plugin/server-plugin-buildspec-dotnet/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-golang/pom.xml b/server-plugin/server-plugin-buildspec-golang/pom.xml
index 766456cc76..18df3cb4dc 100644
--- a/server-plugin/server-plugin-buildspec-golang/pom.xml
+++ b/server-plugin/server-plugin-buildspec-golang/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index 01849e4041..f804423cea 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index 10b75c6f4c..c2eea66f71 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index 8be29d77ea..8144034f39 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
index fe7bdc0021..96cfa32fbd 100644
--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
@@ -19,7 +19,7 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/server-plugin/server-plugin-buildspec-python/pom.xml b/server-plugin/server-plugin-buildspec-python/pom.xml
index 9421611775..0c3e8eaf3f 100644
--- a/server-plugin/server-plugin-buildspec-python/pom.xml
+++ b/server-plugin/server-plugin-buildspec-python/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
index d3ef489764..2ca7cfcb5c 100644
--- a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
diff --git a/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java b/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java
index 4654e526d1..2ad97c977a 100644
--- a/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java
+++ b/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java
@@ -10,7 +10,7 @@ import io.onedev.server.util.IOUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.junit.Test;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import static org.junit.Assert.assertTrue;
diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xml
index 62292e0b21..3123619500 100644
--- a/server-plugin/server-plugin-buildspec-rust/pom.xml
+++ b/server-plugin/server-plugin-buildspec-rust/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index 90e700ae38..086fb1ec83 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 38e299e813..1a926b5f25 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -35,7 +35,7 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index dd8b2f7a7f..6f768ec0db 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml
index 021e34e3c4..f20ff84ad1 100644
--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml
+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml
index d5a35f2018..b3d4281238 100644
--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml
+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml
index 6bd7acbe35..239e0fe9c2 100644
--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml
+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index d074872ab0..9e64ac6429 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -34,7 +34,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml
index 44143b9602..31ab660f8f 100644
--- a/server-plugin/server-plugin-executor-servershell/pom.xml
+++ b/server-plugin/server-plugin-executor-servershell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index 027dd93d55..2604c5dbd5 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml
index 1a0ed6799b..98e3b4360c 100644
--- a/server-plugin/server-plugin-import-gitea/pom.xml
+++ b/server-plugin/server-plugin-import-gitea/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
index f48c78a75c..50be567c95 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
@@ -19,7 +19,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.java
index 507ea61dc3..6af1f1d0bd 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectImportOption.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index f737b24e59..9297a68f29 100644
--- a/server-plugin/server-plugin-import-github/pom.xml
+++ b/server-plugin/server-plugin-import-github/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index b1800324cf..a391a3c0ed 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -16,7 +16,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java
index 91ccc55fc0..80e805f4e0 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectImportOption.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index ac47a58f13..444c1964cb 100644
--- a/server-plugin/server-plugin-import-gitlab/pom.xml
+++ b/server-plugin/server-plugin-import-gitlab/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index af10b88a79..a60e8caa5c 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java
index a7f4e0e5af..4fe2070142 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectImportOption.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index fc612f48f9..6ed4c92dea 100644
--- a/server-plugin/server-plugin-import-jiracloud/pom.xml
+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
index b595a70ac8..6bad93c1a6 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xml
index c262bf156e..d9c9138c73 100644
--- a/server-plugin/server-plugin-import-url/pom.xml
+++ b/server-plugin/server-plugin-import-url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
index 399a907cca..bb6ff2b636 100644
--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.url;
import java.io.Serializable;
import java.net.URISyntaxException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index c974e6e101..30d4cd1038 100644
--- a/server-plugin/server-plugin-import-youtrack/pom.xml
+++ b/server-plugin/server-plugin-import-youtrack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index 5c5402e43a..25f89ff341 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -18,7 +18,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
diff --git a/server-plugin/server-plugin-mail-gmail/pom.xml b/server-plugin/server-plugin-mail-gmail/pom.xml
index d8317300ae..8534494be6 100644
--- a/server-plugin/server-plugin-mail-gmail/pom.xml
+++ b/server-plugin/server-plugin-mail-gmail/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mail.gmail.GmailModule</moduleClass>
diff --git a/server-plugin/server-plugin-mail-office365/pom.xml b/server-plugin/server-plugin-mail-office365/pom.xml
index 58a1ce6023..3f0b6282fc 100644
--- a/server-plugin/server-plugin-mail-office365/pom.xml
+++ b/server-plugin/server-plugin-mail-office365/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mail.office365.Office365Module</moduleClass>
diff --git a/server-plugin/server-plugin-mail-smtpimap/pom.xml b/server-plugin/server-plugin-mail-smtpimap/pom.xml
index d30c32d806..89528925a4 100644
--- a/server-plugin/server-plugin-mail-smtpimap/pom.xml
+++ b/server-plugin/server-plugin-mail-smtpimap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mail.smtpimap.SmtpImapModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xml
index 9e02b2fc8d..cd7b08eca0 100644
--- a/server-plugin/server-plugin-notification-discord/pom.xml
+++ b/server-plugin/server-plugin-notification-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-ntfy/pom.xml b/server-plugin/server-plugin-notification-ntfy/pom.xml
index b9c15bffd0..fb3a3ca806 100644
--- a/server-plugin/server-plugin-notification-ntfy/pom.xml
+++ b/server-plugin/server-plugin-notification-ntfy/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xml
index 3c882a1d47..952c0df93e 100644
--- a/server-plugin/server-plugin-notification-slack/pom.xml
+++ b/server-plugin/server-plugin-notification-slack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
diff --git a/server-plugin/server-plugin-pack-container/pom.xml b/server-plugin/server-plugin-pack-container/pom.xml
index 7c1e7646dd..c68b8a6134 100644
--- a/server-plugin/server-plugin-pack-container/pom.xml
+++ b/server-plugin/server-plugin-pack-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ClientException.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ClientException.java
index 6e260c05b4..fa4aae1a11 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ClientException.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ClientException.java
@@ -2,7 +2,7 @@ package io.onedev.server.plugin.pack.container;
import io.onedev.server.exception.HttpResponseAwareException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerManifest.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerManifest.java
index 032fcc09d8..30b99e80d6 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerManifest.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerManifest.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
public class ContainerManifest {
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
index f7259d6ecd..e29c8e043b 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java
index cd6f5eedf6..a8962d55e3 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java
@@ -1,6 +1,6 @@
package io.onedev.server.plugin.pack.container;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xml
index 0c12661336..e9f1e8e672 100644
--- a/server-plugin/server-plugin-pack-gem/pom.xml
+++ b/server-plugin/server-plugin-pack-gem/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemData.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemData.java
index 19110dd0be..382a5f255b 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemData.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemData.java
@@ -1,6 +1,6 @@
package io.onedev.server.plugin.pack.gem;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Map;
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
index 351b2f306d..55cb1a3919 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackService.java
@@ -30,7 +30,7 @@ import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.ScalarNode;
import org.yaml.snakeyaml.nodes.SequenceNode;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xml
index e7e3d194ef..261da967f9 100644
--- a/server-plugin/server-plugin-pack-helm/pom.xml
+++ b/server-plugin/server-plugin-pack-helm/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xml
index 7901774e93..7876c1f2d7 100644
--- a/server-plugin/server-plugin-pack-maven/pom.xml
+++ b/server-plugin/server-plugin-pack-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
index b5acdaedc4..0b5d9485ad 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackService.java
@@ -25,7 +25,7 @@ import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xml
index a6d6d66e8d..bba87cb877 100644
--- a/server-plugin/server-plugin-pack-npm/pom.xml
+++ b/server-plugin/server-plugin-pack-npm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/ClientException.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/ClientException.java
index 42122fd85a..65aed88c5b 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/ClientException.java
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/ClientException.java
@@ -2,7 +2,7 @@ package io.onedev.server.plugin.pack.npm;
import io.onedev.server.exception.HttpResponseAwareException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xml
index 7988760b7a..e357509676 100644
--- a/server-plugin/server-plugin-pack-nuget/pom.xml
+++ b/server-plugin/server-plugin-pack-nuget/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetData.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetData.java
index 9647fcc352..7645ed7753 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetData.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetData.java
@@ -1,6 +1,6 @@
package io.onedev.server.plugin.pack.nuget;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.Serializable;
public class NugetData implements Serializable {
diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xml
index 9b9f1b9135..972f801609 100644
--- a/server-plugin/server-plugin-pack-pypi/pom.xml
+++ b/server-plugin/server-plugin-pack-pypi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index 3eac36eb11..8588f71549 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-clippy/pom.xml b/server-plugin/server-plugin-report-clippy/pom.xml
index 60aca47309..b194d00a91 100644
--- a/server-plugin/server-plugin-report-clippy/pom.xml
+++ b/server-plugin/server-plugin-report-clippy/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/ClippyReportParser.java b/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/ClippyReportParser.java
index 942994934d..c5f9562656 100644
--- a/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/ClippyReportParser.java
+++ b/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/ClippyReportParser.java
@@ -7,7 +7,7 @@ import io.onedev.server.codequality.BlobTarget;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.model.Build;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.*;
import static java.lang.Integer.parseInt;
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 475fca47b8..fadb626a2c 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xml
index df1ed30d09..80cec0124c 100644
--- a/server-plugin/server-plugin-report-cobertura/pom.xml
+++ b/server-plugin/server-plugin-report-cobertura/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xml
index fd65b5ba5a..07bd625d6f 100644
--- a/server-plugin/server-plugin-report-coverage/pom.xml
+++ b/server-plugin/server-plugin-report-coverage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
index 42cfd99a11..0a19d60550 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
@@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang.SerializationException;
import org.apache.commons.lang.SerializationUtils;
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
index f70dfc45be..afdd78f3ba 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
@@ -10,7 +10,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationException;
import org.apache.wicket.Component;
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
index 694213ec9e..19a55302e5 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
@@ -17,7 +17,7 @@ import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.dao.Dao;
import org.apache.commons.lang.SerializationUtils;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.*;
import java.util.Map;
diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml
index 60c29574bc..2f23661c2e 100644
--- a/server-plugin/server-plugin-report-cpd/pom.xml
+++ b/server-plugin/server-plugin-report-cpd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-cppcheck/pom.xml b/server-plugin/server-plugin-report-cppcheck/pom.xml
index 5549009cf7..887e6d8406 100644
--- a/server-plugin/server-plugin-report-cppcheck/pom.xml
+++ b/server-plugin/server-plugin-report-cppcheck/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParser.java b/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParser.java
index 6cefbc60d8..b1df422995 100644
--- a/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParser.java
+++ b/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParser.java
@@ -7,7 +7,7 @@ import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.model.Build;
import org.dom4j.Document;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.*;
import static java.lang.Integer.parseInt;
diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xml
index ccab0a70b2..4f3370794c 100644
--- a/server-plugin/server-plugin-report-gtest/pom.xml
+++ b/server-plugin/server-plugin-report-gtest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xml
index 9a983baa84..80255d8102 100644
--- a/server-plugin/server-plugin-report-html/pom.xml
+++ b/server-plugin/server-plugin-report-html/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xml
index d6db87f1d7..2f13e893b3 100644
--- a/server-plugin/server-plugin-report-jacoco/pom.xml
+++ b/server-plugin/server-plugin-report-jacoco/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index 6efc7c8129..85b24c011f 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java
index 1f959a3e4c..de838cdec0 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java
@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml
index 145199860c..29a0d92f6c 100644
--- a/server-plugin/server-plugin-report-junit/pom.xml
+++ b/server-plugin/server-plugin-report-junit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
index e0637c3d6a..cc2a99a4f4 100644
--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
@@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.dom4j.Document;
import org.dom4j.Element;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index 6b92499e10..88b5653da7 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
index 63a1f3bd08..ac0dfb33e4 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
@@ -19,7 +19,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/server-plugin/server-plugin-report-mypy/pom.xml b/server-plugin/server-plugin-report-mypy/pom.xml
index 3a1d09c41d..aad3425d8e 100644
--- a/server-plugin/server-plugin-report-mypy/pom.xml
+++ b/server-plugin/server-plugin-report-mypy/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/MypyReportParser.java b/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/MypyReportParser.java
index 7b7c1b92b7..7f97a61d74 100644
--- a/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/MypyReportParser.java
+++ b/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/MypyReportParser.java
@@ -1,22 +1,27 @@
package io.onedev.server.plugin.report.mypy;
+import static io.onedev.server.codequality.CodeProblem.Severity.LOW;
+import static io.onedev.server.codequality.CodeProblem.Severity.MEDIUM;
+import static java.lang.Integer.parseInt;
+import static org.unbescape.html.HtmlEscape.escapeHtml5;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.commons.lang3.math.NumberUtils;
+
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.codequality.BlobTarget;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.model.Build;
-import org.apache.commons.lang3.math.NumberUtils;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static io.onedev.server.codequality.CodeProblem.Severity.LOW;
-import static io.onedev.server.codequality.CodeProblem.Severity.MEDIUM;
-import static java.lang.Integer.parseInt;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
public class MypyReportParser {
@@ -63,7 +68,6 @@ public class MypyReportParser {
throw new ExplicitException("Error parsing mypy output: no message found");
}
- @Nullable
private static void populateCodeProblems(List<CodeProblem> problems, Build build, Map<String, Optional<String>> blobPaths,
ParsedLine parsedLine, TaskLogger logger) {
var blobPath = blobPaths.get(parsedLine.filePath);
diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml
index 77c253a616..5beed83511 100644
--- a/server-plugin/server-plugin-report-pmd/pom.xml
+++ b/server-plugin/server-plugin-report-pmd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xml
index d8babb1e58..5ae1943c87 100644
--- a/server-plugin/server-plugin-report-problem/pom.xml
+++ b/server-plugin/server-plugin-report-problem/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
index d4ddc8f69b..5360473fec 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang.SerializationException;
import org.apache.commons.lang.SerializationUtils;
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index 325fa9c9d0..f480a9b4c1 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -12,7 +12,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.SerializationException;
import org.apache.wicket.Component;
diff --git a/server-plugin/server-plugin-report-pylint/pom.xml b/server-plugin/server-plugin-report-pylint/pom.xml
index 8c5597c1a8..942ba67d1e 100644
--- a/server-plugin/server-plugin-report-pylint/pom.xml
+++ b/server-plugin/server-plugin-report-pylint/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xml
index 59274f0d95..cafd38e62c 100644
--- a/server-plugin/server-plugin-report-roslynator/pom.xml
+++ b/server-plugin/server-plugin-report-roslynator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-ruff/pom.xml b/server-plugin/server-plugin-report-ruff/pom.xml
index c521377451..0baa06c80d 100644
--- a/server-plugin/server-plugin-report-ruff/pom.xml
+++ b/server-plugin/server-plugin-report-ruff/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xml
index af0cc4c6c9..a10b449673 100644
--- a/server-plugin/server-plugin-report-spotbugs/pom.xml
+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
index adbe9a0f56..40ed304ee1 100644
--- a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
+++ b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
@@ -21,7 +21,7 @@ import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.io.File;
import java.io.IOException;
diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xml
index 0be429a365..cc93e857b9 100644
--- a/server-plugin/server-plugin-report-trx/pom.xml
+++ b/server-plugin/server-plugin-report-trx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/TRXReportParser.java b/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/TRXReportParser.java
index c3bb51fe2a..45a1fc6c68 100644
--- a/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/TRXReportParser.java
+++ b/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/TRXReportParser.java
@@ -19,7 +19,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.dom4j.Document;
import org.dom4j.Element;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml
index 805f478729..dcbfd6efe4 100644
--- a/server-plugin/server-plugin-report-unittest/pom.xml
+++ b/server-plugin/server-plugin-report-unittest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java
index f40142c968..220c0ede26 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java
@@ -14,7 +14,7 @@ import io.onedev.server.model.UnitTestMetric;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.dao.Dao;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.File;
import static io.onedev.commons.utils.LockUtils.write;
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
index e277e60270..923562b91b 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.apache.wicket.Component;
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
index 008b47c9b0..0d1e9b63c9 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
@@ -8,7 +8,7 @@ import io.onedev.server.util.patternset.PatternSet;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import java.io.*;
import java.util.Collection;
import java.util.List;
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java
index 0588191898..4db55e9932 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import static io.onedev.server.web.translation.Translation._T;
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
index 66c0b22736..bb2c7f10d4 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
@@ -12,7 +12,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.apache.wicket.Component;
diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xml
index 362015683a..de69e0e987 100644
--- a/server-plugin/server-plugin-sso-discord/pom.xml
+++ b/server-plugin/server-plugin-sso-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
index 4438c6516d..051a9fb5e1 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
@@ -10,7 +10,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import org.apache.http.entity.ContentType;
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index d382a87b51..22e56599f8 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index b80099088d..d21f3c5808 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotEmpty;
diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.conf
index 04acfc8524..63dd6765bd 100644
--- a/server-product/jsw/wrapper.conf
+++ b/server-product/jsw/wrapper.conf
@@ -72,6 +72,7 @@ wrapper.java.additional.auto_bits=TRUE
# Java Additional Parameters
wrapper.java.additional.1=-Djava.awt.headless=true
+wrapper.java.additional.2=-Djdk.io.File.allowDeleteReadOnlyFiles=true
wrapper.java.additional.10=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
wrapper.java.additional.11=--add-opens=java.base/java.lang=ALL-UNNAMED
@@ -85,6 +86,7 @@ wrapper.java.additional.31=--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
wrapper.java.additional.32=--add-opens=java.management/sun.management=ALL-UNNAMED
wrapper.java.additional.33=--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
wrapper.java.additional.50=--add-opens=java.base/sun.nio.fs=ALL-UNNAMED
+
wrapper.java.additional.100=-XX:MaxRAMPercentage=%max_memory_percent%
wrapper.java.additional.101=-Xss%thread_stack_size%
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 3a54d491d2..b9c87ac52a 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>13.0.7</version>
+ <version>13.0.8</version>
</parent>
<dependencies>
<dependency>