Merge branch 'release/2.43.0-1' into develop

Author: Eduard Heimbuch

resources/var/tmp/scm/init.script.d/020-configuration.groovy

@@ -2,7 +2,7 @@
 // ecosystem.
 
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.util.ScmConfigurationUtil;
+import sonia.scm.admin.ScmConfigurationStore;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupManager;
 import sonia.scm.security.PermissionAssigner;
@@ -114,7 +114,7 @@ if (disableReleaseFeed != null && disableReleaseFeed.equalsIgnoreCase("true")) {
 config.setEnabledUserConverter(true)
 
 // store configuration
-ScmConfigurationUtil.getInstance().store(config);
+injector.getInstance(ScmConfigurationStore.class).store(config);
 
 // set admin group
 String adminGroup = getGlobalValueFromEtcd("admin_group");

resources/var/tmp/scm/init.script.d/030-proxyconfiguration.groovy

@@ -1,7 +1,7 @@
 // This script configures proxy settings from etcd
 
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.util.ScmConfigurationUtil;
+import sonia.scm.admin.ScmConfigurationStore;
 import groovy.json.JsonSlurper;
 
 def getValueFromEtcd(String key){
@@ -64,4 +64,4 @@ def setProxyExcludes(configuration){
 }
 
 // store configuration
-ScmConfigurationUtil.getInstance().store(configuration);
+injector.getInstance(ScmConfigurationStore.class).store(configuration);