Author: brett Date: Thu Aug 21 04:33:51 2014 New Revision: 1619285 URL: http://svn.apache.org/r1619285 Log: [NPANDAY-610] ArtifactType as an optional configuration argument
Submitted by: David Akehurst Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java incubator/npanday/trunk/pom.xml Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1619285&r1=1619284&r2=1619285&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java Thu Aug 21 04:33:51 2014 @@ -798,6 +798,14 @@ public abstract class AbstractCompilerMo */ + /** + * artifactType + * + * @parameter expression = "${artifactType}" + */ + protected String artifactType; + + public void execute() throws MojoExecutionException { SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry, settingsPath ); Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java?rev=1619285&r1=1619284&r2=1619285&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java Thu Aug 21 04:33:51 2014 @@ -104,7 +104,8 @@ public final class CompilerMojo compilerConfig.setCommands( getParameters() ); - String artifactTypeName = project.getArtifact().getType(); + + String artifactTypeName = (null!=artifactType)?artifactType:project.getArtifact().getType(); ArtifactType artifactType = ArtifactType.getArtifactTypeForPackagingName( artifactTypeName ); if ( artifactType.equals( ArtifactType.NULL ) ) { Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1619285&r1=1619284&r2=1619285&view=diff ============================================================================== --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Thu Aug 21 04:33:51 2014 @@ -308,6 +308,9 @@ under the License. <contributor> <name>Greg Domjan</name> </contributor> + <contributor> + <name>David Akehurst</name> + </contributor> </contributors> <modules> <module>components</module>