Skip to content

Fix NullPointer during multi-threaded builds #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2018
Merged

Fix NullPointer during multi-threaded builds #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions src/main/java/me/qoomon/maven/extension/gitversioning/VersioningPomReplacementMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;

import javax.inject.Inject;
import java.io.File;
import java.io.IOException;

Expand All @@ -31,25 +29,19 @@ public class VersioningPomReplacementMojo extends AbstractMojo {

static final String GOAL = "pom-replacement";

private MavenSession mavenSession;

private Logger logger;
@Parameter(defaultValue = "${project}", readonly = true, required = true)
private MavenProject currentProject;

@Inject
public VersioningPomReplacementMojo(Logger logger, MavenSession mavenSession) {
this.mavenSession = mavenSession;
this.logger = logger;
}
@Parameter(defaultValue = "${session}", readonly = true, required = true)
private MavenSession mavenSession;

@Override
public synchronized void execute() throws MojoExecutionException, MojoFailureException {

try {
MavenProject currentProject = mavenSession.getCurrentProject();

GAV gav = GAV.of(currentProject);

logger.debug(gav + "remove plugin");
getLog().debug(gav + "remove plugin");

currentProject.getOriginalModel().getBuild().removePlugin(asPlugin());

Expand Down Expand Up @@ -80,7 +72,7 @@ public void temporaryOverridePomFileFromModel(MavenProject project) throws IOExc

ModelUtil.writeModel(project.getOriginalModel(), tmpPomFile);

logger.debug(project.getArtifact() + " temporary override pom file with " + tmpPomFile);
getLog().debug(project.getArtifact() + " temporary override pom file with " + tmpPomFile);

project.setPomFile(tmpPomFile);
}
Expand Down