diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java index 41e7084f2d..d7a036a03d 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java @@ -179,7 +179,7 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo String pluginDirectoryPath = pluginDirectory.getAbsolutePath(); installArtifact(excludeList, pluginDirectoryPath, classpath, - pluginRepository, projectArtifact); + pluginRepository, getPluginArtifact()); if (artifacts != null) { @@ -202,6 +202,25 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo //~--- get methods ---------------------------------------------------------- + /** + * Method description + * + * + * @return + */ + protected Artifact getPluginArtifact() + { + if (projectArtifact.getFile() == null) + { + File file = new File(project.getBuild().getDirectory(), + project.getBuild().getFinalName().concat(".jar")); + + projectArtifact.setFile(file); + } + + return projectArtifact; + } + /** * Method description * diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java index 9e304a1d17..d99d776471 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java @@ -49,7 +49,7 @@ import java.util.List; * @author Sebastian Sdorra * @goal install * @requiresDependencyResolution runtime - * @phase package + * @execute phase="package" */ public class InstallMojo extends AbstractBaseScmMojo { diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java index c01e2bb881..66047e72eb 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java @@ -55,7 +55,7 @@ import java.util.List; * @author Sebastian Sdorra * @goal run * @requiresDependencyResolution runtime - * @phase package + * @execute phase="package" */ public class RunMojo extends AbstractBaseScmMojo {