SONAR-17611 Fix too much files excluded from build

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 2192a0fbdec96a76b00e5bdea37f47b21a625360..28163b86c07d298d5754c45109a6ff834db00f53 100644 (file)
--- 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'
     }
   }