diff options
| author | Zipeng WU <zipeng.wu@sonarsource.com> | 2022-08-12 14:21:46 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2022-08-12 20:02:57 +0000 |
| commit | b5ba74b818f1ce4ef6720bfdeeb6fb720e7cece1 (patch) | |
| tree | 3514e9674257cdbe6714ec464414e3c93031c629 /sonar-application | |
| parent | b870c819981605b5f9dcf10f1a8a57a6216379d2 (diff) | |
| download | sonarqube-b5ba74b818f1ce4ef6720bfdeeb6fb720e7cece1.tar.gz sonarqube-b5ba74b818f1ce4ef6720bfdeeb6fb720e7cece1.zip | |
Remove all wrapper.conf reference
Diffstat (limited to 'sonar-application')
4 files changed, 0 insertions, 8 deletions
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index d8f39a1363b..e2e6e4e40b7 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -140,7 +140,6 @@ 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/lib/SonarServiceWrapper.xml' exclude 'bin/windows-x86-64/StartSonar.bat' exclude 'elasticsearch-patch' diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh index f77fa34f7a4..41085b8ccac 100755 --- a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh +++ b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh @@ -174,9 +174,6 @@ start() { } waitforstop() { - # We can not predict how long it will take for the wrapper to - # actually stop as it depends on settings in wrapper.conf. - # Loop until it does. savepid=$pid CNT=0 TOTCNT=0 diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh index e18d6cd1949..abb9b0ca653 100755 --- a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh +++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh @@ -174,9 +174,6 @@ start() { } waitforstop() { - # We can not predict how long it will take for the wrapper to - # actually stop as it depends on settings in wrapper.conf. - # Loop until it does. savepid=$pid CNT=0 TOTCNT=0 diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index ae55338da1e..bb48278a717 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -334,7 +334,6 @@ # # Depending on the startup, all 4 files follow the same rolling policy (see sonar.log.rollingPolicy and sonar.log.maxFiles) but it applies # individually (eg. if sonar.log.maxFiles=4, there can be at most 4 of each files, ie. 16 files in total). -# If the SonarQube wrapper is used (for example, with the provided start.sh script), the sonar.log rotation policy needs to be set in the wrapper.conf # # All 4 files have logs in the same format: # 1 2 3 4 5 6 |