Skip to content

Commit 39a761c

Browse files
committed
Merge pull request #178 from sergey-podolsky/master
Add git.build.host property
2 parents bf4adb6 + c6517a1 commit 39a761c

File tree

6 files changed

+21
-0
lines changed

6 files changed

+21
-0
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ git.commit.id.describe=${git.commit.id.describe}
266266
git.build.user.name=${git.build.user.name}
267267
git.build.user.email=${git.build.user.email}
268268
git.build.time=${git.build.time}
269+
git.build.host=${git.build.host}
269270
270271
git.commit.id=${git.commit.id}
271272
git.commit.id.abbrev=${git.commit.id.abbrev}
@@ -332,6 +333,7 @@ public class GitRepositoryState {
332333
String buildUserName; // =${git.build.user.name}
333334
String buildUserEmail; // =${git.build.user.email}
334335
String buildTime; // =${git.build.time}
336+
String buildHost; // =${git.build.host}
335337
String commitUserName; // =${git.commit.user.name}
336338
String commitUserEmail; // =${git.commit.user.email}
337339
String commitMessageFull; // =${git.commit.message.full}
@@ -451,6 +453,7 @@ public GitRepositoryState(Properties properties)
451453
this.buildUserName = properties.get("git.build.user.name").toString();
452454
this.buildUserEmail = properties.get("git.build.user.email").toString();
453455
this.buildTime = properties.get("git.build.time").toString();
456+
this.buildHost = properties.get("git.build.host").toString();
454457
this.commitUserName = properties.get("git.commit.user.name").toString();
455458
this.commitUserEmail = properties.get("git.commit.user.email").toString();
456459
this.commitMessageShort = properties.get("git.commit.message.short").toString();

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import pl.project13.maven.git.util.PropertyManager;
4141

4242
import java.io.*;
43+
import java.net.InetAddress;
44+
import java.net.UnknownHostException;
4345
import java.text.SimpleDateFormat;
4446
import java.util.Collections;
4547
import java.util.Date;
@@ -71,6 +73,7 @@ public class GitCommitIdMojo extends AbstractMojo {
7173
public static final String BUILD_AUTHOR_NAME = "build.user.name";
7274
public static final String BUILD_AUTHOR_EMAIL = "build.user.email";
7375
public static final String BUILD_TIME = "build.time";
76+
public static final String BUILD_HOST = "build.host";
7477
public static final String COMMIT_AUTHOR_NAME = "commit.user.name";
7578
public static final String COMMIT_AUTHOR_EMAIL = "commit.user.email";
7679
public static final String COMMIT_MESSAGE_FULL = "commit.message.full";
@@ -355,6 +358,7 @@ public void execute() throws MojoExecutionException {
355358

356359
loadGitData(properties);
357360
loadBuildTimeData(properties);
361+
loadBuildHostData(properties);
358362
loadShortDescribe(properties);
359363
filterNot(properties, excludeProperties);
360364
logProperties(properties);
@@ -472,6 +476,16 @@ void loadBuildTimeData(@NotNull Properties properties) {
472476
put(properties, BUILD_TIME, smf.format(buildDate));
473477
}
474478

479+
void loadBuildHostData(@NotNull Properties properties) {
480+
String buildHost = null;
481+
try {
482+
buildHost = InetAddress.getLocalHost().getHostName();
483+
} catch (UnknownHostException e) {
484+
log("Unable to get build host, skipping property " + BUILD_HOST + ". Error message was: " + e.getMessage());
485+
}
486+
put(properties, BUILD_HOST, buildHost);
487+
}
488+
475489
void loadShortDescribe(@NotNull Properties properties) {
476490
//removes git hash part from describe
477491
String commitDescribe = properties.getProperty(prefixDot + COMMIT_DESCRIBE);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ private void alterMojoSettings(String parameterName, Object parameterValue) {
672672

673673
private void assertGitPropertiesPresentInProject(Properties properties) {
674674
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
675+
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
675676
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
676677
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
677678
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public void setProjectToExecuteMojoIn(@NotNull MavenProject project) {
7272

7373
private void assertGitPropertiesPresentInProject(Properties properties) {
7474
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
75+
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
7576
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
7677
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
7778
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ private void alterMojoSettings(String parameterName, Object parameterValue) {
9393

9494
private void assertGitPropertiesPresentInProject(Properties properties) {
9595
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
96+
assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));
9697
assertThat(properties).satisfies(new ContainsKeyCondition("git.branch"));
9798
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id"));
9899
assertThat(properties).satisfies(new ContainsKeyCondition("git.commit.id.abbrev"));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class NativeAndJGitProviderTest extends GitIntegrationTest
3535
{
3636
public static final String[] GIT_KEYS = new String[] {
3737
"git.build.time",
38+
"git.build.host",
3839
"git.branch",
3940
"git.commit.id",
4041
"git.commit.id.abbrev",

0 commit comments

Comments
 (0)