| commit | 05cb4f09b1274aa1f0d63c301f61ed0de5bb1553 | [log] [tgz] |
|---|---|---|
| author | Brett Porter <brett@apache.org> | Thu Aug 21 04:33:51 2014 +0000 |
| committer | Brett Porter <brett@apache.org> | Thu Aug 21 04:33:51 2014 +0000 |
| tree | 18dc4a380ee65cbfe84c2c60597f9857139d6105 | |
| parent | 33a2d63c435b62c687258ea7a8ce67751d1fcfd6 [diff] |
[NPANDAY-610] ArtifactType as an optional configuration argument Submitted by: David Akehurst git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1619285 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java b/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java index 5c4cf39..746f6b1 100644 --- a/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java +++ b/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
@@ -798,6 +798,14 @@ */ + /** + * artifactType + * + * @parameter expression = "${artifactType}" + */ + protected String artifactType; + + public void execute() throws MojoExecutionException { SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry, settingsPath );
diff --git a/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java b/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java index 9395bb8..2198ae1 100644 --- a/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java +++ b/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
@@ -104,7 +104,8 @@ 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 ) ) {
diff --git a/pom.xml b/pom.xml index 089dcb7..e5dd9fa 100644 --- a/pom.xml +++ b/pom.xml
@@ -308,6 +308,9 @@ <contributor> <name>Greg Domjan</name> </contributor> + <contributor> + <name>David Akehurst</name> + </contributor> </contributors> <modules> <module>components</module>