From 149a1664fcb40e1ad83f48878a13d2aff0f65b75 Mon Sep 17 00:00:00 2001
From: Marco Platania <platania@research.att.com>
Date: Thu, 18 Apr 2019 18:02:47 -0400
Subject: Update Honeycomb to Rel1810 for vFW

- Update Honeycomb version to 1810 to support ODL Fluorine
- Migrate existing stream-count plugin to 1810
- Update POM structure
- Update vPacketGen install file (including ARM64)

Change-Id: I2866c80876550cb149cdb5fee3193d453643639c
Issue-ID: INT-1035
Signed-off-by: Marco Platania <platania@research.att.com>
---
 vnfs/honeycomb_plugin/parent-pom/pom.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'vnfs/honeycomb_plugin/parent-pom')

diff --git a/vnfs/honeycomb_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/parent-pom/pom.xml
index eb841042..d331f68e 100644
--- a/vnfs/honeycomb_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/parent-pom/pom.xml
@@ -52,15 +52,15 @@ done
         <debug.parameters>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</debug.parameters>
         <guice.version>4.1.0</guice.version>
         <guice.config.version>1.2.0</guice.config.version>
-        <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
-        <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
+        <!--restconf.version>1.3.2-Beryllium-SR2</restconf.version-->
+        <!--netconf.version>1.0.2-Beryllium-SR2</netconf.version-->
         <jersey.version>1.19.1</jersey.version>
         <jetty.version>9.3.11.v20160721</jetty.version>
         <servlet.version>3.1.0</servlet.version>
-        <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
-        <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
+        <!--yangtools.version>0.8.2-Beryllium-SR2</yangtools.version-->
+        <!--mdsal.version>1.3.2-Beryllium-SR2</mdsal.version-->
         <!-- Used by mdsal as provided/runtime dependency-->
-        <osgi.core.version>5.0.0</osgi.core.version>
+        <!--osgi.core.version>5.0.0</osgi.core.version-->
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -69,11 +69,12 @@ done
 
     <!-- Generate executable shell script -->
   <modules>
-    <module>../sample_plugin/sample-plugin-api</module>
-    <module>../sample_plugin/sample-plugin-impl</module>
+    <!--module>../sample-plugin/sample-plugin-api</module-->
+    <!--module>../sample-plugin/sample-plugin-impl</module-->
     <module>../stream-count/stream-count-api</module>
     <module>../stream-count/stream-count-impl</module>
-    <module>../sample-distribution</module>
+    <module>../stream-count/stream-count-distribution</module>
+    <!--module>../sample-distribution</module-->
   </modules>
 
     <build>
@@ -219,7 +220,7 @@ done
                         <dependency>
                             <groupId>io.fd.honeycomb.common</groupId>
                             <artifactId>minimal-assembly-descriptor</artifactId>
-                            <version>1.16.9</version>
+                            <version>1.18.10</version>
                         </dependency>
                     </dependencies>
                     <executions>
-- 
cgit 1.2.3-korg