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 /common | |
| 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 'common')
| -rw-r--r-- | common/impl-parent/pom.xml | 17 | ||||
| -rw-r--r-- | common/minimal-distribution-parent/pom.xml | 49 |
2 files changed, 48 insertions, 18 deletions
diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index d02e39488..96b051c90 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -86,7 +86,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <execution> <id>copy-dependencies</id> @@ -105,8 +105,8 @@ </plugin> <!-- Generate module to yang provider index --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>generate-yang-index</id> @@ -115,9 +115,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.generateIndexForPresentModules(project, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator + ModuleYangIndexGenerator.generateIndexForPresentModules(project, log) + ]]> + </script> + </scripts> </configuration> </execution> </executions> diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index bb456f3a3..c3b0eef45 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -64,7 +64,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.1.1</version> <executions> <execution> <id>unpack-configuration</id> @@ -83,8 +83,8 @@ <!-- Generate shell script --> <!-- Extract modules started by distribution --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <execution> <id>start-scripts-generation</id> @@ -93,9 +93,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.StartupScriptGenerator + StartupScriptGenerator.generate(project, properties, log) + ]]> + </script> + </scripts> </configuration> </execution> <execution> @@ -107,9 +112,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModulesListGenerator + ModulesListGenerator.generate(project, log) + ]]> + </script> + </scripts> </configuration> </execution> <execution> @@ -119,9 +129,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator + ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log) + ]]> + </script> + </scripts> </configuration> </execution> </executions> @@ -170,5 +185,15 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + </plugins> </build> </project>
\ No newline at end of file |