[NO ISSUE] Support dir names in generated license files Change-Id: I5af9d85fc95835d6177bdd32c9df6306e87255e3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2565 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/da479dc4 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/da479dc4 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/da479dc4 Branch: refs/heads/release-0.9.4-pre-rc Commit: da479dc466dfbeae49b154b2b59a40a27cdd19aa Parents: aa05501 Author: Michael Blow <mb...@apache.org> Authored: Tue Apr 3 23:05:05 2018 -0400 Committer: Michael Blow <mb...@apache.org> Committed: Tue Apr 3 21:12:58 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hyracks/maven/license/GenerateFileMojo.java | 2 +- .../org/apache/hyracks/test/support/LicensingTestBase.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/da479dc4/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java index 0245eb3..e8625fc 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java @@ -182,8 +182,8 @@ public class GenerateFileMojo extends LicenseMojo { throw new IOException("Could not load template " + generation.getTemplate()); } - outputDir.mkdirs(); final File file = new File(outputDir, generation.getOutputFile()); + file.getParentFile().mkdirs(); getLog().info("Writing " + file + "..."); try (final FileOutputStream fos = new FileOutputStream(file); final Writer writer = new OutputStreamWriter(fos, StandardCharsets.UTF_8)) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/da479dc4/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java index 2fb8446..e2ab3a3 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java @@ -55,7 +55,7 @@ public abstract class LicensingTestBase { protected void verifyMissingLicenses() throws IOException { for (String licenseArtifactName : getLicenseArtifactNames()) { final File licenseFile = - new File(FileUtil.joinPath(installerDir, pathToLicensingFiles(), licenseArtifactName)); + new File(FileUtil.joinPath(getInstallerDir(), pathToLicensingFiles(), licenseArtifactName)); List<String> badLines = new ArrayList<>(); for (String line : FileUtils.readLines(licenseFile, StandardCharsets.UTF_8)) { if (line.matches("^\\s*MISSING:.*")) { @@ -66,9 +66,13 @@ public abstract class LicensingTestBase { } } + protected String getInstallerDir() { + return installerDir; + } + protected void verifyAllRequiredArtifactsPresent() { for (String name : getRequiredArtifactNames()) { - final String fileName = FileUtil.joinPath(installerDir, pathToLicensingFiles(), name); + final String fileName = FileUtil.joinPath(getInstallerDir(), pathToLicensingFiles(), name); Assert.assertTrue(fileName + " missing", new File(fileName).exists()); } }
