svn commit: r1739517 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java

[mi...@apache.org]

Author: michaelo
Date: Sat Apr 16 21:30:44 2016
New Revision: 1739517

URL: http://svn.apache.org/viewvc?rev=1739517&view=rev
Log:
[MJAVADOC-404] Goal resource-bundle generates faulty JAR file

Contributed-by: Holger Mense <ma...@holger-mense.de>

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java?rev=1739517&r1=1739516&r2=1739517&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java Sat Apr 16 21:30:44 2016
@@ -40,7 +40,7 @@ import java.io.IOException;
  * as taglet, doclet, and link information into a deployable artifact. This artifact can then be consumed
  * by the javadoc plugin mojos when used by the <code>includeDependencySources</code> option, to generate
  * javadocs that are somewhat consistent with those generated in the original project itself.
- *  
+ *
  * @since 2.7
  */
 @Mojo( name = "resource-bundle", defaultPhase = LifecyclePhase.PACKAGE,
@@ -84,10 +84,10 @@ extends AbstractJavadocMojo
      * Assemble a new {@link org.apache.maven.plugin.javadoc.options.JavadocOptions JavadocOptions} instance that
      * contains the configuration options in this
      * mojo, which are a subset of those provided in derivatives of the {@link AbstractJavadocMojo}
-     * class (most of the javadoc mojos, in other words). Then, bundle the contents of the 
+     * class (most of the javadoc mojos, in other words). Then, bundle the contents of the
      * <code>javadocDirectory</code> along with the assembled JavadocOptions instance (serialized to
      * META-INF/maven/javadoc-options.xml) into a project attachment for installation/deployment.
-     * 
+     *
      * {@inheritDoc}
      * @see org.apache.maven.plugin.Mojo#execute()
      */
@@ -102,7 +102,7 @@ extends AbstractJavadocMojo
         {
             throw new MojoExecutionException( "Failed to generate javadoc-options file: " + e.getMessage(), e );
         }
-        
+
         Archiver archiver;
         try
         {
@@ -112,20 +112,20 @@ extends AbstractJavadocMojo
         {
             throw new MojoExecutionException( "Failed to retrieve jar archiver component from manager.", e );
         }
-        
+
         File optionsFile = getJavadocOptionsFile();
         File bundleFile =
             new File( getProject().getBuild().getDirectory(), finalName + "-" + getAttachmentClassifier() + ".jar" );
         try
         {
             archiver.addFile( optionsFile, BUNDLE_OPTIONS_PATH );
-            
+
             File javadocDir = getJavadocDirectory();
             if ( javadocDir.exists() && javadocDir.isDirectory() )
             {
-                archiver.addDirectory( javadocDir, RESOURCES_DIR_PATH );
+                archiver.addDirectory( javadocDir, RESOURCES_DIR_PATH + "/" );
             }
-            
+
             archiver.setDestFile( bundleFile );
             archiver.createArchive();
         }
@@ -139,7 +139,7 @@ extends AbstractJavadocMojo
             throw new MojoExecutionException( "Failed to assemble javadoc-resources bundle archive. Reason: "
                 + e.getMessage(), e );
         }
-        
+
         projectHelper.attachArtifact( getProject(), bundleFile, getAttachmentClassifier() );
     }
 }