diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-04-11 04:18:16 -0400 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-11 04:18:16 -0400 |
commit | 37039138afcddedb1af4035aae5fb6c603c4c4e1 (patch) | |
tree | 50764c40df951b4e7bd4afa027ec86c346ad4075 /vpp-integration/api-docs/scripts | |
parent | d726d0f173544c8d0078c5f918b5d086f6e85f79 (diff) |
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>
Diffstat (limited to 'vpp-integration/api-docs/scripts')
-rw-r--r-- | vpp-integration/api-docs/scripts/pom.xml | 20 | ||||
-rw-r--r-- | vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy | 3 |
2 files changed, 18 insertions, 5 deletions
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}" |