From 2ddaaf744038414bf2470bbee8eb9db18dc232ed Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Mon, 29 Jan 2024 13:36:15 +0100 Subject: [PATCH] Fix scm home in gradle run task MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pushed-by: Rene Pfeuffer Co-authored-by: René Pfeuffer --- build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy | 1 + build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy | 1 - .../main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy index 58683dcccf..de7b11e803 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy @@ -128,6 +128,7 @@ class RunTask extends DefaultTask { jvmArgs("-Xverify:none") args(new File(project.buildDir, 'server/config.json').toString()) environment 'NODE_ENV', 'development' + environment 'SCM_WEBAPP_HOMEDIR', extension.getHome() classpath project.buildscript.configurations.classpath if (configFileDirectory != '') { classpath configFileDirectory diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy index d7143bc3f9..22894c44ac 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/ScmServer.groovy @@ -52,7 +52,6 @@ class ScmServer { System.setProperty("jakarta.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); - System.setProperty('scm.home', configuration.home) if (configuration.disableCorePlugins) { info('disable core plugin extraction') System.setProperty('sonia.scm.boot.disable-core-plugin-extraction', 'true') diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy index 12cbb4b526..ea20634368 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/WriteServerConfigTask.groovy @@ -77,7 +77,6 @@ class WriteServerConfigTask extends DefaultTask { serverConfig.getParentFile().mkdirs() def config = [ - home: extension.getHome(), port: extension.getPort(), contextPath: '/scm', stage: 'DEVELOPMENT',