From f12eb2f28aa769b7bc1aa4e645ed3d60e7d68a4e Mon Sep 17 00:00:00 2001
From: Joao Duarte <jsvduarte@gmail.com>
Date: Thu, 30 Jan 2020 10:45:23 +0000
Subject: [PATCH] fail license report job on missing licenses

Fixes #11554
---
 ci/license_check.sh                                          | 5 +++++
 logstash-core/lib/logstash/dependency_report.rb              | 3 ++-
 .../src/main/java/org/logstash/dependencies/Main.java        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/license_check.sh b/ci/license_check.sh
index f9632ecba..3bb9396ee 100755
--- a/ci/license_check.sh
+++ b/ci/license_check.sh
@@ -3,5 +3,10 @@ export GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -D
 
 ./gradlew installDefaultGems
 bin/dependencies-report --csv report.csv
+
+result=$?
+
 # We want this to show on the CI server
 cat report.csv
+
+exit $result
diff --git a/logstash-core/lib/logstash/dependency_report.rb b/logstash-core/lib/logstash/dependency_report.rb
index 9b9493b50..6e92d2036 100644
--- a/logstash-core/lib/logstash/dependency_report.rb
+++ b/logstash-core/lib/logstash/dependency_report.rb
@@ -32,8 +32,9 @@ class LogStash::DependencyReport < Clamp::Command
     command = ["./gradlew", "generateLicenseReport", "-PlicenseReportInputCSV=#{ruby_output_path}", "-PlicenseReportOutputCSV=#{output_path}"]
     puts "Executing #{command}"
     system(*command)
+
     if $?.exitstatus != 0
-      raise "Could not run gradle java deps! Exit status #{$?.exitstatus}"
+      raise "generateLicenseReport failed with exit status #{$?.exitstatus}"
     end
 
     nil
diff --git a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
index a8340a0ec..cb6f0f801 100644
--- a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
+++ b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
@@ -46,7 +46,7 @@ public class Main {
         );
 
         // If there were unknown results in the report, exit with a non-zero status
-        //System.exit(reportResult ? 0 : 1);
+        System.exit(reportResult ? 0 : 1);
     }
 
     static InputStream getResourceAsStream(String resourcePath) {