BUILD-630 Generate javadoc ad sources jars with Gradle only on release branches

diff --git a/build.gradle b/build.gradle
index 48bfe8e3e19513f18bf59804f4c86baf63e9b4fa..2100179599dde0b8f94ffd134516239d58a545e2 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,7 @@ allprojects {
 
   ext {
     release = project.hasProperty('release') && project.getProperty('release')
+    official = project.hasProperty('official') && project.getProperty('official')
   }
 
   repositories {
@@ -264,9 +265,9 @@ subprojects {
   task ide(dependsOn: ['generateProto', 'generateTestProto']) {
   }
 
-  if (release) {
+  if (official) {
     jar {
-      // do not break incremental build on non-release versions
+      // do not break incremental build on non official versions
       manifest {
         attributes(
           'Version': "${version}",

diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle
index 5bd56009cde27c0c4f985e9a7d2d105deb5e8010..66c6d051b68d21473705f2d47179c4c3a15f64e2 100644 (file)
--- a/plugins/sonar-xoo-plugin/build.gradle
+++ b/plugins/sonar-xoo-plugin/build.gradle
@@ -38,8 +38,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index 8a4ee3042d6df249cafca54867333c476ed3b376..df83a0aeaacf465f032b37abe964f4f85c2939e4 100644 (file)
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -76,9 +76,11 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact testJar
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+        artifact testJar
+      }
     }
   }
 }

diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index 98149ad92e50a177038221f20d669da5e874dcb4..f7103bceaae99fe5fe9b73fecf0a4fdd02d2557b 100644 (file)
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -55,9 +55,11 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact testJar
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+        artifact testJar
+      }
     }
   }
 }

diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle
index f26ceaf82556fb3800231fad66bf1b011024c5ca..7360daec774288c8127b47a9593a772cd241be3c 100644 (file)
--- a/server/sonar-db-migration/build.gradle
+++ b/server/sonar-db-migration/build.gradle
@@ -39,8 +39,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/server/sonar-plugin-bridge/build.gradle b/server/sonar-plugin-bridge/build.gradle
index ea4902802807e8a6ba7899f70eafe53f8c25d9b0..d1fdaf049e87c8f1087728d63072143d3f88bcc5 100644 (file)
--- a/server/sonar-plugin-bridge/build.gradle
+++ b/server/sonar-plugin-bridge/build.gradle
@@ -20,8 +20,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index 3ca3addbcecb8eb2989faccd092d0fbe6a648ed1..862d121f0017d2eaebbf461a488fbde8cceda772 100644 (file)
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -35,8 +35,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/server/sonar-qa-util/build.gradle b/server/sonar-qa-util/build.gradle
index aab7d38eb88aea19708ed1195ad71a910788b580..da6634f460cc5e59985e3cf340c4555b091d4f91 100644 (file)
--- a/server/sonar-qa-util/build.gradle
+++ b/server/sonar-qa-util/build.gradle
@@ -22,8 +22,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 7242701eedec28ab566062c0d8e621dbbceabb4b..c88c09d48b3c8ca05f9b16333d107bdd3074f33b 100644 (file)
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -98,9 +98,11 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact testJar
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+        artifact testJar
+      }
     }
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/OfficialDistribution.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/OfficialDistribution.java
index c999b6fec14a741b945e3b2e0c283379d1ba5fbd..6b3f752574dd4e7644b8da86558273b6c205913e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/OfficialDistribution.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/OfficialDistribution.java
@@ -35,7 +35,7 @@ public class OfficialDistribution {
 
   public boolean check() {
     // the dependency com.sonarsource:sonarsource-branding is shaded to webapp
-    // during release (see sonar-web pom)
+    // during official build (see sonar-web pom)
     File brandingFile = new File(serverFileSystem.getHomeDir(), BRANDING_FILE_PATH);
     // no need to check that the file exists. java.io.File#length() returns zero in this case.
     return brandingFile.length() > 0L;

diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index d56a846ff3a940db984e436e5e157349191d2e56..f7be5a3d07ec8aa4fc649392ffc58d7b73b224a4 100644 (file)
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -55,7 +55,7 @@ node {
 }
 
 yarn_run {
-  if (release) { dependsOn copyBranding }
+  if (official) { dependsOn copyBranding }
   inputs.dir('config')
   inputs.dir('public')
   inputs.dir('scripts')

diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index 768ec42b2473a49acee5f632fce22df749d7b298..a2d0f1bb1892198f2c7a565caf962b9069bc54db 100644 (file)
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -50,8 +50,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-home/build.gradle b/sonar-home/build.gradle
index ea6d5b07f444c99d944ff98e93a1f6035cd71d24..c4323e91133c5b4fd9656f4e3d24a1d0a54420f7 100644 (file)
--- a/sonar-home/build.gradle
+++ b/sonar-home/build.gradle
@@ -23,8 +23,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-markdown/build.gradle b/sonar-markdown/build.gradle
index 7b46ac42b1f9729bdcca180e26a1fdcef3e7060a..ec958b2434c18b9f229ca1cab6f98bed20684c8d 100644 (file)
--- a/sonar-markdown/build.gradle
+++ b/sonar-markdown/build.gradle
@@ -23,8 +23,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-plugin-api/build.gradle b/sonar-plugin-api/build.gradle
index 8bf8e28798b5b72c40093f6f556d5090d0ade065..047cf35b69580c7b1fa8f8de1043be3e8cfd759b 100644 (file)
--- a/sonar-plugin-api/build.gradle
+++ b/sonar-plugin-api/build.gradle
@@ -75,8 +75,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       artifact source: shadowJar, classifier: null
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index a99e09ddb23c4885227cfdfe34e964902ea32196..c7d662c821d39a8543e3585ea0111eb1a42b4cde 100644 (file)
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -57,8 +57,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle
index ba5129d508a3b7fac5fa58e20adb04eb40c9b301..788ab75e8c48dcd1a24da0964d394da2ca26bf66 100644 (file)
--- a/sonar-scanner-protocol/build.gradle
+++ b/sonar-scanner-protocol/build.gradle
@@ -28,8 +28,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle
index 562642ff813484b8a6e84bcf20c033ce547f077d..f6493bcca95ca4ae78d8d879c8813e2f07b285a6 100644 (file)
--- a/sonar-testing-harness/build.gradle
+++ b/sonar-testing-harness/build.gradle
@@ -24,8 +24,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index 4080e7048a5cf4b88292404d36fce50609f42a2d..6f8aa85142673ca613fd5f8f099ac13dd163ef44 100644 (file)
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -34,8 +34,10 @@ publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      artifact javadocJar
+      if (release) {
+        artifact sourcesJar
+        artifact javadocJar
+      }
     }
   }
 }

diff --git a/travis.sh b/travis.sh
index 0e3207b53ca03bda88cf96568b81a1b6ed30ae1c..300ee86f70d86a04b7ec2645dc9610b960ec46dc 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -96,7 +96,7 @@ BUILD)
     echo 'Build and analyze master'
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Pofficial=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.projectVersion=$INITIAL_VERSION \
@@ -109,7 +109,7 @@ BUILD)
     echo 'Build release branch'
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Pofficial=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.branch.name=$TRAVIS_BRANCH \
@@ -123,7 +123,7 @@ BUILD)
     echo 'Build and analyze internal pull request'
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Pofficial=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.analysis.buildNumber=$BUILD_NUMBER \
@@ -140,7 +140,7 @@ BUILD)
   else
     echo 'Build feature branch or external pull request'
     ./gradlew  --no-daemon --console plain \
-        -DbuildNumber=$BUILD_NUMBER -Prelease=true \
+        -DbuildNumber=$BUILD_NUMBER -Pofficial=true \
         build artifactoryPublish
   fi
   ;;