diff --git a/src/main/java/com/github/koraktor/mavanagaiata/AbstractGitMojo.java b/src/main/java/com/github/koraktor/mavanagaiata/AbstractGitMojo.java index 02c5b458..0b410201 100644 --- a/src/main/java/com/github/koraktor/mavanagaiata/AbstractGitMojo.java +++ b/src/main/java/com/github/koraktor/mavanagaiata/AbstractGitMojo.java @@ -54,7 +54,7 @@ public abstract class AbstractGitMojo extends AbstractMojo { * @throws MojoExecutionException if retrieving information from the Git * repository fails */ - public void execute() throws MojoExecutionException { + protected void initRepository() throws MojoExecutionException { try { FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder(); this.repository = repositoryBuilder @@ -74,7 +74,11 @@ public void execute() throws MojoExecutionException { * @see RevCommit * @throws IOException if the repository HEAD could not be retrieved */ - protected RevCommit getHead() throws IOException { + protected RevCommit getHead() throws IOException, MojoExecutionException { + if(this.repository == null) { + this.initRepository(); + } + RevWalk revWalk = new RevWalk(this.repository); ObjectId head = this.repository.getRef("HEAD").getObjectId(); return revWalk.parseCommit(head); diff --git a/src/main/java/com/github/koraktor/mavanagaiata/GitActorsMojo.java b/src/main/java/com/github/koraktor/mavanagaiata/GitActorsMojo.java index f5530283..845359fc 100644 --- a/src/main/java/com/github/koraktor/mavanagaiata/GitActorsMojo.java +++ b/src/main/java/com/github/koraktor/mavanagaiata/GitActorsMojo.java @@ -39,10 +39,7 @@ public class GitActorsMojo extends AbstractGitMojo { * @throws MojoExecutionException if retrieving information from the Git * repository fails */ - @Override public void execute() throws MojoExecutionException { - super.execute(); - try { RevCommit commit = this.getHead(); PersonIdent author = commit.getAuthorIdent(); diff --git a/src/main/java/com/github/koraktor/mavanagaiata/GitBranchMojo.java b/src/main/java/com/github/koraktor/mavanagaiata/GitBranchMojo.java index 3644c9cb..754e5b4b 100644 --- a/src/main/java/com/github/koraktor/mavanagaiata/GitBranchMojo.java +++ b/src/main/java/com/github/koraktor/mavanagaiata/GitBranchMojo.java @@ -30,9 +30,8 @@ public class GitBranchMojo extends AbstractGitMojo { * @throws MojoExecutionException if retrieving information from the Git * repository fails */ - @Override public void execute() throws MojoExecutionException { - super.execute(); + this.initRepository(); try { project.getProperties().put("mavanagaiata.branch", this.repository.getBranch()); diff --git a/src/main/java/com/github/koraktor/mavanagaiata/GitCommitMojo.java b/src/main/java/com/github/koraktor/mavanagaiata/GitCommitMojo.java index a5b2cf84..78804f82 100644 --- a/src/main/java/com/github/koraktor/mavanagaiata/GitCommitMojo.java +++ b/src/main/java/com/github/koraktor/mavanagaiata/GitCommitMojo.java @@ -35,10 +35,7 @@ public class GitCommitMojo extends AbstractGitMojo { * @throws MojoExecutionException if retrieving information from the Git * repository fails */ - @Override public void execute() throws MojoExecutionException { - super.execute(); - try { RevCommit commit = this.getHead(); String abbrevId = this.repository.getObjectDatabase().newReader()