From 37039138afcddedb1af4035aae5fb6c603c4c4e1 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 11 Apr 2019 04:18:16 -0400 Subject: HC2VPP-397: add support for java 11 - dependency updates - compilation error fixes - javadoc fixes Change-Id: Ic7371931b0728c888a39350a77c959121afb9786 Signed-off-by: Michal Cmarada --- vpp-integration/api-docs/core/pom.xml | 4 ++-- .../docs/core/MethodDelegatingClassVisitor.java | 2 +- .../docs/core/MethodPluginCoverageVisitor.java | 2 +- vpp-integration/api-docs/docs/pom.xml | 26 +++++++++++++++++----- vpp-integration/api-docs/scripts/pom.xml | 20 +++++++++++++---- .../docs/scripts/ApiDocsIndexGenerator.groovy | 3 ++- 6 files changed, 42 insertions(+), 15 deletions(-) (limited to 'vpp-integration/api-docs') 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 @@ 2.2.9 4.11 - 4.1.0 - 5.2 + 4.2.2 + 7.0 1.5.4 1.7.25 19.04-SNAPSHOT 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 foundReferences, Set 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 foundReferences, String reference, Set 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 @@ ${project.artifactId} + 1.6.2 + 2.5.4 io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule, @@ -78,15 +80,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.0 1.8 1.8 - org.codehaus.gmaven - groovy-maven-plugin + org.codehaus.gmavenplus + gmavenplus-plugin + ${maven.groovy.version} generate-coverage-doc @@ -95,13 +98,24 @@ execute - - io.fd.hc2vpp.docs.scripts.ApiDocsIndexGenerator.generate(project, log) - + + + + + org.codehaus.groovy + groovy-all + pom + ${groovy.version} + io.fd.hc2vpp.docs scripts 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 @@ ${project.artifactId} - 2.4.7 - 2.9.2-01 - 2.4.3-01 + 2.5.4 + 3.3.0-01 + 2.5.6-02 19.04-SNAPSHOT 4.11 @@ -46,6 +46,12 @@ org.codehaus.groovy groovy-all ${groovy.version} + pom + + + org.codehaus.groovy + groovy-templates + ${groovy.version} io.fd.jvpp @@ -174,7 +180,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 @@ -184,6 +190,7 @@ unpack-dependencies + pom **/honeycomb-minimal-resources/ ${project.build.outputDirectory}/ @@ -217,6 +224,11 @@ groovy-eclipse-batch ${groovy.eclipse.batch.version} + + org.codehaus.groovy + groovy-templates + ${groovy.version} + 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}" -- cgit 1.2.3-korg