Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

update CHANGELOG.md

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-07-06 16:20:01 +02:00
parent 0b90367dab 4279573633
commit 46ffdcb5e2
41 changed files with 144 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -247,18 +247,18 @@ public class DefaultPluginManager implements PluginManager {
private List<AvailablePlugin> collectPluginsToInstall(String name) {
List<AvailablePlugin> plugins = new ArrayList<>();
collectPluginsToInstall(plugins, name, true);
collectPluginsToInstallOrUpdate(plugins, name);
return plugins;
}
private void collectPluginsToInstall(List<AvailablePlugin> plugins, String name, boolean isUpdate) {
if (!isInstalledOrPending(name) || isUpdate && isUpdatable(name)) {
private void collectPluginsToInstallOrUpdate(List<AvailablePlugin> plugins, String name) {
if (!isInstalledOrPending(name) || isUpdatable(name)) {
AvailablePlugin plugin = getAvailable(name).orElseThrow(() -> NotFoundException.notFound(entity(AvailablePlugin.class, name)));
Set<String> dependencies = plugin.getDescriptor().getDependencies();
if (dependencies != null) {
for (String dependency : dependencies) {
collectPluginsToInstall(plugins, dependency, false);
collectPluginsToInstallOrUpdate(plugins, dependency);
}
}

5
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
View File

@@ -34,8 +34,6 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.event.ScmEventBus;
import sonia.scm.lifecycle.RestartEvent;
import sonia.scm.lifecycle.Restarter;
import sonia.scm.update.repository.DefaultMigrationStrategyDAO;
import sonia.scm.update.repository.MigrationStrategy;
@@ -173,6 +171,9 @@ class MigrationWizardServlet extends HttpServlet {
MustacheFactory mf = new DefaultMustacheFactory();
Mustache template = mf.compile(templateName);
resp.setContentType("text/html");
resp.setCharacterEncoding("UTF-8");
PrintWriter writer;
try {
writer = resp.getWriter();