diff --git a/pom.xml b/pom.xml index 5e83e946f6..6746367289 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,10 @@ io.onedev parent - 1.2.3 + 1.3.0 server - 13.0.10 + 13.1.0 pom ${project.groupId}.${project.artifactId}-${project.version} @@ -38,7 +38,7 @@ io.onedev plugin-maven - 2.6.9 + 2.7.0 @@ -646,8 +646,8 @@ - 3.0.15 - 2.2.20 + 3.1.0 + 2.3.1 2.0.9 1.4.14 4.7.2 diff --git a/server-core/pom.xml b/server-core/pom.xml index eb11f8c083..f4dfe35097 100644 --- a/server-core/pom.xml +++ b/server-core/pom.xml @@ -7,7 +7,7 @@ io.onedev server - 13.0.10 + 13.1.0 diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java index dcc1f8890e..1ac85bdddb 100644 --- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java +++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java @@ -949,7 +949,11 @@ public class Upgrade extends AbstractPlugin { if (!wrapperConf.contains("-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); if (lines.stream().noneMatch(it -> it.contains("-XX:MaxRAMPercentage"))) { diff --git a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java b/server-core/src/main/java/org/apache/wicket/util/string/Strings.java index d811380504..8045565a30 100644 --- a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java +++ b/server-core/src/main/java/org/apache/wicket/util/string/Strings.java @@ -53,6 +53,7 @@ import org.apache.wicket.util.lang.Args; * * @author Jonathan Locke */ +@SuppressWarnings("removal") public final class Strings { /** diff --git a/server-ee b/server-ee index 65213e9d1b..6e38ee0e81 160000 --- a/server-ee +++ b/server-ee @@ -1 +1 @@ -Subproject commit 65213e9d1b9311a405e047a165846c8976a08534 +Subproject commit 6e38ee0e81adb8f252982ae2cb07cf7ef7fa19ec diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml index 850197da9e..083201e16b 100644 --- a/server-plugin/pom.xml +++ b/server-plugin/pom.xml @@ -6,7 +6,7 @@ io.onedev server - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-archetype/bin/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/bin/src/main/resources/archetype-resources/pom.xml index 78d1418411..64f0a7faff 100644 --- a/server-plugin/server-plugin-archetype/bin/src/main/resources/archetype-resources/pom.xml +++ b/server-plugin/server-plugin-archetype/bin/src/main/resources/archetype-resources/pom.xml @@ -33,7 +33,7 @@ io.onedev plugin-maven - 2.6.9 + 2.7.0 diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml index 9fd5b95033..9cd27c7798 100644 --- a/server-plugin/server-plugin-archetype/pom.xml +++ b/server-plugin/server-plugin-archetype/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 78d1418411..64f0a7faff 100644 --- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -33,7 +33,7 @@ io.onedev plugin-maven - 2.6.9 + 2.7.0 diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml index 973da78e00..1e21c58e02 100644 --- a/server-plugin/server-plugin-authenticator-ldap/pom.xml +++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.authenticator.ldap.LdapModule diff --git a/server-plugin/server-plugin-buildspec-bazel/pom.xml b/server-plugin/server-plugin-buildspec-bazel/pom.xml index 347d96a4cb..5cdd5c07dc 100644 --- a/server-plugin/server-plugin-buildspec-bazel/pom.xml +++ b/server-plugin/server-plugin-buildspec-bazel/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.buildspec.bazel.BazelModule diff --git a/server-plugin/server-plugin-buildspec-cmake/pom.xml b/server-plugin/server-plugin-buildspec-cmake/pom.xml index e4f741b3e0..318da88f64 100644 --- a/server-plugin/server-plugin-buildspec-cmake/pom.xml +++ b/server-plugin/server-plugin-buildspec-cmake/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xml index b7763d5176..768d2ad325 100644 --- a/server-plugin/server-plugin-buildspec-dotnet/pom.xml +++ b/server-plugin/server-plugin-buildspec-dotnet/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-golang/pom.xml b/server-plugin/server-plugin-buildspec-golang/pom.xml index cad58af999..e597caa6bb 100644 --- a/server-plugin/server-plugin-buildspec-golang/pom.xml +++ b/server-plugin/server-plugin-buildspec-golang/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml index fd863ec093..906db1a7c1 100644 --- a/server-plugin/server-plugin-buildspec-gradle/pom.xml +++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml index 78d20bcf0b..00bc23de6a 100644 --- a/server-plugin/server-plugin-buildspec-maven/pom.xml +++ b/server-plugin/server-plugin-buildspec-maven/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml index 6b096e84e3..c2bd987195 100644 --- a/server-plugin/server-plugin-buildspec-node/pom.xml +++ b/server-plugin/server-plugin-buildspec-node/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.buildspec.node.NodePluginModule diff --git a/server-plugin/server-plugin-buildspec-python/pom.xml b/server-plugin/server-plugin-buildspec-python/pom.xml index bb6ee7a552..3950f6715c 100644 --- a/server-plugin/server-plugin-buildspec-python/pom.xml +++ b/server-plugin/server-plugin-buildspec-python/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xml index b2f72c35bc..e2ca06e1b1 100644 --- a/server-plugin/server-plugin-buildspec-rust/pom.xml +++ b/server-plugin/server-plugin-buildspec-rust/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml index 3267eeaae7..3809183c72 100644 --- a/server-plugin/server-plugin-executor-kubernetes/pom.xml +++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.executor.kubernetes.KubernetesModule diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml index 6132e08710..9be034f8eb 100644 --- a/server-plugin/server-plugin-executor-remotedocker/pom.xml +++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml index e1d48bfb36..64acc0d44e 100644 --- a/server-plugin/server-plugin-executor-remoteshell/pom.xml +++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml index 8796534b3a..1137586446 100644 --- a/server-plugin/server-plugin-executor-serverdocker/pom.xml +++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.executor.serverdocker.ServerDockerModule diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml index dbdc07fd65..64e5bb7fc0 100644 --- a/server-plugin/server-plugin-executor-servershell/pom.xml +++ b/server-plugin/server-plugin-executor-servershell/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.executor.servershell.ServerShellModule diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml index 4aea87acad..20ca4b2857 100644 --- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml +++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml index 6beb6d2c2b..842434ddfe 100644 --- a/server-plugin/server-plugin-import-gitea/pom.xml +++ b/server-plugin/server-plugin-import-gitea/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.gitea.GiteaModule diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml index 52b5870c65..521989acda 100644 --- a/server-plugin/server-plugin-import-github/pom.xml +++ b/server-plugin/server-plugin-import-github/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.github.GitHubModule diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml index 655137e0e6..9a83bae8ad 100644 --- a/server-plugin/server-plugin-import-gitlab/pom.xml +++ b/server-plugin/server-plugin-import-gitlab/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.gitlab.GitLabModule diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml index 0e9ee7fb7e..8820ecbd1e 100644 --- a/server-plugin/server-plugin-import-jiracloud/pom.xml +++ b/server-plugin/server-plugin-import-jiracloud/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.jiracloud.JiraModule diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xml index 5fd5e463a8..97e06ed9c9 100644 --- a/server-plugin/server-plugin-import-url/pom.xml +++ b/server-plugin/server-plugin-import-url/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.url.UrlModule diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml index 5f21b3f030..6cfab18748 100644 --- a/server-plugin/server-plugin-import-youtrack/pom.xml +++ b/server-plugin/server-plugin-import-youtrack/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.imports.youtrack.YouTrackModule diff --git a/server-plugin/server-plugin-mail-gmail/pom.xml b/server-plugin/server-plugin-mail-gmail/pom.xml index f10bd4f865..07c3a5750c 100644 --- a/server-plugin/server-plugin-mail-gmail/pom.xml +++ b/server-plugin/server-plugin-mail-gmail/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.mail.gmail.GmailModule diff --git a/server-plugin/server-plugin-mail-office365/pom.xml b/server-plugin/server-plugin-mail-office365/pom.xml index ad9096a984..efa667c780 100644 --- a/server-plugin/server-plugin-mail-office365/pom.xml +++ b/server-plugin/server-plugin-mail-office365/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.mail.office365.Office365Module diff --git a/server-plugin/server-plugin-mail-smtpimap/pom.xml b/server-plugin/server-plugin-mail-smtpimap/pom.xml index 452c71ed67..4cf5227453 100644 --- a/server-plugin/server-plugin-mail-smtpimap/pom.xml +++ b/server-plugin/server-plugin-mail-smtpimap/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.mail.smtpimap.SmtpImapModule diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xml index c278ef33c2..d4030786cc 100644 --- a/server-plugin/server-plugin-notification-discord/pom.xml +++ b/server-plugin/server-plugin-notification-discord/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.notification.discord.DiscordModule diff --git a/server-plugin/server-plugin-notification-ntfy/pom.xml b/server-plugin/server-plugin-notification-ntfy/pom.xml index 5ab83b1dee..274beb745d 100644 --- a/server-plugin/server-plugin-notification-ntfy/pom.xml +++ b/server-plugin/server-plugin-notification-ntfy/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.notification.ntfy.NtfyModule diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xml index 1e04d51ee2..196b3b7121 100644 --- a/server-plugin/server-plugin-notification-slack/pom.xml +++ b/server-plugin/server-plugin-notification-slack/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.notification.slack.SlackModule diff --git a/server-plugin/server-plugin-pack-container/pom.xml b/server-plugin/server-plugin-pack-container/pom.xml index 22ef8d8185..8947850327 100644 --- a/server-plugin/server-plugin-pack-container/pom.xml +++ b/server-plugin/server-plugin-pack-container/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xml index 3384ff1adf..8467c77a57 100644 --- a/server-plugin/server-plugin-pack-gem/pom.xml +++ b/server-plugin/server-plugin-pack-gem/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xml index 7d6f72c6d2..4018d798b3 100644 --- a/server-plugin/server-plugin-pack-helm/pom.xml +++ b/server-plugin/server-plugin-pack-helm/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xml index e1ff9e0a26..b70494da32 100644 --- a/server-plugin/server-plugin-pack-maven/pom.xml +++ b/server-plugin/server-plugin-pack-maven/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xml index 861029eb94..64e7eb8b54 100644 --- a/server-plugin/server-plugin-pack-npm/pom.xml +++ b/server-plugin/server-plugin-pack-npm/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xml index 3dc24ff6b8..b03b2b20a3 100644 --- a/server-plugin/server-plugin-pack-nuget/pom.xml +++ b/server-plugin/server-plugin-pack-nuget/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xml index e6fbea399e..9dc537e150 100644 --- a/server-plugin/server-plugin-pack-pypi/pom.xml +++ b/server-plugin/server-plugin-pack-pypi/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml index 8fd798d684..31bd4151cd 100644 --- a/server-plugin/server-plugin-report-checkstyle/pom.xml +++ b/server-plugin/server-plugin-report-checkstyle/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-clippy/pom.xml b/server-plugin/server-plugin-report-clippy/pom.xml index 5ae31cf483..898291bb65 100644 --- a/server-plugin/server-plugin-report-clippy/pom.xml +++ b/server-plugin/server-plugin-report-clippy/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml index c31f817dc9..d88f180590 100644 --- a/server-plugin/server-plugin-report-clover/pom.xml +++ b/server-plugin/server-plugin-report-clover/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xml index 5c79888163..53a718bd70 100644 --- a/server-plugin/server-plugin-report-cobertura/pom.xml +++ b/server-plugin/server-plugin-report-cobertura/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xml index 91c814e3fc..65e760e64f 100644 --- a/server-plugin/server-plugin-report-coverage/pom.xml +++ b/server-plugin/server-plugin-report-coverage/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.report.coverage.CoverageModule diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml index 54fdf3712c..230cac653e 100644 --- a/server-plugin/server-plugin-report-cpd/pom.xml +++ b/server-plugin/server-plugin-report-cpd/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-cppcheck/pom.xml b/server-plugin/server-plugin-report-cppcheck/pom.xml index a2695d968b..fa22bbb2d6 100644 --- a/server-plugin/server-plugin-report-cppcheck/pom.xml +++ b/server-plugin/server-plugin-report-cppcheck/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xml index 550eca7141..631485ee4e 100644 --- a/server-plugin/server-plugin-report-gtest/pom.xml +++ b/server-plugin/server-plugin-report-gtest/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xml index 2eb48f45cf..085629c248 100644 --- a/server-plugin/server-plugin-report-html/pom.xml +++ b/server-plugin/server-plugin-report-html/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.report.html.HtmlModule diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xml index 7618014cba..ed24b3e716 100644 --- a/server-plugin/server-plugin-report-jacoco/pom.xml +++ b/server-plugin/server-plugin-report-jacoco/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml index 790f9a477a..e100cc3907 100644 --- a/server-plugin/server-plugin-report-jest/pom.xml +++ b/server-plugin/server-plugin-report-jest/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml index f7aeaab3a6..39c423272b 100644 --- a/server-plugin/server-plugin-report-junit/pom.xml +++ b/server-plugin/server-plugin-report-junit/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml index 114bcc5c0b..36d9a826cb 100644 --- a/server-plugin/server-plugin-report-markdown/pom.xml +++ b/server-plugin/server-plugin-report-markdown/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.report.markdown.MarkdownModule diff --git a/server-plugin/server-plugin-report-mypy/pom.xml b/server-plugin/server-plugin-report-mypy/pom.xml index 36df32a12a..2d6a08a9e2 100644 --- a/server-plugin/server-plugin-report-mypy/pom.xml +++ b/server-plugin/server-plugin-report-mypy/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml index caa9ca3702..7988a6f2a8 100644 --- a/server-plugin/server-plugin-report-pmd/pom.xml +++ b/server-plugin/server-plugin-report-pmd/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xml index 6b5d272b9e..12c95dd00d 100644 --- a/server-plugin/server-plugin-report-problem/pom.xml +++ b/server-plugin/server-plugin-report-problem/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.report.problem.ProblemModule diff --git a/server-plugin/server-plugin-report-pylint/pom.xml b/server-plugin/server-plugin-report-pylint/pom.xml index d6692ce100..b9509ab151 100644 --- a/server-plugin/server-plugin-report-pylint/pom.xml +++ b/server-plugin/server-plugin-report-pylint/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xml index 3a66203bed..b0352739d7 100644 --- a/server-plugin/server-plugin-report-roslynator/pom.xml +++ b/server-plugin/server-plugin-report-roslynator/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-ruff/pom.xml b/server-plugin/server-plugin-report-ruff/pom.xml index 055021a07f..b66dd6961c 100644 --- a/server-plugin/server-plugin-report-ruff/pom.xml +++ b/server-plugin/server-plugin-report-ruff/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xml index 381fdc2211..ae2805550b 100644 --- a/server-plugin/server-plugin-report-spotbugs/pom.xml +++ b/server-plugin/server-plugin-report-spotbugs/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xml index 5a2ea45205..ab91124cd6 100644 --- a/server-plugin/server-plugin-report-trx/pom.xml +++ b/server-plugin/server-plugin-report-trx/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml index 66152cb575..dd9e85c5ab 100644 --- a/server-plugin/server-plugin-report-unittest/pom.xml +++ b/server-plugin/server-plugin-report-unittest/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.report.unittest.UnitTestModule diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xml index fa44b02ace..cea873d731 100644 --- a/server-plugin/server-plugin-sso-discord/pom.xml +++ b/server-plugin/server-plugin-sso-discord/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.sso.discord.DiscordModule diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml index 5252db556a..b2abcfabd8 100644 --- a/server-plugin/server-plugin-sso-openid/pom.xml +++ b/server-plugin/server-plugin-sso-openid/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 13.0.10 + 13.1.0 io.onedev.server.plugin.sso.openid.OpenIdModule diff --git a/server-product/docker/Dockerfile.agent b/server-product/docker/Dockerfile.agent index 7705548648..6373bec456 100644 --- a/server-product/docker/Dockerfile.agent +++ b/server-product/docker/Dockerfile.agent @@ -8,7 +8,7 @@ COPY agent /agent COPY entrypoint-agent.sh /root/bin/entrypoint.sh 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 -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 && \ locale-gen ENV LANG en_US.UTF-8 diff --git a/server-product/docker/Dockerfile.server b/server-product/docker/Dockerfile.server index 1a66b1561d..ff585764da 100644 --- a/server-product/docker/Dockerfile.server +++ b/server-product/docker/Dockerfile.server @@ -7,7 +7,7 @@ FROM ubuntu:24.04 ARG TARGETPLATFORM COPY app /app 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 && \ locale-gen ENV LANG en_US.UTF-8 diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.conf index 63dd6765bd..38c4004036 100644 --- a/server-product/jsw/wrapper.conf +++ b/server-product/jsw/wrapper.conf @@ -38,14 +38,14 @@ wrapper.restart.reload_configuration=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 to desired java executable 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. #wrapper.java.command.loglevel=INFO diff --git a/server-product/pom.xml b/server-product/pom.xml index 1ec5ef118c..d22c29314a 100644 --- a/server-product/pom.xml +++ b/server-product/pom.xml @@ -7,7 +7,7 @@ io.onedev server - 13.0.10 + 13.1.0 @@ -300,15 +300,6 @@ server-plugin-pack-gem ${project.version} - - - commons-codec - commons-codec - - - commons-io - commons-io - bin/*.sh, boot/wrapper-* diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java index e8a4ec697b..9d6c2d5908 100644 --- a/server-product/src/test/java/io/onedev/server/product/Test.java +++ b/server-product/src/test/java/io/onedev/server/product/Test.java @@ -3,7 +3,7 @@ package io.onedev.server.product; public class Test { @org.junit.Test - public void test() { + public void test() throws Exception { } -} \ No newline at end of file +}