From 813b130e08ce0a6f08368e4ec831981f8dbb3ecf Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Fri, 27 Sep 2019 10:34:51 +0300 Subject: [PATCH] Exclude the demo folder form the JDK (#47161) The folder contains jars with source code that fail the lintian test on debian (based) distributions. --- distribution/build.gradle | 1 + .../java/org/elasticsearch/packaging/test/DebMetadataTests.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/distribution/build.gradle b/distribution/build.gradle index 3b5777fc71b..8026f596bfa 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -395,6 +395,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { } return copySpec { from project.jdks."bundled_${platform}" + exclude "demo/**" eachFile { FileCopyDetails details -> if (details.relativePath.segments[-2] == 'bin' || details.relativePath.segments[-1] == 'jspawnhelper') { details.mode = 0755 diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java index d484e92a302..0a291a9c40d 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.packaging.util.Distribution; import org.elasticsearch.packaging.util.FileUtils; import org.elasticsearch.packaging.util.Shell; import org.junit.Before; -import org.junit.Ignore; import java.util.regex.Pattern; @@ -38,7 +37,6 @@ public class DebMetadataTests extends PackagingTestCase { assumeTrue("only deb", distribution.packaging == Distribution.Packaging.DEB); } - @Ignore public void test05CheckLintian() { sh.run("lintian --fail-on-warnings " + FileUtils.getDistributionFile(distribution())); }