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/docs/pom.xml | |
| 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/docs/pom.xml')
| -rw-r--r-- | vpp-integration/api-docs/docs/pom.xml | 26 |
1 files changed, 20 insertions, 6 deletions
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> |