[jmeter] branch master updated: Validate dependency licenses on Travis

[vl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new d5283ca  Validate dependency licenses on Travis
d5283ca is described below

commit d5283cad7622872e7ac8c838c4c97333d4d7ad5a
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Sep 16 09:39:10 2019 +0300

    Validate dependency licenses on Travis
---
 .travis.yml                   | 4 +++-
 src/licenses/build.gradle.kts | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aacf847..a5a4749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,8 @@ env:
   global:
     - GRADLE_ARGS="-Djava.awt.headless=true"
     # Building source and binary distributions takes time, and it does not verify much, so we skip it in CI
-    - SKIP_DIST_TASKS="$GRADLE_ARGS -PskipDist"
+    # However we want to validate licenses
+    - SKIP_DIST_TASKS="$GRADLE_ARGS -PskipDist :src:licenses:build"
 
 matrix:
   include:
@@ -31,6 +32,7 @@ matrix:
       script:
         - ./gradlew $SKIP_DIST_TASKS -PskipCheckstyle build createDist
     - name: Tests with OpenJDK 12
+      # Might switch to openjdk-ea when https://github.com/gradle/gradle/issues/10248 is fixed
       jdk: openjdk12
       script:
         - ./gradlew $SKIP_DIST_TASKS -PskipCheckstyle build createDist
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index f7ee004..adc2a8a 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -177,3 +177,7 @@ val renderLicenseForBinary by tasks.registering(Apache2LicenseRenderer::class) {
     metadata.from(gatherBinaryLicenses)
     licenseCategory.put(ExtraLicense.Indiana_University_1_1_1.asExpression(), AsfLicenseCategory.A)
 }
+
+tasks.build.configure {
+  dependsOn(renderLicenseForSource, renderLicenseForBinary)
+}