The Unified and Autonomous Development Platform
feat: Person query with same name should override common query (OD-2692)
Robin Shen1b02479f1cdc
diff --git a/pom.xml b/pom.xmlindex ceddabed06..9c04086c73 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.3.0</version></parent><artifactId>server</artifactId>- <version>14.1.1</version>+ <version>14.1.2</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -295,12 +295,12 @@<dependency><groupId>org.apache.commons</groupId><artifactId>commons-compress</artifactId>- <version>1.26.0</version>+ <version>1.28.0</version></dependency><dependency><groupId>commons-io</groupId><artifactId>commons-io</artifactId>- <version>2.15.1</version>+ <version>2.18.0</version></dependency><dependency><groupId>commons-codec</groupId>@@ -310,7 +310,7 @@<dependency><groupId>org.apache.commons</groupId><artifactId>commons-lang3</artifactId>- <version>3.8.1</version>+ <version>3.17.0</version></dependency><dependency><groupId>org.apache.commons</groupId>@@ -676,8 +676,8 @@</repository></repositories><properties>- <commons.version>3.2.2</commons.version>- <agent.version>2.4.1</agent.version>+ <commons.version>3.2.3</commons.version>+ <agent.version>2.4.2</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.xmlindex d2d99c3975..71f3d48e1e 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>14.1.1</version>+ <version>14.1.2</version></parent><build><plugins>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.javaindex f6f42fe091..dc4fb7278c 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@@ -52,6 +52,7 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import org.apache.commons.io.FilenameUtils;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -94,7 +95,6 @@ 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;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.criteria.Criteria;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.javaindex c66869ca40..25901e2f85 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@@ -116,8 +116,11 @@ public class BuildNotificationManager {for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {String commonName = NamedQuery.getCommonName(name);if (commonName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(project.getNamedBuildQueries(), commonName));+ // Skip common query subscription if a personal query with same name exists+ if (NamedQuery.find(personalization.getQueries(), commonName) == null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedBuildQueries(), commonName));+ }}String personalName = NamedQuery.getPersonalName(name);if (personalName != null) {@@ -164,8 +167,11 @@ public class BuildNotificationManager {for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {String globalName = NamedQuery.getCommonName(name);if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(settingService.getBuildSetting().getNamedQueries(), globalName));+ // Skip common query subscription if a personal query with same name exists+ if (NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), globalName) == null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(settingService.getBuildSetting().getNamedQueries(), globalName));+ }}String personalName = NamedQuery.getPersonalName(name);if (personalName != null) {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.javaindex 80c3d7aec9..66e1967fc0 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@@ -68,8 +68,11 @@ public class CommitNotificationManager {for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {String globalName = NamedQuery.getCommonName(name);if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(project.getNamedCommitQueries(), globalName));+ // Skip common query subscription if a personal query with same name exists+ if (NamedQuery.find(personalization.getQueries(), globalName) == null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedCommitQueries(), globalName));+ }}String personalName = NamedQuery.getPersonalName(name);if (personalName != null) {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.javaindex 02ba38aaf5..68d416ea59 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@@ -91,8 +91,11 @@ public class PackNotificationManager {for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {String commonName = NamedQuery.getCommonName(name);if (commonName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),- NamedQuery.find(project.getNamedPackQueries(), commonName));+ // Skip common query subscription if a personal query with same name exists+ if (NamedQuery.find(personalization.getQueries(), commonName) == null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),+ NamedQuery.find(project.getNamedPackQueries(), commonName));+ }}String personalName = NamedQuery.getPersonalName(name);if (personalName != null) {@@ -133,8 +136,11 @@ public class PackNotificationManager {for (String name: user.getPackQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {String globalName = NamedQuery.getCommonName(name);if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(settingService.getPackSetting().getNamedQueries(), globalName));+ // Skip common query subscription if a personal query with same name exists+ if (NamedQuery.find(user.getPackQueryPersonalization().getQueries(), globalName) == null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(settingService.getPackSetting().getNamedQueries(), globalName));+ }}String personalName = NamedQuery.getPersonalName(name);if (personalName != null) {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.javaindex c45ece32fb..8e1a588d6b 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@@ -17,7 +17,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QueryPersonalization;-public abstract class QueryWatchBuilder<T extends AbstractEntity> {private static final Logger logger = LoggerFactory.getLogger(QueryWatchBuilder.class);@@ -31,9 +30,12 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {for (Map.Entry<String, Boolean> entry: personalization.getQueryWatchSupport().getQueryWatches().entrySet()) {String globalName = NamedQuery.getCommonName(entry.getKey());if (globalName != null) {- if (matches(NamedQuery.find(getNamedQueries(), globalName), personalization.getUser())) {- watches.putIfAbsent(personalization.getUser(), entry.getValue());- break;+ // Skip common query watch if a personal query with same name exists+ if (NamedQuery.find(personalization.getQueries(), globalName) == null) {+ if (matches(NamedQuery.find(getNamedQueries(), globalName), personalization.getUser())) {+ watches.putIfAbsent(personalization.getUser(), entry.getValue());+ break;+ }}}String personalName = NamedQuery.getPersonalName(entry.getKey());diff --git a/server-core/src/main/java/io/onedev/server/util/FilenameUtils.java b/server-core/src/main/java/io/onedev/server/util/FilenameUtils.javaindex 62c30a1148..a31842b78d 100644--- a/server-core/src/main/java/io/onedev/server/util/FilenameUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/FilenameUtils.java@@ -1,6 +1,6 @@package io.onedev.server.util;-public class FilenameUtils extends org.apache.commons.io.FilenameUtils {+public class FilenameUtils {public static String sanitizeFileName(String fileName) {return fileName.replace("..", "_").replace('/', '_').replace('\\', '_');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.javaindex ea24f3af4f..37f4b23f0e 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@@ -357,9 +357,18 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {@Overrideprotected List<T> load() {+ Set<String> personalQueryNames = new HashSet<>();+ QueryPersonalization<T> personalization = getQueryPersonalization();+ if (personalization != null) {+ for (T query: personalization.getQueries())+ personalQueryNames.add(query.getName());+ }+List<T> namedQueries = new ArrayList<>();- for (T namedQuery: getCommonQueries()!=null?getCommonQueries():getInheritedCommonQueries())- namedQueries.add(namedQuery);+ for (T namedQuery: getCommonQueries()!=null?getCommonQueries():getInheritedCommonQueries()) {+ if (!personalQueryNames.contains(namedQuery.getName()))+ namedQueries.add(namedQuery);+ }return namedQueries;}diff --git a/server-ee b/server-eeindex 3d2995b6c6..0222ea67d3 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 3d2995b6c6d39a5893e14f7ba0fe1556dd19474e+Subproject commit 0222ea67d333ce923d783ce4a2763339366026d7diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex d98dc14ce9..528f2e20e6 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 22c7293242..f91c52dbd2 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>14.1.1</version>+ <version>14.1.2</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 75a602cd4e..1d0b4d97bc 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-bazel/pom.xml b/server-plugin/server-plugin-buildspec-bazel/pom.xmlindex 1164043f5b..d67fd6e77c 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 2771bb5320..1f5816e7e8 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xmlindex c66ca65a5c..af162e0771 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-golang/pom.xml b/server-plugin/server-plugin-buildspec-golang/pom.xmlindex 30a940d8d1..9da220371c 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 46ec9c8622..c391229f74 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex bd2d4da93f..d66467df58 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 622213ebac..578528f3dc 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-python/pom.xml b/server-plugin/server-plugin-buildspec-python/pom.xmlindex 8b83d87ab2..f8a890be73 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xmlindex e279c2e750..79a85265a5 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 2f4bded440..81fbcec8a8 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>14.1.1</version>+ <version>14.1.2</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.javaindex 1a926b5f25..a345675509 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@@ -39,6 +39,7 @@ import org.jspecify.annotations.Nullable;import javax.validation.Valid;import javax.validation.constraints.NotEmpty;+import org.apache.commons.io.FilenameUtils;import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.RandomUtils;import org.apache.commons.lang3.SystemUtils;@@ -93,7 +94,6 @@ import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;-import io.onedev.server.util.FilenameUtils;import io.onedev.server.web.util.Testable;@Editable(order=KubernetesExecutor.ORDER, description="This executor runs build jobs as pods in a kubernetes cluster. "@@ -307,7 +307,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,public boolean execute(JobContext jobContext, TaskLogger jobLogger) {var clusterService = OneDev.getInstance(ClusterService.class);var servers = clusterService.getServerAddresses();- var server = servers.get(RandomUtils.nextInt(0, servers.size()));+ var server = servers.get(RandomUtils.secure().randomInt(0, servers.size()));return getJobService().runJob(server, ()-> getJobService().runJob(jobContext, new JobRunnable() {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 1e77027e2d..70f7e2952a 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 3b37d5454a..94c086e129 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex f2592323b5..972eeb682d 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex bb1e80d109..fc364cfd5c 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 85e33d8c65..af87fcda30 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 18cb4cf1b7..b7067e7393 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex 55ef6eecce..5e3624a9c9 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex ca03d96c99..298c47e873 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex e84a189043..5565757564 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xmlindex 2924b50d1f..18a166ce46 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 9498b39d61..a92632b461 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>diff --git a/server-plugin/server-plugin-mail-gmail/pom.xml b/server-plugin/server-plugin-mail-gmail/pom.xmlindex cf1d5d6625..3ac7656bf5 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 25d269d0cc..4eeda56bbe 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>14.1.1</version>+ <version>14.1.2</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.xmlindex e340d2b43f..679fd24b2b 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>14.1.1</version>+ <version>14.1.2</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.xmlindex e6c8efb7a9..8dc9828fb8 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 1bd2a4c3d8..726f07a882 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 04f90e4823..01ce622dde 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>14.1.1</version>+ <version>14.1.2</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.xmlindex 88107921cc..595dd0cc59 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xmlindex 72d58cea5b..1dee322d5e 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xmlindex 65e27a057a..1e970dea9e 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xmlindex e05a4af24d..1bc010459b 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xmlindex 4ce0a35b12..fee88a554b 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xmlindex ad03ca523b..19792145cb 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xmlindex c7cd9dba7a..2347490b2a 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 1d62579211..546584bf4f 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clippy/pom.xml b/server-plugin/server-plugin-report-clippy/pom.xmlindex 79fda94c22..8d3c8edba4 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex a9821ccd50..749e556a22 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xmlindex cb7ac4bd67..ad650c6528 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex cad4c77dc5..ea6d392329 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex b5c651a7ce..32073470f8 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cppcheck/pom.xml b/server-plugin/server-plugin-report-cppcheck/pom.xmlindex 8d53b93829..a2a2687124 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xmlindex d34345add1..8c32d50b3b 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex 819ff9925a..1898c64177 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>14.1.1</version>+ <version>14.1.2</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.xmlindex c929ed73f5..aedb24ff30 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex f11d98a691..9921ddf9d3 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 918f53367b..852705f6f7 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 6038854984..7d34f3f499 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>diff --git a/server-plugin/server-plugin-report-mypy/pom.xml b/server-plugin/server-plugin-report-mypy/pom.xmlindex 5b4d4dbca9..a1267f6a54 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 0b10d5783e..72887d9f12 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 9ffba77951..7e33e3aa28 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pylint/pom.xml b/server-plugin/server-plugin-report-pylint/pom.xmlindex 9a354dd494..79664626c6 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xmlindex 3c5268d577..24e82c3515 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-ruff/pom.xml b/server-plugin/server-plugin-report-ruff/pom.xmlindex d9242ab59d..a84bd2c901 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 86135d2ba4..39fe564756 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xmlindex 2436953e49..ec3735e2fb 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>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 978e61d1a3..4a8261366d 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 158b941ccc..d938179db4 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex edbe76b530..061c74b3e6 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>14.1.1</version>+ <version>14.1.2</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 99dbeca94a..d50263c5fe 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>14.1.1</version>+ <version>14.1.2</version></parent><dependencies><dependency>diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex c7200e7f6c..9d6c2d5908 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -3,7 +3,7 @@ package io.onedev.server.product;public class Test {@org.junit.Test- public void test() throws Exception {+ public void test() throws Exception {}}