[camel] 01/01: Fix Javadoc linting issues

[gz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gzurowski pushed a commit to branch feature/fix-javadoc-release-issues
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a8fc734ae60c6e54150d5e22049bdb3b02acc230
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Fri Jun 29 10:08:20 2018 +0200

    Fix Javadoc linting issues
    
    Some modules use custom Javadoc tags that cause the build to break
    when the Javadoc linter checks the sources. This had been disabled
    by providing additional parameters to the maven-javadoc-plugin.
    The element name for providing additional parameters has changed
    since maven-javadoc-plugin version 3.0.0, therefore the previous
    fix didn't work anymore.
    
    This commit fixes this problem and disables Javadoc linting by
    using the correct element `additionalParamaeters`.
    
    Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2c7a01..7ef7165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
     <compiler.fork>false</compiler.fork>
 
     <maven-compiler-plugin-version>3.7.0</maven-compiler-plugin-version>
+    <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
     <maven-surefire-plugin-version>2.22.0</maven-surefire-plugin-version>
     <!-- we need to override the version inherited from Apache POM for modules that use this POM as parent -->
     <surefire.version>${maven-surefire-plugin-version}</surefire.version>
@@ -193,7 +194,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>${maven-javadoc-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -614,7 +615,7 @@
                   <goal>jar</goal>
                 </goals>
                 <configuration>
-                  <additionalparam>${javadoc.opts}</additionalparam>
+                  <additionalOptions>${javadoc.opts}</additionalOptions>
                 </configuration>
               </execution>
             </executions>
@@ -684,7 +685,7 @@
               </execution>
             </executions>
             <configuration>
-              <additionalparam>${javadoc.opts}</additionalparam>
+              <additionalOptions>${javadoc.opts}</additionalOptions>
             </configuration>
           </plugin>
           <!-- We want to sign the artifact, the POM, and all attached artifacts -->