From bc32e8a6394b1cb036a429e064ed85465dffa47d Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 06 Jan 2016 12:56:10 +0000
Subject: [PATCH] Improve copyright maven plugin
---
opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index 878ead4..3a2a6ea 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -88,6 +88,10 @@
@Parameter(required = true, defaultValue = "${project.scm.connection}")
private String scmRepositoryUrl;
+ /** The Git master branch name of the repository. **/
+ @Parameter(required = true, defaultValue = "origin/master")
+ private String gitMasterBranchName;
+
/**
* List of file patterns for which copyright check and/or update will be skipped.
* Pattern can contain the following wildcards (*, ?, **{@literal /}).
@@ -108,7 +112,7 @@
private static final List<String> SUPPORTED_START_BLOCK_COMMENT_TOKEN = new LinkedList<>(Arrays.asList(
"/*", "<!--"));
- private static final class CustomGitExeScmProvider extends GitExeScmProvider {
+ private final class CustomGitExeScmProvider extends GitExeScmProvider {
@Override
protected GitCommand getDiffCommand() {
@@ -116,7 +120,7 @@
}
}
- private static class CustomGitDiffCommand extends GitDiffCommand implements GitCommand {
+ private class CustomGitDiffCommand extends GitDiffCommand implements GitCommand {
@Override
protected DiffScmResult executeDiffCommand(ScmProviderRepository repo, ScmFileSet fileSet,
@@ -124,7 +128,7 @@
final GitDiffConsumer consumer = new GitDiffConsumer(getLogger(), fileSet.getBasedir());
final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(fileSet.getBasedir(), "diff");
- cl.addArguments(new String[] { "--no-ext-diff", "--relative", "master...HEAD", "." });
+ cl.addArguments(new String[] { "--no-ext-diff", "--relative", gitMasterBranchName + "...HEAD", "." });
if (GitCommandLineUtils.execute(cl, consumer, stderr, getLogger()) != 0) {
return new DiffScmResult(cl.toString(), "The git-diff command failed.", stderr.getOutput(), false);
@@ -217,7 +221,7 @@
final ScmFileSet workspaceFileSet = new ScmFileSet(new File(getBaseDir()));
final DiffScmResult diffMasterHeadResult = getScmManager().diff(
getScmRepository(), workspaceFileSet, null, null);
- ensureCommandSuccess(diffMasterHeadResult, "diff master...HEAD .");
+ ensureCommandSuccess(diffMasterHeadResult, "diff " + gitMasterBranchName + "...HEAD .");
final StatusScmResult statusResult = getScmManager().status(getScmRepository(), workspaceFileSet);
ensureCommandSuccess(statusResult, "status");
@@ -250,7 +254,7 @@
if (scmFile.getStatus() != ScmFileStatus.UNKNOWN
&& file.exists()
- && !changedFiles.contains(scmFilePath)
+ && !changedFiles.contains(file)
&& !fileIsDisabled(scmFilePath)) {
changedFiles.add(file);
}
--
Gitblit v1.10.0