diff --git a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java index 320a5346ca..3b0310fe8c 100644 --- a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java +++ b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java @@ -93,6 +93,9 @@ */ @Component(role = BuildTimestampProvider.class, hint = "jgit") public class JGitBuildTimestampProvider implements BuildTimestampProvider { + private static final String PARAMETER_JGIT_IGNORE = "jgit.ignore"; + + private static final String PARAMETER_JGIT_DIRTY_WORKING_TREE = "jgit.dirtyWorkingTree"; @Requirement(hint = "default") private BuildTimestampProvider defaultTimestampProvider; @@ -112,7 +115,7 @@ public static DirtyBehavior getDirtyWorkingTreeBehaviour(MojoExecution execution if (pluginConfiguration == null) { return defaultBehaviour; } - Xpp3Dom dirtyWorkingTreeDom = pluginConfiguration.getChild("jgit.dirtyWorkingTree"); + Xpp3Dom dirtyWorkingTreeDom = pluginConfiguration.getChild(PARAMETER_JGIT_DIRTY_WORKING_TREE); if (dirtyWorkingTreeDom == null) { return defaultBehaviour; } @@ -219,7 +222,7 @@ private static String getIgnoreFilter(MojoExecution execution) { if (pluginConfiguration == null) { return null; } - Xpp3Dom ignoreDom = pluginConfiguration.getChild("jgit.ignore"); + Xpp3Dom ignoreDom = pluginConfiguration.getChild(PARAMETER_JGIT_IGNORE); if (ignoreDom == null) { return null; } diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java index 965b47f4a8..599da61e4a 100644 --- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java +++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java @@ -116,12 +116,26 @@ public class BuildQualifierMojo extends AbstractVersionMojo { @Parameter(property = "mojoExecution", readonly = true) protected MojoExecution execution; - @Component(role = BuildTimestampProvider.class) - protected Map timestampProviders; + @Component(role = BuildTimestampProvider.class) + protected Map timestampProviders; @Component private BuildPropertiesParser buildPropertiesParser; + /** + * This is only a dummy parameter used to prevent maven from complaining about + * "unknown" parameters when using the jgit extension + */ + @Parameter(alias = "jgit.dirtyWorkingTree") + private String dummy1; + + /** + * This is only a dummy parameter used to prevent maven from complaining about + * "unknown" parameters when using the jgit extension + */ + @Parameter(alias = "jgit.ignore") + private String dummy2; + // setter is needed to make sure we always use UTC public void setFormat(String formatString) { format = new SimpleDateFormat(formatString);