fixed classifier NPE

This commit is contained in:
Brian Long 2024-08-26 15:18:39 -04:00
parent e2e0069dec
commit e4ff44be35
2 changed files with 13 additions and 9 deletions

View File

@ -6,7 +6,7 @@
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>amp-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>A Maven plugin to generate AMP files</name>

View File

@ -200,14 +200,18 @@ public class AmpMojo extends AbstractMojo implements ArtifactResolutionCallback
}
private File getModuleFile() throws MojoExecutionException {
String moduleJarFile = this.injectClassifier(this.moduleJarFile);
File jarFile = new File(moduleJarFile);
if (!jarFile.exists()) {
jarFile = new File(this.moduleJarFile);
if (!jarFile.exists())
throw new MojoExecutionException("The module JAR file does not exist: " + this.moduleJarFile);
}
return jarFile;
if (this.classifier != null) {
String moduleJarFile = this.injectClassifier(this.moduleJarFile);
File jarFile = new File(moduleJarFile);
if (jarFile.exists())
return jarFile;
}
File jarFile = new File(this.moduleJarFile);
if (jarFile.exists())
return jarFile;
throw new MojoExecutionException("The module JAR file does not exist: " + this.moduleJarFile);
}
private File getModulePropertyFile() throws MojoExecutionException {