The Unified and Autonomous Development Platform
feat: Save uploaded avatar as png instead of jpg to avoid quality loss (OD-2594)
Robin Shenecace0afe370
diff --git a/pom.xml b/pom.xmlindex 2a84713054..5e83e946f6 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.2.3</version></parent><artifactId>server</artifactId>- <version>13.0.9</version>+ <version>13.0.10</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex f81f994aec..eb11f8c083 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.9</version>+ <version>13.0.10</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.javaindex 944498913e..a6b765b2b0 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java@@ -24,8 +24,8 @@ public class AvatarGenerator {ImmutableSet.copyOf(localGraphics.getAvailableFontFamilyNames());}- private static final int DEFAULT_WIDTH = 256;- private static final int DEFAULT_HEIGHT = 256;+ private static final int DEFAULT_WIDTH = 240;+ private static final int DEFAULT_HEIGHT = 240;private static final String DEFAULT_FONT = "Helvetica";private static final int VERSION = 1;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.javaindex afcd1f7744..ae3552a957 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@@ -18,9 +18,9 @@ public interface AvatarService {void useProjectAvatar(Long projectId, @Nullable String avatarData);- File getUserUploadedFile(Long userId);+ File getUserUploadedFile(Long userId, @Nullable String extension);- File getProjectUploadedFile(Long projectId);+ File getProjectUploadedFile(Long projectId, @Nullable String extension);void copyProjectAvatar(Long fromProjectId, Long toProjectId);diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.javaindex 51c9e7d1a5..c331c1278b 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java@@ -61,6 +61,10 @@ public class DefaultAvatarService implements AvatarService, Serializable {return new ManagedSerializedForm(AvatarService.class);}+ private String getFileExtension(File file) {+ return StringUtils.substringAfterLast(file.getName(), ".");+ }+@Overridepublic String getUserAvatarUrl(Long userId) {if (userId.equals(User.UNKNOWN_ID)) {@@ -68,9 +72,9 @@ public class DefaultAvatarService implements AvatarService, Serializable {} else if (userId.equals(User.SYSTEM_ID)) {return AVATARS_BASE_URL + "onedev.png";} else {- File uploadedFile = getUserUploadedFile(userId);+ File uploadedFile = getUserUploadedFile(userId, null);if (uploadedFile.exists())- return AVATARS_BASE_URL + "uploaded/users/" + userId + ".jpg?version=" + uploadedFile.lastModified();+ return AVATARS_BASE_URL + "uploaded/users/" + userId + "." + getFileExtension(uploadedFile) + "?version=" + uploadedFile.lastModified();EmailAddressFacade emailAddress = emailAddressService.findPrimaryFacade(userId);UserFacade user = userService.findFacadeById(userId);@@ -154,8 +158,17 @@ public class DefaultAvatarService implements AvatarService, Serializable {}@Override- public File getUserUploadedFile(Long userId) {- return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/users/" + userId + ".jpg");+ public File getUserUploadedFile(Long userId, String extension) {+ var pathSegments = "assets/avatars/uploaded/users/";+ if (extension != null) {+ return new File(Bootstrap.getSiteDir(), pathSegments + userId + "." + extension);+ } else {+ var file = new File(Bootstrap.getSiteDir(), pathSegments + userId + ".png");+ if (file.exists())+ return file;+ else+ return new File(Bootstrap.getSiteDir(), pathSegments + userId + ".jpg");+ }}private String getUserUploadedLockName(Long userId) {@@ -165,18 +178,26 @@ public class DefaultAvatarService implements AvatarService, Serializable {@Overridepublic void useUserAvatar(Long userId, String avatarData) {clusterService.runOnAllServers(() -> write(getUserUploadedLockName(userId), () -> {- File avatarFile = getUserUploadedFile(userId);+ File avatarFile = getUserUploadedFile(userId, "png");createDir(avatarFile.getParentFile());- writeToFile(avatarFile, avatarData);+ if (avatarData != null) {+ writeToFile(avatarFile, avatarData);+ } else {+ if (avatarFile.exists())+ FileUtils.deleteFile(avatarFile);+ avatarFile = getUserUploadedFile(userId, "jpg");+ if (avatarFile.exists())+ FileUtils.deleteFile(avatarFile);+ }return null;}));}@Overridepublic String getProjectAvatarUrl(Long projectId) {- File avatarFile = getProjectUploadedFile(projectId);+ File avatarFile = getProjectUploadedFile(projectId, null);if (avatarFile.exists())- return AVATARS_BASE_URL + "uploaded/projects/" + projectId + ".jpg?version=" + avatarFile.lastModified();+ return AVATARS_BASE_URL + "uploaded/projects/" + projectId + "." + getFileExtension(avatarFile) + "?version=" + avatarFile.lastModified();elsereturn AVATARS_BASE_URL + "project.png";}@@ -184,16 +205,33 @@ public class DefaultAvatarService implements AvatarService, Serializable {@Overridepublic void useProjectAvatar(Long projectId, String avatarData) {clusterService.runOnAllServers(() -> write(getProjectUploadedLockName(projectId), () -> {- File avatarFile = getProjectUploadedFile(projectId);+ File avatarFile = getProjectUploadedFile(projectId, "png");createDir(avatarFile.getParentFile());- writeToFile(avatarFile, avatarData);+ if (avatarData != null) {+ writeToFile(avatarFile, avatarData);+ } else {+ if (avatarFile.exists())+ FileUtils.deleteFile(avatarFile);+ avatarFile = getProjectUploadedFile(projectId, "jpg");+ if (avatarFile.exists())+ FileUtils.deleteFile(avatarFile);+ }return null;}));}@Override- public File getProjectUploadedFile(Long projectId) {- return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/projects/" + projectId + ".jpg");+ public File getProjectUploadedFile(Long projectId, String extension) {+ var pathSegments = "assets/avatars/uploaded/projects/";+ if (extension != null) {+ return new File(Bootstrap.getSiteDir(), pathSegments + projectId + "." + extension);+ } else {+ var file = new File(Bootstrap.getSiteDir(), pathSegments + projectId + ".png");+ if (file.exists())+ return file;+ else+ return new File(Bootstrap.getSiteDir(), pathSegments + projectId + ".jpg");+ }}private String getProjectUploadedLockName(Long projectId) {@@ -203,10 +241,10 @@ public class DefaultAvatarService implements AvatarService, Serializable {@Overridepublic void copyProjectAvatar(Long fromProjectId, Long toProjectId) {clusterService.runOnAllServers(() -> {- var fromFile = getProjectUploadedFile(fromProjectId);- var toFile = getProjectUploadedFile(toProjectId);+ var fromFile = getProjectUploadedFile(fromProjectId, null);+ var toFile = getProjectUploadedFile(toProjectId, getFileExtension(fromFile));var readLockName = getProjectUploadedLockName(fromProjectId);- if (read(readLockName, () -> fromFile.exists())) {+ if (fromFile.exists()) {var tempFile = new File(toFile.getParentFile(), UUID.randomUUID().toString());try {read(readLockName, () -> {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.javaindex fbc1d752d2..e06bd4822b 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,6 @@ import java.io.ByteArrayInputStream;import java.io.File;import java.io.IOException;-import org.jspecify.annotations.Nullable;import javax.imageio.ImageIO;import javax.xml.bind.DatatypeConverter;@@ -22,7 +21,6 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -71,17 +69,13 @@ public class AvatarUploadField extends FormComponentPanel<String> {setConvertedInput(dataField.getConvertedInput());}- public static void writeToFile(File file, @Nullable String avatarData) {- if (avatarData != null) {- byte[] imageBytes = DatatypeConverter.parseBase64Binary(StringUtils.substringAfter(avatarData, ","));- try {- BufferedImage image = ImageIO.read(new ByteArrayInputStream(imageBytes));- ImageIO.write(image, "jpeg", file);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else if (file.exists()) {- FileUtils.deleteFile(file);+ public static void writeToFile(File file, String avatarData) {+ byte[] imageBytes = DatatypeConverter.parseBase64Binary(StringUtils.substringAfter(avatarData, ","));+ try {+ BufferedImage image = ImageIO.read(new ByteArrayInputStream(imageBytes));+ ImageIO.write(image, "png", file);+ } catch (IOException e) {+ throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.javaindex 5a373cb06f..4cf0876421 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java@@ -50,7 +50,7 @@ public class AvatarEditPanel extends GenericPanel<User> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAvatarService().getUserUploadedFile(getUser().getId()).exists());+ setVisible(getAvatarService().getUserUploadedFile(getUser().getId(), null).exists());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex e7719c639d..76cad1388a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -2,6 +2,8 @@ package io.onedev.server.web.page.project.setting.avatar;import static io.onedev.server.web.translation.Translation._T;+import javax.inject.Inject;+import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;@@ -21,16 +23,15 @@ import io.onedev.server.web.page.project.setting.ProjectSettingPage;public class AvatarEditPage extends ProjectSettingPage {+ @Inject+ private AvatarService avatarService;+private String uploadedAvatarData;public AvatarEditPage(PageParameters params) {super(params);}- private AvatarService getAvatarService() {- return OneDev.getInstance(AvatarService.class);- }-@Overrideprotected void onInitialize() {super.onInitialize();@@ -42,12 +43,12 @@ public class AvatarEditPage extends ProjectSettingPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAvatarService().getProjectUploadedFile(getProject().getId()).exists());+ setVisible(avatarService.getProjectUploadedFile(getProject().getId(), null).exists());}@Overridepublic void onClick() {- getAvatarService().useProjectAvatar(getProject().getId(), null);+ avatarService.useProjectAvatar(getProject().getId(), null);setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getProject()));}diff --git a/server-ee b/server-eeindex 6ee966cf6f..fc8f4fad4f 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 6ee966cf6f50eb9754d8aca94b0a03889bbfa9b4+Subproject commit fc8f4fad4f001fce72b1f6805383e0b0951dd17adiff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 65d236f965..850197da9e 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 387592c9a0..9fd5b95033 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.9</version>+ <version>13.0.10</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 70ef34d2f3..973da78e00 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.9</version>+ <version>13.0.10</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 94daedb96a..347d96a4cb 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.9</version>+ <version>13.0.10</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 ab2160e1c2..e4f741b3e0 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xmlindex d75ed0c8d1..b7763d5176 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-golang/pom.xml b/server-plugin/server-plugin-buildspec-golang/pom.xmlindex a3fa735bb1..cad58af999 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 3272850f2a..fd863ec093 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 64868f98b0..78d20bcf0b 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex d6b10b5136..6b096e84e3 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.9</version>+ <version>13.0.10</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 b31c73a403..bb6ee7a552 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xmlindex ac19482a39..b2f72c35bc 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 451d9c9f2e..3267eeaae7 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.9</version>+ <version>13.0.10</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 8c6425931c..6132e08710 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex f690a7d529..e1d48bfb36 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 31213d516c..8796534b3a 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.9</version>+ <version>13.0.10</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 9dbd63800a..dbdc07fd65 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.9</version>+ <version>13.0.10</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 2f21297d61..4aea87acad 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.9</version>+ <version>13.0.10</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 346ffcf794..6beb6d2c2b 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.9</version>+ <version>13.0.10</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 10532f6b27..52b5870c65 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.9</version>+ <version>13.0.10</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 7ad36b4869..655137e0e6 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.9</version>+ <version>13.0.10</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 9d51bf0a4b..0e9ee7fb7e 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.9</version>+ <version>13.0.10</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 26f817294a..5fd5e463a8 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.9</version>+ <version>13.0.10</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 058220d349..5f21b3f030 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.9</version>+ <version>13.0.10</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 0ac54b4817..f10bd4f865 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.9</version>+ <version>13.0.10</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 6584a5e5f9..ad9096a984 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.9</version>+ <version>13.0.10</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 9162ee5dc9..452c71ed67 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.9</version>+ <version>13.0.10</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 10e159dc5f..c278ef33c2 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.9</version>+ <version>13.0.10</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 f0af982a74..5ab83b1dee 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.9</version>+ <version>13.0.10</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 383bcbf5aa..1e04d51ee2 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.9</version>+ <version>13.0.10</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 07c7a997a2..22ef8d8185 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xmlindex 61ed597cd6..3384ff1adf 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xmlindex 6bcbbb48b3..7d6f72c6d2 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xmlindex 3ff4de0add..e1ff9e0a26 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xmlindex dbc759aec7..861029eb94 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xmlindex 53a748e583..3dc24ff6b8 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xmlindex 6f98af2975..e6fbea399e 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 1b46666025..8fd798d684 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clippy/pom.xml b/server-plugin/server-plugin-report-clippy/pom.xmlindex 14c2c915ce..5ae31cf483 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 1728dec1d3..c31f817dc9 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xmlindex 5c73c09934..5c79888163 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex bd2e4f68b2..91c814e3fc 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.9</version>+ <version>13.0.10</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 7865841376..54fdf3712c 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cppcheck/pom.xml b/server-plugin/server-plugin-report-cppcheck/pom.xmlindex 79b99ae54c..a2695d968b 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xmlindex a8935124cb..550eca7141 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex d2fbb45f38..2eb48f45cf 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.9</version>+ <version>13.0.10</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 f31475e7ba..7618014cba 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 292d5959d8..790f9a477a 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 34bcae0b60..f7aeaab3a6 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex d9913cb146..114bcc5c0b 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.9</version>+ <version>13.0.10</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 f84f510411..36df32a12a 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex c1fdf14131..caa9ca3702 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 33dd99f6d3..6b5d272b9e 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.9</version>+ <version>13.0.10</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 2230460fcb..d6692ce100 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xmlindex 9b99ae2665..3a66203bed 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-ruff/pom.xml b/server-plugin/server-plugin-report-ruff/pom.xmlindex 3048325d17..055021a07f 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex d7f0d9cb93..381fdc2211 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xmlindex e86986c6ed..5a2ea45205 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 4bf050da1f..66152cb575 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.9</version>+ <version>13.0.10</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 20cee9e54b..fa44b02ace 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.9</version>+ <version>13.0.10</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 9d2ed02294..5252db556a 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.9</version>+ <version>13.0.10</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex a56e997893..1ec5ef118c 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.9</version>+ <version>13.0.10</version></parent><dependencies><dependency>diff --git a/server-product/system/site/assets/avatars/onedev.png b/server-product/system/site/assets/avatars/onedev.pngindex 86c524ec12..bdf45e1a43 100644Binary files a/server-product/system/site/assets/avatars/onedev.png and b/server-product/system/site/assets/avatars/onedev.png differdiff --git a/server-product/system/site/assets/avatars/project.png b/server-product/system/site/assets/avatars/project.pngindex 047e5ee984..2ee2743a1e 100644Binary files a/server-product/system/site/assets/avatars/project.png and b/server-product/system/site/assets/avatars/project.png differ