Remove all wrapper.conf reference

5 files changed, 1 insertions, 9 deletions

diff --git a/server/sonar-docs/src/pages/setup/upgrading.md b/server/sonar-docs/src/pages/setup/upgrading.md
index c9673b72019..cfe08245e29 100644
--- a/server/sonar-docs/src/pages/setup/upgrading.md
+++ b/server/sonar-docs/src/pages/setup/upgrading.md
@@ -23,7 +23,7 @@ You can upgrade your SonarQube instance using the ZIP file, Docker image, or Hel
 | 
 | 1. Download and unzip the SonarQube distribution of your edition in a fresh directory, let's say `$NEW_SONAR_HOME`
 | 2. If you're using third-party plugins, Manually install plugins that are compatible with your version of SonarQube. Use the [Plugin Version Matrix](/instance-administration/plugin-version-matrix/) to ensure that the versions you install are compatible with your server version. Simply copying plugins from the old server to the new is not recommended; incompatible or duplicate plugins could cause startup errors. Analysis of all languages provided by your edition is available by default without plugins.
-| 3. Update the contents of `sonar.properties` and `wrapper.conf` files (in `$NEW_SONAR_HOME/conf`) with the settings of the related files in the `$OLD_SONAR_HOME/conf` directory (web server URL, database, ldap settings, etc.). Do not copy-paste the old files.
+| 3. Update the contents of `sonar.properties` file (in `$NEW_SONAR_HOME/conf`) with the settings in the `$OLD_SONAR_HOME/conf` directory (web server URL, database, ldap settings, etc.). Do not copy-paste the old files.
 | If you are using the Oracle DB, copy its JDBC driver into `$NEW_SONAR_HOME/extensions/jdbc-driver/oracle`
 | 4. Stop your old SonarQube Server
 | 5. Start your new SonarQube Server
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