diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-04-10 17:43:54 +0200 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-10 17:43:54 +0200 |
| commit | a7a8f9822082e533096e5bdecc531cbaea0f3931 (patch) | |
| tree | 0b13a21e2360c273eb3d3593bccc37d6474ffb2b /common/minimal-distribution-parent | |
| parent | 9401e2bf0cd137b0cb57b2ac86cbd643d5460b60 (diff) | |
HONEYCOMB-448: JAVA 11 support
- updated dependencies
- compilation error fixes
Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'common/minimal-distribution-parent')
| -rw-r--r-- | common/minimal-distribution-parent/pom.xml | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 0f224343b..d0edeff8d 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -87,8 +87,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> @@ -97,9 +97,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> @@ -111,9 +116,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> @@ -123,9 +133,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> @@ -167,17 +182,18 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> <configuration> <!--http://stackoverflow.com/questions/18107375/getting-skipping-jacoco-execution-due-to-missing-execution-data-file-upon-exec--> - <argLine>${argLine} -Djava.security.egd=file:${random.seed.file}</argLine> + <argLine>${argLine} -Djava.security.egd=file:${random.seed.file} --illegal-access=permit</argLine> </configuration> </plugin> </plugins> </pluginManagement> <plugins> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |