fix java11 build javadoc

Signed-off-by: olivier lamy <[email protected]>

Author: olamy

modello-core/src/main/java/org/codehaus/modello/model/Model.java

@@ -41,17 +41,17 @@ public class Model
 {
     private String id;
 
-    private List<ModelClass> classes = new ArrayList<ModelClass>();
+    private List<ModelClass> classes = new ArrayList<>();
 
-    private List<ModelDefault> defaults = new ArrayList<ModelDefault>();
+    private List<ModelDefault> defaults = new ArrayList<>();
 
-    private List<ModelInterface> interfaces = new ArrayList<ModelInterface>();
+    private List<ModelInterface> interfaces = new ArrayList<>();
 
-    private transient Map<String, List<ModelClass>> classMap = new HashMap<String, List<ModelClass>>();
+    private transient Map<String, List<ModelClass>> classMap = new HashMap<>();
 
-    private transient Map<String, ModelDefault> defaultMap = new HashMap<String, ModelDefault>();
+    private transient Map<String, ModelDefault> defaultMap = new HashMap<>();
 
-    private transient Map<String, List<ModelInterface>> interfaceMap = new HashMap<String, List<ModelInterface>>();
+    private transient Map<String, List<ModelInterface>> interfaceMap = new HashMap<>();
 
     private VersionDefinition versionDefinition;
 
@@ -128,7 +128,12 @@ public String getRoot( Version version )
     /**
      * @deprecated This shouldn't be used, anything querying the model should read the
      *             package of the class. Use getDefaultPackageName(..).
+     * @param withVersion return the version
+     * @param version the version
+     * @return the package name
+     *
      */
+    @Deprecated
     public String getPackageName( boolean withVersion, Version version )
     {
         return getDefaultPackageName( withVersion, version );
@@ -141,7 +146,7 @@ public List<ModelClass> getAllClasses()
 
     public List<ModelClass> getClasses( Version version )
     {
-        List<ModelClass> classList = new ArrayList<ModelClass>();
+        List<ModelClass> classList = new ArrayList<>();
 
         for ( ModelClass currentClass : classes )
         {
@@ -235,7 +240,7 @@ public void addClass( ModelClass modelClass )
         }
         else
         {
-            List<ModelClass> classList = new ArrayList<ModelClass>();
+            List<ModelClass> classList = new ArrayList<>();
 
             classMap.put( modelClass.getName(), classList );
         }
@@ -308,7 +313,7 @@ public List<ModelInterface> getAllInterfaces()
 
     public List<ModelInterface> getInterfaces( Version version )
     {
-        List<ModelInterface> interfaceList = new ArrayList<ModelInterface>();
+        List<ModelInterface> interfaceList = new ArrayList<>();
 
         for ( ModelInterface currentInterface : interfaces )
         {
@@ -374,7 +379,7 @@ public void addInterface( ModelInterface modelInterface )
         }
         else
         {
-            List<ModelInterface> interfaceList = new ArrayList<ModelInterface>();
+            List<ModelInterface> interfaceList = new ArrayList<>();
 
             interfaceMap.put( modelInterface.getName(), interfaceList );
         }

modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java

@@ -241,7 +241,11 @@ protected boolean isEmpty( String string )
 
     /**
      * @deprecated Use {@link #getParameter(Properties, String)} instead
+     * @param name parameter name
+     * @param parameters the properties
+     * @return the parameter value
      */
+    @Deprecated
     protected String getParameter( String name, Properties parameters )
     {
         return getParameter( parameters, name );

modello-maven-plugin/src/it/features/pom.xml

@@ -125,10 +125,11 @@
     <plugins>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.2.0</version>
         <configuration>
           <show>private</show>
           <linksource>true</linksource>
+          <detectJavaApiLink>false</detectJavaApiLink>
         </configuration>
       </plugin>
       <plugin>

modello-maven-plugin/src/it/javadoc/pom.xml

@@ -33,6 +33,19 @@
 
   <build>
     <defaultGoal>test</defaultGoal>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.2.0</version>
+          <configuration>
+            <show>private</show>
+            <linksource>true</linksource>
+            <detectJavaApiLink>false</detectJavaApiLink>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -448,11 +448,9 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
+          <version>3.2.0</version>
           <configuration>
-            <links>
-              <link>https://docs.oracle.com/javase/7/docs/api/</link>
-            </links>
+            <detectJavaApiLink>false</detectJavaApiLink>
           </configuration>
         </plugin>
         <plugin>