aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/build.gradle
diff options
context:
space:
mode:
authorDimitris Kavvathas <dimitris.kavvathas@sonarsource.com>2022-08-09 17:34:22 +0200
committersonartech <sonartech@sonarsource.com>2022-08-10 20:03:08 +0000
commite12852cc16f5d328c25e6569759d0eb1ee467835 (patch)
treef7376b257f5c40f083b180c2b99fde06e5ee347e /sonar-application/build.gradle
parenta5d505ac9b71b401691f452c69a994495c09cedb (diff)
downloadsonarqube-e12852cc16f5d328c25e6569759d0eb1ee467835.tar.gz
sonarqube-e12852cc16f5d328c25e6569759d0eb1ee467835.zip
SONAR-17137 add SONAR_JAVA_PATH environmental variable for user-defined Java executable path
Diffstat (limited to 'sonar-application/build.gradle')
-rw-r--r--sonar-application/build.gradle10
1 files changed, 8 insertions, 2 deletions
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 1784e591257..d8f39a1363b 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -141,7 +141,7 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, tasks.downloadL
from(file('src/main/assembly')) {
exclude 'conf/sonar.properties'
exclude 'conf/wrapper.conf'
- exclude 'bin/windows-x86-64/SonarService.xml'
+ exclude 'bin/windows-x86-64/lib/SonarServiceWrapper.xml'
exclude 'bin/windows-x86-64/StartSonar.bat'
exclude 'elasticsearch-patch'
exclude 'bin/linux-x86-64/sonar.sh'
@@ -240,13 +240,19 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, tasks.downloadL
}
into("${archiveDir}/bin/windows-x86-64/") {
- from file('src/main/assembly/bin/windows-x86-64/SonarService.xml')
from file('src/main/assembly/bin/windows-x86-64/StartSonar.bat')
filter(ReplaceTokens, tokens: [
'sqversion': version
])
}
+ into("${archiveDir}/bin/windows-x86-64/lib/") {
+ from file('src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapper.xml')
+ filter(ReplaceTokens, tokens: [
+ 'sqversion': version
+ ])
+ }
+
into("${archiveDir}/elasticsearch/") {
from file('src/main/assembly/elasticsearch-patch')
include 'bin/elasticsearch'