You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/09/11 18:28:14 UTC
svn commit: r1808050 - in /maven/plugins/trunk/maven-jmod-plugin/src:
main/java/org/apache/maven/plugins/jmod/ site/apt/
Author: khmarbaise
Date: Mon Sep 11 18:28:14 2017
New Revision: 1808050
URL: http://svn.apache.org/viewvc?rev=1808050&view=rev
Log:
Cleaned up a little bit.
Modified:
maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java
maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java
maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java
maven/plugins/trunk/maven-jmod-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java?rev=1808050&r1=1808049&r2=1808050&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java (original)
+++ maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java Mon Sep 11 18:28:14 2017
@@ -182,7 +182,7 @@ public class JModCreateMojo
* All files from those directories will be copied into the resulting directory <code>includes</code> within the
* jmod file.
* </p>
- * jmod command line equivalent <code>--header-files <path></code> TODO: Define default location.
+ * jmod command line equivalent <code>--header-files <path></code>
*/
@Parameter
private List<String> headerFiles;
@@ -205,7 +205,7 @@ public class JModCreateMojo
* All files from those directories will be copied into the resulting directory <code>man</code> within the jmod
* file.
* </p>
- * jmod command line equivalent <code>--man-pages <path></code> TODO: Define default location.
+ * jmod command line equivalent <code>--man-pages <path></code>
*/
@Parameter
private List<String> manPages;
@@ -234,7 +234,7 @@ public class JModCreateMojo
* All files from those directories will be copied into the resulting directory <code>legal</code> within the jmod
* file.
* </p>
- * jmod command line equivalent <code>--legal-notices <path></code> TODO: Define default location.
+ * jmod command line equivalent <code>--legal-notices <path></code>
*/
@Parameter
private List<String> legalNotices;
@@ -258,9 +258,6 @@ public class JModCreateMojo
@Parameter
private String warnIfResolved;
- /**
- * Do not change this. (TODO!)
- */
@Parameter( defaultValue = "${project.build.directory}", required = true, readonly = true )
private File outputDirectory;
@@ -516,7 +513,7 @@ public class JModCreateMojo
return cmd;
}
- private boolean havingConfigurationDefinedInPOM( List<String> configuration )
+ private boolean isConfigurationDefinedInPOM( List<String> configuration )
{
return configuration != null && !configuration.isEmpty();
}
@@ -524,7 +521,7 @@ public class JModCreateMojo
private List<String> handleConfigurationListWithDefault( List<String> configuration, String defaultLocation )
{
List<String> commands = new ArrayList<String>();
- if ( havingConfigurationDefinedInPOM( configuration ) )
+ if ( isConfigurationDefinedInPOM( configuration ) )
{
commands.addAll( configuration );
}
Modified: maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java?rev=1808050&r1=1808049&r2=1808050&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java (original)
+++ maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModDescribeMojo.java Mon Sep 11 18:28:14 2017
@@ -41,9 +41,6 @@ public class JModDescribeMojo
extends AbstractJModMojo
{
- /**
- * Do not change this. (TODO!)
- */
@Parameter( defaultValue = "${project.build.directory}", required = true, readonly = true )
private File outputDirectory;
Modified: maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java?rev=1808050&r1=1808049&r2=1808050&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java (original)
+++ maven/plugins/trunk/maven-jmod-plugin/src/main/java/org/apache/maven/plugins/jmod/JModListMojo.java Mon Sep 11 18:28:14 2017
@@ -41,9 +41,6 @@ public class JModListMojo
extends AbstractJModMojo
{
- /**
- * Do not change this. (TODO!)
- */
@Parameter( defaultValue = "${project.build.directory}", required = true, readonly = true )
private File outputDirectory;
Modified: maven/plugins/trunk/maven-jmod-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/site/apt/usage.apt.vm?rev=1808050&r1=1808049&r2=1808050&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jmod-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-jmod-plugin/src/site/apt/usage.apt.vm Mon Sep 11 18:28:14 2017
@@ -97,7 +97,9 @@ Usage
+-----
You can put supplemental configuration files, header files, native libraries,
- man pages into the appropriate directories.
+ man pages into the appropriate directories. Furthermore you can add java source
+ files etc. into this module and they will be compiled and later added to the resulting
+ jmod file.
An example source tree looks like this:
+----