From: Zipeng WU <zipeng.wu@sonarsource.com>
Date: Thu, 17 Nov 2022 14:31:12 +0000 (+0100)
Subject: SONAR-17611 Fix too much files excluded from build
X-Git-Tag: 9.8.0.63668~109
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=80629eea7936251277b5e66a754846ca1acac428;p=sonarqube.git

SONAR-17611 Fix too much files excluded from build
---

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 2192a0fbdec..28163b86c07 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -140,14 +140,17 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, downloadElastic
           jsonFile.file.text = JsonOutput.prettyPrint(jsonText)
         }
       }
-      from(file('src/main/assembly')) {
-        exclude 'conf/sonar.properties'
-        exclude 'bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml'
-        exclude 'bin/windows-x86-64/StartSonar.bat'
-        exclude 'elasticsearch-patch'
-        exclude 'bin/linux-x86-64/sonar.sh'
-        exclude 'bin/macosx-universal-64/sonar.sh'
-      }
+    }
+  }
+
+  into("${archiveDir}/") {
+    from(file('src/main/assembly')) {
+      exclude 'conf/sonar.properties'
+      exclude 'bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml'
+      exclude 'bin/windows-x86-64/StartSonar.bat'
+      exclude 'elasticsearch-patch'
+      exclude 'bin/linux-x86-64/sonar.sh'
+      exclude 'bin/macosx-universal-64/sonar.sh'
     }
   }