mirror of
https://github.com/theonedev/onedev.git
synced 2025-12-10 10:12:19 -06:00
task: Update minimum required Java version to 17 (OD-2597)
This commit is contained in:
parent
7e77167833
commit
2b9237b8b1
10
pom.xml
10
pom.xml
@ -6,10 +6,10 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<version>1.2.3</version>
|
<version>1.3.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>server</artifactId>
|
<artifactId>server</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
|
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
|
||||||
@ -38,7 +38,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>plugin-maven</artifactId>
|
<artifactId>plugin-maven</artifactId>
|
||||||
<version>2.6.9</version>
|
<version>2.7.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<?m2e execute onConfiguration,onIncremental?>
|
<?m2e execute onConfiguration,onIncremental?>
|
||||||
@ -646,8 +646,8 @@
|
|||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
<properties>
|
<properties>
|
||||||
<commons.version>3.0.15</commons.version>
|
<commons.version>3.1.0</commons.version>
|
||||||
<agent.version>2.2.20</agent.version>
|
<agent.version>2.3.1</agent.version>
|
||||||
<slf4j.version>2.0.9</slf4j.version>
|
<slf4j.version>2.0.9</slf4j.version>
|
||||||
<logback.version>1.4.14</logback.version>
|
<logback.version>1.4.14</logback.version>
|
||||||
<antlr.version>4.7.2</antlr.version>
|
<antlr.version>4.7.2</antlr.version>
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server</artifactId>
|
<artifactId>server</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|||||||
@ -949,7 +949,11 @@ public class Upgrade extends AbstractPlugin {
|
|||||||
|
|
||||||
if (!wrapperConf.contains("-Djdk.io.File.allowDeleteReadOnlyFiles=true")) {
|
if (!wrapperConf.contains("-Djdk.io.File.allowDeleteReadOnlyFiles=true")) {
|
||||||
wrapperConf += lineSeparator() + "wrapper.java.additional.150=-Djdk.io.File.allowDeleteReadOnlyFiles=true";
|
wrapperConf += lineSeparator() + "wrapper.java.additional.150=-Djdk.io.File.allowDeleteReadOnlyFiles=true";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wrapperConf = wrapperConf.replace("wrapper.java.version.min=11", "wrapper.java.version.min=17");
|
||||||
|
wrapperConf = wrapperConf.replace("Java version 11", "Java version 17");
|
||||||
|
wrapperConf = wrapperConf.replace("Java 11 or higher", "Java 17 or higher");
|
||||||
|
|
||||||
var lines = Splitter.on('\n').trimResults().splitToList(wrapperConf);
|
var lines = Splitter.on('\n').trimResults().splitToList(wrapperConf);
|
||||||
if (lines.stream().noneMatch(it -> it.contains("-XX:MaxRAMPercentage"))) {
|
if (lines.stream().noneMatch(it -> it.contains("-XX:MaxRAMPercentage"))) {
|
||||||
|
|||||||
@ -53,6 +53,7 @@ import org.apache.wicket.util.lang.Args;
|
|||||||
*
|
*
|
||||||
* @author Jonathan Locke
|
* @author Jonathan Locke
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("removal")
|
||||||
public final class Strings
|
public final class Strings
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit 65213e9d1b9311a405e047a165846c8976a08534
|
Subproject commit 6e38ee0e81adb8f252982ae2cb07cf7ef7fa19ec
|
||||||
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server</artifactId>
|
<artifactId>server</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>plugin-maven</artifactId>
|
<artifactId>plugin-maven</artifactId>
|
||||||
<version>2.6.9</version>
|
<version>2.7.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<?m2e execute onConfiguration,onIncremental?>
|
<?m2e execute onConfiguration,onIncremental?>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<build>
|
<build>
|
||||||
<resources>
|
<resources>
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>plugin-maven</artifactId>
|
<artifactId>plugin-maven</artifactId>
|
||||||
<version>2.6.9</version>
|
<version>2.7.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<?m2e execute onConfiguration,onIncremental?>
|
<?m2e execute onConfiguration,onIncremental?>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.mail.gmail.GmailModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.mail.gmail.GmailModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.mail.office365.Office365Module</moduleClass>
|
<moduleClass>io.onedev.server.plugin.mail.office365.Office365Module</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.mail.smtpimap.SmtpImapModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.mail.smtpimap.SmtpImapModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server-plugin</artifactId>
|
<artifactId>server-plugin</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
|
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
|
||||||
|
|||||||
@ -8,7 +8,7 @@ COPY agent /agent
|
|||||||
COPY entrypoint-agent.sh /root/bin/entrypoint.sh
|
COPY entrypoint-agent.sh /root/bin/entrypoint.sh
|
||||||
COPY --from=build /usr/bin/docker /usr/local/bin/docker
|
COPY --from=build /usr/bin/docker /usr/local/bin/docker
|
||||||
COPY --from=build /usr/libexec/docker/cli-plugins/docker-buildx /usr/libexec/docker/cli-plugins/docker-buildx
|
COPY --from=build /usr/libexec/docker/cli-plugins/docker-buildx /usr/libexec/docker/cli-plugins/docker-buildx
|
||||||
RUN apt-get update && apt-get install -y locales curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y locales curl git git-lfs openjdk-17-jre-headless && rm -rf /var/lib/apt/lists/*
|
||||||
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||||
locale-gen
|
locale-gen
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
|||||||
@ -7,7 +7,7 @@ FROM ubuntu:24.04
|
|||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
COPY app /app
|
COPY app /app
|
||||||
COPY entrypoint-server.sh /root/bin/entrypoint.sh
|
COPY entrypoint-server.sh /root/bin/entrypoint.sh
|
||||||
RUN apt-get update && apt-get install -y locales iproute2 curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y locales iproute2 curl git git-lfs openjdk-17-jre-headless && rm -rf /var/lib/apt/lists/*
|
||||||
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||||
locale-gen
|
locale-gen
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
|||||||
@ -38,14 +38,14 @@ wrapper.restart.reload_configuration=TRUE
|
|||||||
wrapper.single_invocation=TRUE
|
wrapper.single_invocation=TRUE
|
||||||
|
|
||||||
#********************************************************************
|
#********************************************************************
|
||||||
# Wrapper Java Properties. OneDev requires at least Java version 11
|
# Wrapper Java Properties. OneDev requires at least Java version 17
|
||||||
#********************************************************************
|
#********************************************************************
|
||||||
# Specify Java 11 or higher executable to be used. You may simply specify it
|
# Specify Java 17 or higher executable to be used. You may simply specify it
|
||||||
# as "java" if the one in system path is appropriate, or specify the full path
|
# as "java" if the one in system path is appropriate, or specify the full path
|
||||||
to desired java executable
|
to desired java executable
|
||||||
wrapper.java.command=java
|
wrapper.java.command=java
|
||||||
|
|
||||||
wrapper.java.version.min=11
|
wrapper.java.version.min=17
|
||||||
|
|
||||||
# Tell the Wrapper to log the full generated Java command line.
|
# Tell the Wrapper to log the full generated Java command line.
|
||||||
#wrapper.java.command.loglevel=INFO
|
#wrapper.java.command.loglevel=INFO
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>io.onedev</groupId>
|
<groupId>io.onedev</groupId>
|
||||||
<artifactId>server</artifactId>
|
<artifactId>server</artifactId>
|
||||||
<version>13.0.10</version>
|
<version>13.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -300,15 +300,6 @@
|
|||||||
<artifactId>server-plugin-pack-gem</artifactId>
|
<artifactId>server-plugin-pack-gem</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Add explicit dependencies to make sure standalone plugins use expected lib version -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-codec</groupId>
|
|
||||||
<artifactId>commons-codec</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-io</groupId>
|
|
||||||
<artifactId>commons-io</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<properties>
|
<properties>
|
||||||
<executables>bin/*.sh, boot/wrapper-*</executables>
|
<executables>bin/*.sh, boot/wrapper-*</executables>
|
||||||
|
|||||||
@ -3,7 +3,7 @@ package io.onedev.server.product;
|
|||||||
public class Test {
|
public class Test {
|
||||||
|
|
||||||
@org.junit.Test
|
@org.junit.Test
|
||||||
public void test() {
|
public void test() throws Exception {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user