Skip to content

Commit 80fced8

Browse files
author
S L
committed
Fix for #122: rename git.commit.id to git.commit.id.full
1 parent 4df44aa commit 80fced8

8 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
215215
Please note that the strings here are Java regexes ({@code .*} is globbing, not plain {@code *}).
216216
-->
217217
<includeOnlyProperties>
218-
<!-- <includeOnlyProperty>^git.commit.id$</includeOnlyProperty> -->
218+
<!-- <includeOnlyProperty>^git.commit.id.full$</includeOnlyProperty> -->
219219
</includeOnlyProperties>
220220

221221
<!-- @since 2.1.10 -->
@@ -297,7 +297,7 @@ git.branch=${git.branch}
297297
git.dirty=${git.dirty}
298298
git.remote.origin.url=${git.remote.origin.url}
299299
300-
git.commit.id=${git.commit.id}
300+
git.commit.id.full=${git.commit.id.full}
301301
git.commit.id.abbrev=${git.commit.id.abbrev}
302302
git.commit.id.describe=${git.commit.id.describe}
303303
git.commit.id.describe-short=${git.commit.id.describe-short}
@@ -335,7 +335,7 @@ Start out with with adding the above steps to your project, next paste this **gi
335335
<property name="dirty" value="${git.dirty}"/>
336336
<property name="remoteOriginUrl" value="${git.remote.origin.url}"/>
337337

338-
<property name="commitId" value="${git.commit.id}"/>
338+
<property name="commitId" value="${git.commit.id.full}"/>
339339
<property name="commitIdAbbrev" value="${git.commit.id.abbrev}"/>
340340
<property name="describe" value="${git.commit.id.describe}"/>
341341
<property name="describeShort" value="${git.commit.id.describe-short}"/>
@@ -375,7 +375,7 @@ public class GitRepositoryState {
375375
String dirty; // =${git.dirty}
376376
String remoteOriginUrl; // =${git.remote.origin.url}
377377

378-
String commitId; // =${git.commit.id}
378+
String commitId; // =${git.commit.id.full}
379379
String commitIdAbbrev; // =${git.commit.id.abbrev}
380380
String describe; // =${git.commit.id.describe}
381381
String describeShort; // =${git.commit.id.describe-short}
@@ -506,7 +506,7 @@ public GitRepositoryState(Properties properties)
506506
this.dirty = properties.get("git.dirty").toString();
507507
this.remoteOriginUrl = properties.get("git.remote.origin.url").toString();
508508

509-
this.commitId = properties.get("git.commit.id").toString();
509+
this.commitId = properties.get("git.commit.id.full").toString();
510510
this.commitIdAbbrev = properties.get("git.commit.id.abbrev").toString();
511511
this.describe = properties.get("git.commit.id.describe").toString();
512512
this.describeShort = properties.get("git.commit.id.describe-short").toString();

‎src/main/java/pl/project13/maven/git/GitCommitIdMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class GitCommitIdMojo extends AbstractMojo {
6565
// these properties will be exposed to maven
6666
public static final String BRANCH = "branch";
6767
public static final String DIRTY = "dirty";
68-
public static final String COMMIT_ID = "commit.id";
68+
public static final String COMMIT_ID = "commit.id.full";
6969
public static final String COMMIT_ID_ABBREV = "commit.id.abbrev";
7070
public static final String COMMIT_DESCRIBE = "commit.id.describe";
7171
public static final String COMMIT_SHORT_DESCRIBE = "commit.id.describe-short";

‎src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,9 +653,9 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
653653
assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
654654
assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).startsWith(gitDescribeMatchNeedle);
655655

656-
assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id");
657-
assertThat(targetProject.getProperties().get("git.commit.id")).isNotEqualTo(commitIdOfMatchNeedle);
658-
assertThat(targetProject.getProperties().get("git.commit.id")).isEqualTo(headCommitId);
656+
assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.full");
657+
assertThat(targetProject.getProperties().get("git.commit.id.full")).isNotEqualTo(commitIdOfMatchNeedle);
658+
assertThat(targetProject.getProperties().get("git.commit.id.full")).isEqualTo(headCommitId);
659659
}
660660
}
661661

@@ -765,7 +765,7 @@ private void assertGitPropertiesPresentInProject(Properties properties) {
765765
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
766766
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
767767
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
768-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
768+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
769769
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));
770770
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.describe"));
771771
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.name"));

‎src/test/java/pl/project13/maven/git/GitCommitIdMojoTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void shouldIncludeExpectedProperties() throws Exception {
8080

8181
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
8282
assertThat(properties).satisfies(new ContainsKeyCondition("git.dirty"));
83-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
83+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
8484
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));
8585
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.name"));
8686
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.email"));
@@ -115,7 +115,7 @@ public void shouldExcludeAsConfiguredProperties() throws Exception {
115115

116116
// these stay
117117
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
118-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
118+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
119119
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));
120120
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.message.full"));
121121
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.message.short"));
@@ -125,7 +125,7 @@ public void shouldExcludeAsConfiguredProperties() throws Exception {
125125
@Test
126126
public void shouldIncludeOnlyAsConfiguredProperties() throws Exception {
127127
// given
128-
mojo.setIncludeOnlyProperties(ImmutableList.of("git.remote.origin.url", ".*.user.*", "^git.commit.id$"));
128+
mojo.setIncludeOnlyProperties(ImmutableList.of("git.remote.origin.url", ".*.user.*", "^git.commit.id.full$"));
129129

130130
// when
131131
mojo.execute();
@@ -139,7 +139,7 @@ public void shouldIncludeOnlyAsConfiguredProperties() throws Exception {
139139
// glob included
140140
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.name"));
141141
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.email"));
142-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
142+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
143143
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.user.name"));
144144
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.user.email"));
145145

@@ -176,7 +176,7 @@ public void shouldExcludeAndIncludeAsConfiguredProperties() throws Exception {
176176

177177
// these excluded
178178
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.branch"));
179-
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.commit.id"));
179+
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.commit.id.full"));
180180
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.commit.id.abbrev"));
181181
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.commit.message.full"));
182182
assertThat(properties).satisfies(new DoesNotContainKeyCondition("git.commit.message.short"));

‎src/test/java/pl/project13/maven/git/GitSubmodulesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void assertGitPropertiesPresentInProject(Properties properties) {
5757
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
5858
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
5959
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
60-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
60+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
6161
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));
6262
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.name"));
6363
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.email"));

‎src/test/java/pl/project13/maven/git/NaivePerformanceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void assertGitPropertiesPresentInProject(Properties properties) {
9595
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
9696
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
9797
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
98-
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
98+
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.full"));
9999
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));
100100
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.describe"));
101101
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.user.name"));

‎src/test/java/pl/project13/maven/git/NativeAndJGitProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class NativeAndJGitProviderTest extends GitIntegrationTest
3737
"git.build.time",
3838
"git.build.host",
3939
"git.branch",
40-
"git.commit.id",
40+
"git.commit.id.full",
4141
"git.commit.id.abbrev",
4242
"git.commit.id.describe",
4343
"git.build.user.name",

‎src/test/resources/git.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git.build.user.name=${git.build.user.name}
2121
git.build.user.email=${git.build.user.email}
2222
git.build.time=${git.build.time}
2323

24-
git.commit.id=${git.commit.id}
24+
git.commit.id.full=${git.commit.id.full}
2525
git.commit.id.abbrev=${git.commit.id.abbrev}
2626
git.commit.user.name=${git.commit.user.name}
2727
git.commit.user.email=${git.commit.user.email}

0 commit comments

Comments
 (0)