honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exclude the demo folder form the JDK (#47161)

Browse Source 
The folder contains jars with source code that fail the lintian test on
debian (based) distributions.
This commit is contained in:
Alpar Torok 2019-09-27 10:34:51 +03:00
parent 944421627d
commit 813b130e08
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/build.gradle
View File

@ -395,6 +395,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
} }
return copySpec { return copySpec {
from project.jdks."bundled_${platform}" from project.jdks."bundled_${platform}"
exclude "demo/**"
eachFile { FileCopyDetails details -> eachFile { FileCopyDetails details ->
if (details.relativePath.segments[-2] == 'bin' || details.relativePath.segments[-1] == 'jspawnhelper') { if (details.relativePath.segments[-2] == 'bin' || details.relativePath.segments[-1] == 'jspawnhelper') {
details.mode = 0755 details.mode = 0755

2
qa/os/src/test/java/org/elasticsearch/packaging/test/DebMetadataTests.java
View File

@ -24,7 +24,6 @@ import org.elasticsearch.packaging.util.Distribution;
import org.elasticsearch.packaging.util.FileUtils; import org.elasticsearch.packaging.util.FileUtils;
import org.elasticsearch.packaging.util.Shell; import org.elasticsearch.packaging.util.Shell;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -38,7 +37,6 @@ public class DebMetadataTests extends PackagingTestCase {
assumeTrue("only deb", distribution.packaging == Distribution.Packaging.DEB); assumeTrue("only deb", distribution.packaging == Distribution.Packaging.DEB);
} }
@Ignore
public void test05CheckLintian() { public void test05CheckLintian() {
sh.run("lintian --fail-on-warnings " + FileUtils.getDistributionFile(distribution())); sh.run("lintian --fail-on-warnings " + FileUtils.getDistributionFile(distribution()));
} }