HC2VPP-397: add support for java 11

- dependency updates
- compilation error fixes
- javadoc fixes

Change-Id: Ic7371931b0728c888a39350a77c959121afb9786
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

6 files changed, 42 insertions, 15 deletions

diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index 5df6324e8..b36c901ab 100644
--- a/vpp-integration/api-docs/core/pom.xml
+++ b/vpp-integration/api-docs/core/pom.xml
@@ -33,8 +33,8 @@
     <properties>
         <mockito-core.version>2.2.9</mockito-core.version>
         <junit.version>4.11</junit.version>
-        <guice.version>4.1.0</guice.version>
-        <asm.version>5.2</asm.version>
+        <guice.version>4.2.2</guice.version>
+        <asm.version>7.0</asm.version>
         <asciidoctorj.version>1.5.4</asciidoctorj.version>
         <slf4j-simple.version>1.7.25</slf4j-simple.version>
         <jvpp.version>19.04-SNAPSHOT</jvpp.version>
diff --git a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java
index 39a06e626..47c605a1e 100644
--- a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java
+++ b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodDelegatingClassVisitor.java
@@ -35,7 +35,7 @@ public class MethodDelegatingClassVisitor extends ClassVisitor {
                                         String reference,
                                         Set<PluginMethodReference> foundReferences,
                                         Set<String> allreadyProcessedLocalMethods) {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
         this.currentClass = currentClass;
         this.methodName = methodName;
         this.reference = reference;
diff --git a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java
index fe15f5e79..a1e7a61ed 100644
--- a/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java
+++ b/vpp-integration/api-docs/core/src/main/java/io/fd/hc2vpp/docs/core/MethodPluginCoverageVisitor.java
@@ -38,7 +38,7 @@ public class MethodPluginCoverageVisitor extends MethodVisitor {
     public MethodPluginCoverageVisitor(String currentClass, Set<PluginMethodReference> foundReferences,
                                        String reference,
                                        Set<String> allreadyProcessedLocal) {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
         this.currentClass = currentClass;
         this.foundReferences = foundReferences;
         this.reference = reference;
diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml
index 018578ee8..38ad96707 100644
--- a/vpp-integration/api-docs/docs/pom.xml
+++ b/vpp-integration/api-docs/docs/pom.xml
@@ -26,6 +26,8 @@
     <name>${project.artifactId}</name>
 
     <properties>
+        <maven.groovy.version>1.6.2</maven.groovy.version>
+        <groovy.version>2.5.4</groovy.version>
         <!-- List of modules that are used to extract Writer/Reader factories, and therefore generate api documentation -->
         <api.docs.modules>
             io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule,
@@ -78,15 +80,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>${maven.groovy.version}</version>
                 <executions>
                     <execution>
                         <id>generate-coverage-doc</id>
@@ -95,14 +98,25 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator.generate(project, log)
-                            </source>
+                            <scripts>
+                              <script>
+                                <![CDATA[
+                                  import io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator
+                                  ApiDocsIndexGenerator.generate(project, log)
+                                ]]>
+                              </script>
+                            </scripts>
                         </configuration>
                     </execution>
                 </executions>
                 <dependencies>
                     <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-all</artifactId>
+                        <type>pom</type>
+                        <version>${groovy.version}</version>
+                    </dependency>
+                    <dependency>
                         <groupId>io.fd.hc2vpp.docs</groupId>
                         <artifactId>scripts</artifactId>
                         <version>${project.version}</version>
diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml
index f9fa65d82..b1196fbda 100644
--- a/vpp-integration/api-docs/scripts/pom.xml
+++ b/vpp-integration/api-docs/scripts/pom.xml
@@ -26,9 +26,9 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <groovy.version>2.4.7</groovy.version>
-        <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
-        <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+        <groovy.version>2.5.4</groovy.version>
+        <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+        <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
 
         <jvpp.version>19.04-SNAPSHOT</jvpp.version>
         <junit.version>4.11</junit.version>
@@ -46,6 +46,12 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>${groovy.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-templates</artifactId>
+            <version>${groovy.version}</version>
         </dependency>
         <dependency>
             <groupId>io.fd.jvpp</groupId>
@@ -174,7 +180,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
+                <version>3.1.1</version>
                 <executions>
                     <!-- Dependencies are copied by parent project -->
                     <execution>
@@ -184,6 +190,7 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
+                            <excludeTypes>pom</excludeTypes>
                             <includes>**/honeycomb-minimal-resources/</includes>
                             <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
                         </configuration>
@@ -217,6 +224,11 @@
                         <artifactId>groovy-eclipse-batch</artifactId>
                         <version>${groovy.eclipse.batch.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-templates</artifactId>
+                        <version>${groovy.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>
diff --git a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
index 2c6b24f42..7c920f353 100644
--- a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
+++ b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
@@ -70,7 +70,7 @@ class ApiDocsIndexGenerator {
                 .map { moduleName -> moduleName.trim() }
                 .map { moduleName ->
             log.info "Loading class $moduleName"
-            loader.loadClass(moduleName).newInstance()
+            loader.loadClass(moduleName).getDeclaredConstructor().newInstance()
         }
         .collect(toList())
 
@@ -82,6 +82,7 @@ class ApiDocsIndexGenerator {
         ClassPathTypeIndex classPathIndex = new ClassPathTypeIndex(projectRoot)
 
         log.info "Generating VPP API to YANG mapping"
+
         PLUGIN_CLASSES.stream()
                 .forEach { pluginClass ->
             log.info "Generating mapping for ${pluginClass}"