SONAR-10687 Create and upload a zip per edition

diff --git a/build.gradle b/build.gradle
index 09078450f3411dac92f83c2eb1b18e8142a661a5..bd55e6f901ebd58e93ce6bf07d8d0c6c330f9ffa 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,11 @@ buildscript {
     classpath 'com.moowork.gradle:gradle-node-plugin:1.2.0'
     classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0"
     classpath 'io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE'
+    // BuildInfo plugin is broken for 4.7.2 :
+    // https://github.com/gradle/gradle/issues/4783#issuecomment-386720873
+    // https://github.com/JFrogDev/build-info/issues/165
+    // https://www.jfrog.com/jira/browse/GAP-288
+    // https://www.jfrog.com/jira/browse/GAP-289
     classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2'
     classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
   }

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 932e1fa3ccb36cf6386d2c6f7ce853894758afa2..1e2b96d89797dbd6c6cede3875af6ec00eada3d6 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -5,6 +5,8 @@ sonarqube {
 }
 
 configurations {
+  zip
+
   ce
   jsw
   scanner
@@ -75,6 +77,7 @@ jar {
 task zip(type: Zip) {
   duplicatesStrategy DuplicatesStrategy.EXCLUDE
   def archiveDir = "sonarqube-$version"
+
   into("${archiveDir}/") {
     from file('src/main/assembly')
     exclude 'elasticsearch/modules/lang-expression/**'
@@ -150,6 +153,8 @@ task cleanLocalUnzippedDir(dependsOn: zip) {
 }
 assemble.dependsOn cleanLocalUnzippedDir
 
+artifacts { zip zip }
+
 artifactoryPublish.skip = false
 
 publishing {