be explicit in description about merging with manually crafted files

codehaus-plexus · Oct 23, 2019 · 5a189ee · 5a189ee
1 parent a720647
commit 5a189ee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...mponent-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java b/...mponent-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java
@@ -30,7 +30,7 @@
 
 /**
  * Generates a Plexus <tt>components.xml</tt> component descriptor file from source (javadoc) or
- * class annotations.
+ * class annotations and manually crafted descriptor files.
  * 
  * @author Jason van Zyl
  * @author Trygve Laugst&oslash;l

diff --git a/...us-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusMergeMojo.java b/...us-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusMergeMojo.java
@@ -79,7 +79,7 @@ public void execute()
  }
  catch ( IOException e )
  {
- throw new MojoExecutionException( "Error while executing component descritor creator.", e );
+ throw new MojoExecutionException( "Error while executing component descriptor creator.", e );
  }
  }
 }
diff --git a/...ent-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java b/...ent-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java
@@ -30,7 +30,7 @@
 
 /**
  * Generates a Plexus <tt>components.xml</tt> component descriptor file from test source (javadoc)
- * or test class annotations.
+ * or test class annotations and manually crafted descriptor files.
  * 
  * @author Jason van Zyl
  * @author Trygve Laugst&oslash;l

diff --git a/plexus-component-metadata/src/site/apt/index.apt.vm b/plexus-component-metadata/src/site/apt/index.apt.vm
@@ -37,10 +37,12 @@ ${project.name}
  The Plexus Component Metadata Maven Plugin has 3 goals:
 
  * {{{./generate-metadata-mojo.html}plexus-component-metadata:generate-metadata}} generates
- a Plexus components.xml component descriptor file from source (javadoc) or class annotations,
+ a Plexus components.xml component descriptor file from source (javadoc) or class annotations
+ and manually crafted descriptor files,
 
  * {{{./generate-test-metadata-mojo.html}plexus-component-metadata:generate-test-metadata}} generates
- a Plexus components.xml component descriptor file from test source (javadoc) or class annotations,
+ a Plexus components.xml component descriptor file from test source (javadoc) or class annotations
+ and manually crafted descriptor files,
 
  * {{{./merge-metadata-mojo.html}plexus-component-metadata:merge-metadata}} merges
  a set of Plexus descriptors into one descriptor file.