From a7a8f9822082e533096e5bdecc531cbaea0f3931 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Wed, 10 Apr 2019 17:43:54 +0200
Subject: HONEYCOMB-448: JAVA 11 support

- updated dependencies
- compilation error fixes

Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 common/impl-parent/pom.xml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'common/impl-parent/pom.xml')

diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index a1c8ecbeb..dd4e010ab 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -68,6 +68,11 @@
         <version>${guice.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.24.1-GA</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -98,8 +103,9 @@
         </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>
+          <version>${maven.groovy.version}</version>
           <executions>
             <execution>
               <id>generate-yang-index</id>
@@ -108,9 +114,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>
@@ -127,8 +138,8 @@
 
     <plugins>
       <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
       </plugin>
     </plugins>
 
-- 
cgit 1.2.3-korg