Skip to content

The Unified and Autonomous Development Platform

chore: Update dependencies

Robin Shenc09c256ceaa9
diff --git a/e2e-test/README.md b/e2e-test/README.md
index efba13ce9e..7af1fe0a96 100644
--- a/e2e-test/README.md
+++ b/e2e-test/README.md
@@ -55,6 +55,25 @@ E2E_SKIP_WEBSERVER=1 E2E_BASE_URL=https://onedev.example.com npm test
For local debugging, `npm run test:headed` opens the browser and
`npm run test:ui` starts Playwright's interactive test runner.
+## SSH cloning
+
+`tests/ssh-clone.spec.js` requires Git, OpenSSH (`ssh` and `ssh-keygen`),
+and a reachable SSH service at the server's advertised SSH clone URL (port 6611
+by default). Its SSH fixture waits up to 60 seconds for a TCP connection to the
+host and port in that URL, after HTTP readiness. This also supports custom SSH
+ports without making other tests depend on SSH.
+
+It tests Ed25519 and 3072-bit RSA keys, with separate RSA cases
+forcing SHA-256 and SHA-512 signatures. Each case generates a temporary key,
+checks that cloning fails before registration, registers the key for a test user
+with the Code Reader role, then clones and verifies the checked-out content and
+commit. SSH is isolated from local keys, agents and configuration. Temporary keys, checkouts,
+users and projects are cleaned up.
+
+```bash
+npm test -- tests/ssh-clone.spec.js
+```
+
## Application-relative redirects
`tests/redirect-request-handler.spec.js` exercises `RedirectRequestHandler` via
diff --git a/e2e-test/tests/ssh-clone.spec.js b/e2e-test/tests/ssh-clone.spec.js
new file mode 100644
index 0000000000..2529859241
--- /dev/null
+++ b/e2e-test/tests/ssh-clone.spec.js
@@ -0,0 +1,92 @@
+import { execFile } from 'node:child_process';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import net from 'node:net';
+import os from 'node:os';
+import path from 'node:path';
+import { promisify } from 'node:util';
+import { expect, test as base } from './fixtures.js';
+
+const exec = promisify(execFile);
+const quote = value => `'${value.replaceAll("'", "'\\''")}'`;
+
+const test = base.extend({
+ sshProject: async ({ api }, use) => {
+ const project = await api.createProject();
+ const { ssh: cloneUrl } = await api.json('get', `~api/projects/${project.id}/clone-url`);
+ const url = new URL(cloneUrl);
+ expect(url.protocol).toBe('ssh:');
+ // HTTP readiness can precede the SystemStarted listener that binds SSH.
+ await expect(async () => {
+ await new Promise((resolve, reject) => {
+ const socket = net.createConnection({
+ host: url.hostname.replace(/^\[|\]$/g, ''), port: Number(url.port || 22),
+ });
+ const finish = error => {
+ socket.destroy();
+ if (error) reject(error);
+ else resolve();
+ };
+ socket.once('connect', () => finish());
+ socket.once('error', finish);
+ socket.setTimeout(5000, () => finish(new Error(`Timed out connecting to ${url.host}`)));
+ });
+ }, `SSH should listen at ${url.host}`).toPass({ timeout: 60000, intervals: [250, 500, 1000] });
+ await use({ ...project, cloneUrl });
+ },
+});
+
+for (const { name, keyType, keyArgs, signatureAlgorithm } of [
+ { name: 'Ed25519', keyType: 'ed25519', keyArgs: [], signatureAlgorithm: 'ssh-ed25519' },
+ { name: 'RSA with SHA-256', keyType: 'rsa', keyArgs: ['-b', '3072'], signatureAlgorithm: 'rsa-sha2-256' },
+ { name: 'RSA with SHA-512', keyType: 'rsa', keyArgs: ['-b', '3072'], signatureAlgorithm: 'rsa-sha2-512' },
+]) {
+test(`clones over SSH using ${name}`, async ({ api, sshProject: project }) => {
+ const user = await api.createUser();
+ await api.authorizeUser(project, user, 'Code Reader');
+ const content = `# Cloned with ${name}\n`;
+ const commit = await api.putFile(project, 'README.md', content);
+ const { cloneUrl } = project;
+
+ const directory = await mkdtemp(path.join(os.tmpdir(), 'onedev-ssh-'));
+ try {
+ const key = path.join(directory, `id_${keyType}`);
+ await exec('ssh-keygen', ['-q', '-t', keyType, ...keyArgs, '-N', '', '-f', key], { timeout: 30000 });
+ const publicKey = await readFile(`${key}.pub`, 'utf8');
+ expect(publicKey.startsWith(`ssh-${keyType} `)).toBeTruthy();
+
+ // Isolate SSH from the developer's keys, agent, configuration and known hosts.
+ // Only this key and signature algorithm may authenticate; no credential fallback.
+ const sshCommand = [
+ 'ssh', '-F', '/dev/null', '-i', key,
+ '-o', 'IdentityAgent=none', '-o', 'IdentitiesOnly=yes', '-o', 'BatchMode=yes',
+ '-o', 'PreferredAuthentications=publickey', '-o', `PubkeyAcceptedAlgorithms=${signatureAlgorithm}`,
+ '-o', 'StrictHostKeyChecking=accept-new',
+ '-o', `UserKnownHostsFile=${path.join(directory, 'known_hosts')}`,
+ '-o', 'GlobalKnownHostsFile=/dev/null', '-o', 'ConnectTimeout=10',
+ ].map(quote).join(' ');
+ const options = {
+ timeout: 30000,
+ env: {
+ ...process.env, GIT_SSH_COMMAND: sshCommand, GIT_SSH_VARIANT: 'ssh',
+ GIT_TERMINAL_PROMPT: '0', GIT_CONFIG_NOSYSTEM: '1', GIT_CONFIG_GLOBAL: '/dev/null',
+ },
+ };
+
+ // An unregistered key must fail, proving the clone cannot use ambient credentials.
+ await expect(exec('git', ['clone', '--branch', 'main', cloneUrl,
+ path.join(directory, 'unauthorized')], options)).rejects.toMatchObject({
+ stderr: expect.stringContaining('Permission denied (publickey)'),
+ });
+
+ // Deleting the fixture user also deletes this key.
+ await api.json('post', '~api/ssh-keys', { data: { ownerId: user.id, content: publicKey } });
+ const checkout = path.join(directory, 'checkout');
+ await exec('git', ['clone', '--branch', 'main', cloneUrl, checkout], options);
+ expect(await readFile(path.join(checkout, 'README.md'), 'utf8')).toBe(content);
+ const { stdout } = await exec('git', ['-C', checkout, 'rev-parse', 'HEAD'], options);
+ expect(stdout.trim()).toBe(commit.commitHash);
+ } finally {
+ await rm(directory, { recursive: true, force: true });
+ }
+});
+}
diff --git a/pom.xml b/pom.xml
index e88e9e62b0..9603b52f9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.4.0</version>
</parent>
<artifactId>server</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@@ -554,6 +554,12 @@
<artifactId>natty</artifactId>
<version>0.13</version>
</dependency>
+ <dependency>
+ <!-- Use Lang 3 while retaining API compatibility with Natty 0.13. -->
+ <groupId>org.mnode.ical4j</groupId>
+ <artifactId>ical4j</artifactId>
+ <version>2.2.7</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
@@ -634,11 +640,6 @@
<artifactId>org.eclipse.jgit.archive</artifactId>
<version>${jgit.version}</version>
</dependency>
- <dependency>
- <groupId>net.i2p.crypto</groupId>
- <artifactId>eddsa</artifactId>
- <version>0.3.0</version>
- </dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
@@ -723,10 +724,10 @@
</repository>
</repositories>
<properties>
- <commons.version>4.2.6</commons.version>
- <agent.version>3.3.6</agent.version>
+ <commons.version>4.2.7</commons.version>
+ <agent.version>3.3.7</agent.version>
<slf4j.version>2.0.17</slf4j.version>
- <logback.version>1.4.14</logback.version>
+ <logback.version>1.5.33</logback.version>
<antlr.version>4.13.2</antlr.version>
<jetty.version>12.1.13</jetty.version>
<wicket.version>10.11.0</wicket.version>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index d4cfdaef78..4f55fbe93a 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<build>
<plugins>
@@ -50,6 +50,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -260,10 +264,6 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</dependency>
- <dependency>
- <groupId>net.i2p.crypto</groupId>
- <artifactId>eddsa</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
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 6555e1e94b..6c7d1e625e 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
@@ -6,6 +6,7 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Stack;
import java.util.stream.Collectors;
@@ -22,7 +23,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java
index d843bdbe05..99a278464c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java
@@ -1,11 +1,11 @@
package io.onedev.server.buildspec.job.projectdependency;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
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 0b05ffec32..dcece88459 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
@@ -1,6 +1,5 @@
package io.onedev.server.buildspec.job.projectdependency;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ChoiceProvider;
@@ -23,6 +22,7 @@ import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
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 1e087a1e71..4785f7851f 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
@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 ad978f3038..b43c5009fe 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
@@ -10,7 +10,7 @@ import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.java.JavaEscape;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java
index 176317fa7a..dbab24f6d7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java
@@ -1,12 +1,12 @@
package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import jakarta.validation.ValidationException;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
index e6bd54b3d3..320f43fe9c 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
@@ -1,6 +1,7 @@
package io.onedev.server.buildspecmodel.inputspec.choiceinput;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -9,7 +10,6 @@ import jakarta.validation.Validator;
import org.jspecify.annotations.Nullable;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
index 9905d5c8aa..0d515d9302 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
@@ -1,9 +1,9 @@
package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider;
+import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.service.GroupService;
import io.onedev.server.model.Group;
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java
index 71a39e680e..16956d810e 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java
@@ -9,6 +9,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -37,7 +38,6 @@ import org.yaml.snakeyaml.representer.Representer;
import org.yaml.snakeyaml.resolver.Resolver;
import org.yaml.snakeyaml.serializer.Serializer;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ImplementationRegistry;
import io.onedev.commons.utils.ClassUtils;
import io.onedev.commons.utils.ExplicitException;
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 62e6b53925..3e47351b60 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
@@ -5,6 +5,7 @@ import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -13,7 +14,6 @@ import jakarta.ws.rs.core.MultivaluedMap;
import org.jspecify.annotations.Nullable;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.exception.handler.ExceptionHandler;
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
index 9c65dc9dca..d9698d3f5b 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
@@ -8,7 +8,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
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 50af50c00f..d5cc937903 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
@@ -27,6 +27,7 @@ import static java.util.stream.Collectors.toList;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -70,7 +71,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
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 4ae3de6d63..e086e73eaa 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
@@ -13,6 +13,7 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -43,7 +44,6 @@ import org.jspecify.annotations.Nullable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.MoreObjects;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.DependsOn;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java
index a168b52388..decd5ac176 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java
@@ -1,12 +1,12 @@
package io.onedev.server.model.support.administration;
import java.io.Serializable;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import jakarta.validation.constraints.NotEmpty;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.service.ProjectService;
import io.onedev.server.annotation.ChoiceProvider;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
index eddba06ad0..d99eaa7810 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
@@ -3,6 +3,7 @@ package io.onedev.server.model.support.administration;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -11,7 +12,6 @@ import java.util.stream.Collectors;
import jakarta.validation.Valid;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
index 803bd7e547..75dfec46cd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
@@ -2,11 +2,11 @@ package io.onedev.server.model.support.build;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
import io.onedev.server.service.BuildService;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java
index 766d6eebef..7efb2be5cf 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java
@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issue.field.instance;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,7 +11,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import jakarta.validation.constraints.NotEmpty;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.Build;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.annotation.Editable;
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 34e8685e82..373e29735a 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
@@ -1,6 +1,5 @@
package io.onedev.server.model.support.role;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
@@ -13,6 +12,7 @@ import org.jspecify.annotations.Nullable;
import jakarta.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
@Editable
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java
index 3586d2956b..0637c24d4f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java
@@ -37,7 +37,7 @@ import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
import org.jspecify.annotations.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
index b7b4bc6507..c55e901ef4 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java
@@ -30,7 +30,7 @@ import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
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 acc488965e..e4425f2e25 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
@@ -22,7 +22,7 @@ import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.Strings;
import org.eclipse.jetty.websocket.api.Session;
import io.onedev.server.persistence.dao.Restrictions;
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 171ef4979a..8a443109d8 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
@@ -1,6 +1,5 @@
package io.onedev.server.service.impl;
-import static edu.emory.mathcs.backport.java.util.Collections.sort;
import static io.onedev.commons.utils.LockUtils.read;
import static io.onedev.commons.utils.LockUtils.write;
import static io.onedev.k8shelper.KubernetesHelper.BEARER;
@@ -25,6 +24,7 @@ import static io.onedev.server.util.SiteSyncUtils.isVersionFile;
import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;
import static java.lang.Long.valueOf;
import static java.util.Arrays.asList;
+import static java.util.Collections.sort;
import java.io.BufferedOutputStream;
import java.io.File;
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 9f2be985c6..e0013c0785 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
@@ -11,6 +11,7 @@ import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,7 +53,6 @@ import com.hazelcast.map.IMap;
import dev.langchain4j.data.message.SystemMessage;
import dev.langchain4j.data.message.UserMessage;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java
index 2fa709d0f1..7938e1f9a2 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java
@@ -7,6 +7,7 @@ import static io.onedev.server.model.Project.PROP_TIME_TRACKING;
import static java.util.stream.Collectors.toSet;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -22,7 +23,6 @@ import org.apache.shiro.subject.Subject;
import io.onedev.server.persistence.dao.Restrictions;
import org.hibernate.query.Query;
-import edu.emory.mathcs.backport.java.util.Arrays;
import io.onedev.server.service.IssueFieldService;
import io.onedev.server.service.IssueService;
import io.onedev.server.service.IssueWorkService;
@@ -51,7 +51,6 @@ public class DefaultIssueWorkService extends BaseEntityService<IssueWork> implem
dao.persist(work);
}
- @SuppressWarnings("unchecked")
@Sessional
@Override
public List<IssueWork> query(Subject subject, ProjectScope projectScope, EntityQuery<Issue> issueQuery, Date fromDate, Date toDate) {
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 b59063cbbc..eedf6961ed 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
@@ -3,6 +3,7 @@ package io.onedev.server.util.criteria;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -23,7 +24,6 @@ import org.apache.lucene.search.Query;
import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.RangeBuilder;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
index 41595749dc..f6eb23153a 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.behavior;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -12,7 +13,6 @@ import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
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 53d91f633c..59df72bba7 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
@@ -3,6 +3,7 @@ package io.onedev.server.web.behavior;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -13,7 +14,6 @@ import org.jspecify.annotations.Nullable;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputSuggestion;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
index da0f262594..f4c9fda89b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
@@ -2,8 +2,6 @@ package io.onedev.server.web.component.commandpalette;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import edu.emory.mathcs.backport.java.util.Arrays;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.PathUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.match.PathMatcher;
@@ -50,7 +48,6 @@ import static io.onedev.server.web.translation.Translation._T;
import java.lang.reflect.Field;
import java.util.*;
-@SuppressWarnings("unchecked")
public abstract class CommandPalettePanel extends Panel {
private static final int PAGE_SIZE = 100;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
index 7e09816567..970d9fcea7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Session;
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/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 5914a512df..dfb1352176 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
@@ -14,6 +14,7 @@ import java.io.OutputStreamWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -70,7 +71,6 @@ import org.jspecify.annotations.Nullable;
import com.google.common.collect.Sets;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.Input;
@@ -948,7 +948,7 @@ public abstract class IssueListPanel extends Panel {
@Override
protected IssueQuery getIssueQuery() {
if (queryModel.getObject() != null)
- return (IssueQuery) queryModel.getObject();
+ return queryModel.getObject();
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
index 46aba71592..54c0d6d792 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
@@ -11,6 +11,7 @@ import static java.util.Comparator.comparing;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -31,7 +32,6 @@ import org.unbescape.html.HtmlEscape;
import com.google.common.collect.Sets;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.PullRequest;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index 86ddbf3421..aa76be69b3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.json.JSONException;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index 6de3830272..216c09f7c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -10,7 +10,7 @@ import java.util.Map;
import jakarta.inject.Inject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java
index 1367eadff5..c63fb1d906 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.editable;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
@@ -9,7 +10,6 @@ import java.util.Set;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import edu.emory.mathcs.backport.java.util.Collections;
@Singleton
public class DefaultEditSupportRegistry implements EditSupportRegistry {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
index f13ac28c65..fea24c608b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.editable.parentchoice;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -12,7 +13,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.service.ProjectService;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
index 5eab51c3e6..04b5d89700 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.admin.buildsetting.agent;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -23,7 +24,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.service.AgentTokenService;
import io.onedev.server.service.AuditService;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
index 0732b20361..2e18345a0f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java
@@ -7,7 +7,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Session;
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/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
index c38a91a574..99fc6af459 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
@@ -15,6 +15,7 @@ import java.lang.reflect.Parameter;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
@@ -47,7 +48,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ImplementationRegistry;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.WordUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
index 88f8f74a26..84893445f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.my.gpgkeys;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.Component;
@@ -11,7 +12,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.GpgKey;
import io.onedev.server.model.User;
import io.onedev.server.web.component.modal.ModalLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index da8b43fd85..9e0d47c48a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -4,6 +4,7 @@ import static io.onedev.server.ai.ToolUtils.wrapForChat;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
@@ -36,7 +37,6 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.collect.Lists;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.ai.ChatTool;
import io.onedev.server.ai.ChatToolAware;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
index 306e45b5b4..2f88b881b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.user.gpgkeys;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.Component;
@@ -8,7 +9,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.GpgKey;
import io.onedev.server.model.User;
import io.onedev.server.web.component.modal.ModalLink;
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 40c5e01bd7..f82a72ca2b 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
@@ -10,6 +10,7 @@ import java.nio.file.Paths;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -25,7 +26,6 @@ import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java
index 2cfc219392..4fdb3c0b94 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java
@@ -15,7 +15,7 @@ import java.util.Map;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server-core/src/main/resources/ical4j.properties b/server-core/src/main/resources/ical4j.properties
new file mode 100644
index 0000000000..0f6aefc884
--- /dev/null
+++ b/server-core/src/main/resources/ical4j.properties
@@ -0,0 +1,2 @@
+# Natty's calendar parsing only needs a local time-zone cache.
+net.fortuna.ical4j.timezone.cache.impl=net.fortuna.ical4j.util.MapTimeZoneCache
diff --git a/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.java
new file mode 100644
index 0000000000..871e8d2c47
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.java
@@ -0,0 +1,48 @@
+package io.onedev.server.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+public class DateUtilsTest {
+
+ @Test
+ public void testRelaxedDateExamples() {
+ for (var zone : List.of("UTC", "Asia/Shanghai", "America/New_York")) {
+ for (var example : DateUtils.RELAX_DATE_EXAMPLES)
+ assertNotNull(DateUtils.parseRelaxed(example, ZoneId.of(zone)), example + " in " + zone);
+ }
+ }
+
+ @Test
+ public void testCalendarBasedDates() {
+ // Holidays and seasons exercise Natty's binary compatibility with iCal4j.
+ // Its bundled season calendar only covers dates through 2020.
+ for (var zone : List.of("UTC", "Asia/Shanghai", "America/New_York")) {
+ assertDate("Christmas 2018", "2018-12-25", zone);
+ assertDate("Thanksgiving 2018", "2018-11-22", zone);
+ assertDate("winter 2018", "2018-12-21", zone);
+ assertDate("summer 2018", "2018-06-21", zone);
+ }
+ }
+
+ @Test
+ public void testUnrecognizedDate() {
+ assertNull(DateUtils.parseRelaxed("not a date", ZoneId.of("UTC")));
+ }
+
+ private void assertDate(String input, String expected, String zone) {
+ var zoneId = ZoneId.of(zone);
+ var date = DateUtils.parseRelaxed(input, zoneId);
+ assertNotNull(date, input + " in " + zone);
+ assertEquals(LocalDate.parse(expected), date.toInstant().atZone(zoneId).toLocalDate(),
+ input + " in " + zone);
+ }
+
+}
diff --git a/server-ee b/server-ee
index 953e26dca1..b202329e1f 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 953e26dca1a50b34c4645a6e4ddabb8e94d7b28f
+Subproject commit b202329e1faa6739ad87b7b1500648b8d2965e56
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 6f7e8c5477..b905ca0e7d 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index 09a3209d08..4945952674 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>16.8.5</version>
+ <version>16.8.6</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 606c65e201..6478a267a9 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>16.8.5</version>
+ <version>16.8.6</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.xml
index dd6b5e1607..b8f7c76562 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>16.8.5</version>
+ <version>16.8.6</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 8ba03409d1..d5c8f7a85d 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>16.8.5</version>
+ <version>16.8.6</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 171299d34e..d2ce353bef 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>16.8.5</version>
+ <version>16.8.6</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 4429c1c05b..5b65101f1b 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>16.8.5</version>
+ <version>16.8.6</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 0d34964160..c9faaf299f 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>16.8.5</version>
+ <version>16.8.6</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 537c5224cb..59fed9a957 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>16.8.5</version>
+ <version>16.8.6</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 3de5e320f9..f9cff89887 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>16.8.5</version>
+ <version>16.8.6</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.xml
index 4752f9beee..52d75a8941 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xml
index 1a825813ab..ea8ed51979 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>16.8.5</version>
+ <version>16.8.6</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 49523c8ee8..30c001ebce 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>16.8.5</version>
+ <version>16.8.6</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.xml
index c9ea61999b..55d2ebea9f 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>16.8.5</version>
+ <version>16.8.6</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 f82abf71ee..450432f376 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>16.8.5</version>
+ <version>16.8.6</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 3337bf41c2..3bdc0ae771 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>16.8.5</version>
+ <version>16.8.6</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.xml
index eaab10025b..a5a6dc211b 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index bcd7bf0320..246db4e5d2 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -26,7 +26,7 @@ import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
import io.onedev.agent.job.JobUtils;
import io.onedev.commons.bootstrap.Bootstrap;
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index 74197a0817..11a8a8c1ad 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>16.8.5</version>
+ <version>16.8.6</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 c1bd42276a..1d0ae928ab 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>16.8.5</version>
+ <version>16.8.6</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 8e57bf0d00..9ed32adfeb 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
@@ -8,6 +8,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -40,7 +41,6 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.bootstrap.SecretMasker;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index 8085e5ed2f..a971b8a1ab 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>16.8.5</version>
+ <version>16.8.6</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 829179a1cf..9f11c3056c 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
@@ -6,6 +6,7 @@ import java.net.URISyntaxException;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -37,7 +38,6 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.bootstrap.SecretMasker;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index b3b60b8d11..b484c042fe 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>16.8.5</version>
+ <version>16.8.6</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 b5e35a5888..1b011542ef 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
@@ -8,6 +8,7 @@ import java.net.URISyntaxException;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -40,7 +41,6 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.bootstrap.SecretMasker;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index 41d21a592e..16e1150eee 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>16.8.5</version>
+ <version>16.8.6</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.xml
index b4d6697f2b..6ded219344 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>16.8.5</version>
+ <version>16.8.6</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.xml
index 882fafedb2..1ae99e85fc 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>16.8.5</version>
+ <version>16.8.6</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/IssueLinkMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java
index 62c8687b31..54759ae2ed 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java
@@ -2,12 +2,12 @@ package io.onedev.server.plugin.imports.youtrack;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.service.LinkSpecService;
import io.onedev.server.model.LinkSpec;
diff --git a/server-plugin/server-plugin-mail-gmail/pom.xml b/server-plugin/server-plugin-mail-gmail/pom.xml
index c3c5e04634..a49f798afd 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>16.8.5</version>
+ <version>16.8.6</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 0de7af10dc..90f2e2495b 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>16.8.5</version>
+ <version>16.8.6</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 a3f424cda8..28a6e88754 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>16.8.5</version>
+ <version>16.8.6</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 f84cfc9541..a267557147 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>16.8.5</version>
+ <version>16.8.6</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 cbefc81ebf..ad40b76a80 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>16.8.5</version>
+ <version>16.8.6</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 7bb7cc7c4c..3b3c4308e2 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
diff --git a/server-plugin/server-plugin-pack-cargo/pom.xml b/server-plugin/server-plugin-pack-cargo/pom.xml
index fb1ea78b53..4af50e150b 100644
--- a/server-plugin/server-plugin-pack-cargo/pom.xml
+++ b/server-plugin/server-plugin-pack-cargo/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-container/pom.xml b/server-plugin/server-plugin-pack-container/pom.xml
index 530e64b0cc..9dc029964a 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xml
index af7717c02b..c9f03464d6 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xml
index 4cd4e60855..80506d00ee 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>16.8.5</version>
+ <version>16.8.6</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 932bcd0422..306a2de005 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xml
index e5586cc6e5..5d20caa2c9 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xml
index b77517deef..308adc8e0e 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xml
index bd2313885c..e87a9f4d39 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-provisioner-serverdocker/pom.xml b/server-plugin/server-plugin-provisioner-serverdocker/pom.xml
index 2f296cfc68..901ccc365e 100644
--- a/server-plugin/server-plugin-provisioner-serverdocker/pom.xml
+++ b/server-plugin/server-plugin-provisioner-serverdocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.provisioner.serverdocker.ServerDockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-provisioner-servershell/pom.xml b/server-plugin/server-plugin-provisioner-servershell/pom.xml
index bba10bcc98..f006e180bb 100644
--- a/server-plugin/server-plugin-provisioner-servershell/pom.xml
+++ b/server-plugin/server-plugin-provisioner-servershell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.provisioner.servershell.ServerShellModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index 383d9f9114..312ccb5a4e 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>16.8.5</version>
+ <version>16.8.6</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 2d3ef620f6..cff7927deb 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 082a30ea5b..1da4628a49 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>16.8.5</version>
+ <version>16.8.6</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 92c9fa7a05..37c5c25988 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>16.8.5</version>
+ <version>16.8.6</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 fb826b0afc..8d69af7a5b 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>16.8.5</version>
+ <version>16.8.6</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/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
index 92b0d2c177..0a517027b4 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.model.Build;
import io.onedev.server.model.CoverageMetric;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.dao.Dao;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.jspecify.annotations.Nullable;
import java.io.*;
diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml
index b2fca6da23..318ced7265 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>16.8.5</version>
+ <version>16.8.6</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 5bf3798154..a94315acc7 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xml
index ab560649fa..b364179e3b 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>16.8.5</version>
+ <version>16.8.6</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 c0925f0f90..f322f14f81 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>16.8.5</version>
+ <version>16.8.6</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 640a3c7c4f..50fdfe45fc 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>16.8.5</version>
+ <version>16.8.6</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 bf54f530dd..15826ee10d 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml
index 98e5acef2c..2f45369d6f 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index 2d7cd3a2f1..ecc0d09f3d 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>16.8.5</version>
+ <version>16.8.6</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.xml
index 0fa553693c..a497751c37 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-playwright/pom.xml b/server-plugin/server-plugin-report-playwright/pom.xml
index ec0d43cbc6..fee117958a 100644
--- a/server-plugin/server-plugin-report-playwright/pom.xml
+++ b/server-plugin/server-plugin-report-playwright/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml
index d5ce0f63b3..74b8640d6d 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>16.8.5</version>
+ <version>16.8.6</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 2a606420a0..aa726e8765 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>16.8.5</version>
+ <version>16.8.6</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.xml
index 0e14205271..4a4a6d7603 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>16.8.5</version>
+ <version>16.8.6</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 4a2e3e04d7..bb65f6bd1d 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>16.8.5</version>
+ <version>16.8.6</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 367dc86530..7f5d85834d 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>16.8.5</version>
+ <version>16.8.6</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 c079b452d3..135377a516 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xml
index 015855987e..49caa5870c 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml
index 351ca55d34..4061669a04 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>16.8.5</version>
+ <version>16.8.6</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.xml
index a80f7b7aaa..a8c2307807 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>16.8.5</version>
+ <version>16.8.6</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/DiscordAuthorizationCodeResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
index 4fcba6778b..c3108185f7 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
@@ -4,8 +4,9 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class DiscordAuthorizationCodeResponse {
private static final String CHARSET = "utf-8";
@@ -39,7 +40,7 @@ public class DiscordAuthorizationCodeResponse {
}
public boolean hasState(String state) {
- return StringUtils.equals(this.state, state);
+ return Objects.equals(this.state, state);
}
private static Map<String,String> parseParameters(final String query) {
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
index c00209a57c..770a0d7200 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
@@ -1,6 +1,6 @@
package io.onedev.server.plugin.sso.discord.oauth2;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -37,7 +37,7 @@ public class AccessTokenResponse extends Response {
}
public boolean hasValidAccessToken() {
- return StringUtils.isNotEmpty(accessToken) && StringUtils.equals(tokenType, VALID_TOKEN_TYPE);
+ return StringUtils.isNotEmpty(accessToken) && VALID_TOKEN_TYPE.equals(tokenType);
}
public String getAccessToken() {
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index cb0e45f3ff..61c0406211 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>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 04e14f015b..6db940323b 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>16.8.5</version>
+ <version>16.8.6</version>
</parent>
<dependencies>
<dependency>