From 3d89940d1c65fc089977ec14e2b091770dce1d1b Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 11 Apr 2017 12:35:18 +0200
Subject: Set Bump hc2vpp version back to 1.17.04-SNAPSHOT

Change-Id: I964023791311cdef34d92e0dd1867d99a44b2dcd
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 acl/acl-api/pom.xml                          |  4 ++--
 acl/acl-impl/pom.xml                         |  4 ++--
 acl/pom.xml                                  |  4 ++--
 common/api-parent/pom.xml                    |  4 ++--
 common/hc2vpp-parent/pom.xml                 |  4 ++--
 common/impl-parent/pom.xml                   |  6 +++---
 common/minimal-distribution-parent/pom.xml   | 10 +++++-----
 common/pom.xml                               |  4 ++--
 dhcp/dhcp-api/pom.xml                        |  4 ++--
 dhcp/dhcp-impl/pom.xml                       |  6 +++---
 dhcp/pom.xml                                 |  4 ++--
 ioam/api/pom.xml                             |  4 ++--
 ioam/impl/pom.xml                            |  4 ++--
 ioam/pom.xml                                 |  4 ++--
 it/api-test/pom.xml                          |  4 ++--
 it/pom.xml                                   |  2 +-
 l3/api/pom.xml                               |  4 ++--
 l3/impl/pom.xml                              |  4 ++--
 l3/pom.xml                                   |  2 +-
 l3/utils/pom.xml                             |  4 ++--
 lisp/api/pom.xml                             |  6 +++---
 lisp/lisp2vpp/pom.xml                        |  4 ++--
 lisp/pom.xml                                 |  4 ++--
 nat/nat-api/pom.xml                          |  6 +++---
 nat/nat2vpp/pom.xml                          |  8 ++++----
 nat/pom.xml                                  |  4 ++--
 nsh/api/pom.xml                              |  4 ++--
 nsh/impl/pom.xml                             |  4 ++--
 nsh/pom.xml                                  |  4 ++--
 packaging/deb/common/prepare.sh              |  8 ++++----
 packaging/rpm/honeycomb.spec                 |  6 +++---
 packaging/rpm/release                        |  4 ++--
 packaging/rpm/rpmbuild.sh                    |  2 +-
 pom.xml                                      |  4 ++--
 release-notes/pom.xml                        |  4 ++--
 routing/pom.xml                              |  4 ++--
 routing/routing-api/pom.xml                  |  4 ++--
 routing/routing-impl/pom.xml                 |  4 ++--
 samples/pom.xml                              |  2 +-
 samples/samples-api/pom.xml                  |  4 ++--
 samples/samples-impl/pom.xml                 |  4 ++--
 v3po/api/pom.xml                             |  4 ++--
 v3po/pom.xml                                 |  4 ++--
 v3po/v3po2vpp/pom.xml                        |  4 ++--
 vpp-classifier/api/pom.xml                   |  4 ++--
 vpp-classifier/impl/pom.xml                  |  6 +++---
 vpp-classifier/pom.xml                       |  2 +-
 vpp-common/naming-context-api/pom.xml        |  4 ++--
 vpp-common/naming-context-impl/pom.xml       |  4 ++--
 vpp-common/pom.xml                           |  4 ++--
 vpp-common/vpp-common-integration/pom.xml    |  6 +++---
 vpp-common/vpp-impl-parent/pom.xml           |  4 ++--
 vpp-common/vpp-translate-test/pom.xml        |  4 ++--
 vpp-common/vpp-translate-utils/pom.xml       |  4 ++--
 vpp-integration/minimal-distribution/pom.xml | 28 ++++++++++++++--------------
 vpp-integration/pom.xml                      |  4 ++--
 vpp-management/api/pom.xml                   |  4 ++--
 vpp-management/impl/pom.xml                  |  4 ++--
 vpp-management/pom.xml                       |  4 ++--
 59 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml
index ea039726e..8c200ce9d 100644
--- a/acl/acl-api/pom.xml
+++ b/acl/acl-api/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -24,7 +24,7 @@
   <groupId>io.fd.hc2vpp.acl</groupId>
   <artifactId>acl-api</artifactId>
   <name>acl-api</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 7623527c1..c524a2d59 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/impl-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.fd.hc2vpp.acl</groupId>
     <artifactId>acl-impl</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <properties>
         <jvpp.acl.version>17.04-SNAPSHOT</jvpp.acl.version>
diff --git a/acl/pom.xml b/acl/pom.xml
index 8875a3243..14b9e0b40 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -19,11 +19,11 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>acl-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>acl-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml
index ae37e359d..6914955c0 100644
--- a/common/api-parent/pom.xml
+++ b/common/api-parent/pom.xml
@@ -7,14 +7,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <build>
diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml
index 826f4906a..e44777e99 100644
--- a/common/hc2vpp-parent/pom.xml
+++ b/common/hc2vpp-parent/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>honeycomb-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>pom</packaging>
 </project>
\ No newline at end of file
diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index 0c9bd2ac8..e51413b1a 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -7,14 +7,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <!-- import dependencies from honeycomb impl-parent  -->
@@ -23,7 +23,7 @@
             <dependency>
                 <groupId>io.fd.honeycomb.common</groupId>
                 <artifactId>impl-parent</artifactId>
-                <version>1.17.04-RC2</version>
+                <version>1.17.04-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
index 8a6e57e35..ff077ef0b 100644
--- a/common/minimal-distribution-parent/pom.xml
+++ b/common/minimal-distribution-parent/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>io.fd.honeycomb.common</groupId>
                 <artifactId>minimal-distribution-parent</artifactId>
-                <version>1.17.04-RC2</version>
+                <version>1.17.04-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -131,7 +131,7 @@
                         <dependency>
                             <groupId>io.fd.honeycomb.common</groupId>
                             <artifactId>common-scripts</artifactId>
-                            <version>1.17.04-RC2</version>
+                            <version>1.17.04-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -144,7 +144,7 @@
                         <dependency>
                             <groupId>io.fd.honeycomb.common</groupId>
                             <artifactId>minimal-assembly-descriptor</artifactId>
-                            <version>1.17.04-RC2</version>
+                            <version>1.17.04-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                     <executions>
diff --git a/common/pom.xml b/common/pom.xml
index d30a9c8e2..26919e97b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -7,14 +7,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>hc2vpp-parent</relativePath>
     </parent>
 
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-common-aggregator</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <description>Aggregator for common maven parents providing base configuration for Hc2vpp modules</description>
diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml
index 495ac52fe..e92df5f2b 100644
--- a/dhcp/dhcp-api/pom.xml
+++ b/dhcp/dhcp-api/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -24,7 +24,7 @@
   <groupId>io.fd.hc2vpp.dhcp</groupId>
   <artifactId>dhcp-api</artifactId>
   <name>dhcp-api</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml
index 67ce81806..2ede7a520 100644
--- a/dhcp/dhcp-impl/pom.xml
+++ b/dhcp/dhcp-impl/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
     <groupId>io.fd.hc2vpp.dhcp</groupId>
     <artifactId>dhcp-impl</artifactId>
     <name>dhcp-impl</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>io.fd.honeycomb</groupId>
             <artifactId>translate-impl</artifactId>
-            <version>1.17.04-RC2</version>
+            <version>1.17.04-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/dhcp/pom.xml b/dhcp/pom.xml
index 496dd514b..b9db1b935 100644
--- a/dhcp/pom.xml
+++ b/dhcp/pom.xml
@@ -19,11 +19,11 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>dhcp-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>dhcp-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml
index 95ebb1a81..37d24f151 100644
--- a/ioam/api/pom.xml
+++ b/ioam/api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -26,7 +26,7 @@
   <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-api</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 1d17d772b..2c061b1a8 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -26,7 +26,7 @@
   <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-impl</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
diff --git a/ioam/pom.xml b/ioam/pom.xml
index 789189609..1bb703715 100644
--- a/ioam/pom.xml
+++ b/ioam/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml
index 8df8abc4f..b26c22f7d 100644
--- a/it/api-test/pom.xml
+++ b/it/api-test/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>api-test</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/it/pom.xml b/it/pom.xml
index b5b4adeb3..2b89d233e 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/l3/api/pom.xml b/l3/api/pom.xml
index 0ca41436d..265268aaa 100644
--- a/l3/api/pom.xml
+++ b/l3/api/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml
index b2e8e6fe3..d57d0cb94 100644
--- a/l3/impl/pom.xml
+++ b/l3/impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-impl</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/l3/pom.xml b/l3/pom.xml
index f3a43b1c0..cc8d88670 100644
--- a/l3/pom.xml
+++ b/l3/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>hc2vpp-parent</artifactId>
         <groupId>io.fd.hc2vpp.common</groupId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml
index 89f708927..3e9dbc196 100644
--- a/l3/utils/pom.xml
+++ b/l3/utils/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <groupId>io.fd.hc2vpp.l3</groupId>
     <artifactId>l3-utils</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml
index ecdd8ebf2..3be0799c9 100755
--- a/lisp/api/pom.xml
+++ b/lisp/api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
 
@@ -26,12 +26,12 @@
     <groupId>io.fd.hc2vpp.lisp</groupId>
     <artifactId>lisp-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
         <project.translate.groupId>io.fd.honeycomb</project.translate.groupId>
-        <naming.context.version>1.17.04-RC2</naming.context.version>
+        <naming.context.version>1.17.04-SNAPSHOT</naming.context.version>
     </properties>
 
     <dependencies>
diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml
index 78c9c2617..62663069d 100755
--- a/lisp/lisp2vpp/pom.xml
+++ b/lisp/lisp2vpp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
@@ -27,7 +27,7 @@
     <groupId>io.fd.hc2vpp.lisp</groupId>
     <artifactId>lisp2vpp</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
diff --git a/lisp/pom.xml b/lisp/pom.xml
index 8b7083725..0fd7c0355 100755
--- a/lisp/pom.xml
+++ b/lisp/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.lisp</groupId>
     <artifactId>lisp-aggregator</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml
index 859afab72..c29d40010 100644
--- a/nat/nat-api/pom.xml
+++ b/nat/nat-api/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -25,11 +25,11 @@
   <groupId>io.fd.hc2vpp.nat</groupId>
   <artifactId>nat-api</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <naming.context.version>1.17.04-RC2</naming.context.version>
+    <naming.context.version>1.17.04-SNAPSHOT</naming.context.version>
   </properties>
 
   <dependencies>
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 0bcf49034..4cd4ab6e4 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -18,19 +18,19 @@
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.fd.hc2vpp.nat</groupId>
     <artifactId>nat2vpp</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
-        <honeycomb.infra.version>1.17.04-RC2</honeycomb.infra.version>
-        <hc2vpp.common.version>1.17.04-RC2</hc2vpp.common.version>
+        <honeycomb.infra.version>1.17.04-SNAPSHOT</honeycomb.infra.version>
+        <hc2vpp.common.version>1.17.04-SNAPSHOT</hc2vpp.common.version>
     </properties>
 
     <dependencies>
diff --git a/nat/pom.xml b/nat/pom.xml
index 154a4d630..3f24e214a 100644
--- a/nat/pom.xml
+++ b/nat/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nat</groupId>
   <artifactId>nat-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>nat-aggregator</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml
index 29f963e55..edc0ef9c5 100644
--- a/nsh/api/pom.xml
+++ b/nsh/api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -26,7 +26,7 @@
   <groupId>io.fd.hc2vpp.nsh</groupId>
   <artifactId>vppnsh-api</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index f64e4e471..beefe370b 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -25,7 +25,7 @@
   <groupId>io.fd.hc2vpp.nsh</groupId>
   <artifactId>vppnsh-impl</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
diff --git a/nsh/pom.xml b/nsh/pom.xml
index 25d9554fd..a4584814c 100644
--- a/nsh/pom.xml
+++ b/nsh/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nsh</groupId>
   <artifactId>vppnsh-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 3d2daa3ae..69d535389 100755
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5)
 
 # Copy and unpack the archive with vpp-integration distribution
 ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/
-ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-RC2-hc.tar.gz
+ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
 cp ${ARCHIVE} ${SOURCE_DIR}
-ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2-hc.tar.gz
+ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
 tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
 
 # Create packaging root
@@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR}
 mkdir ${BUILD_DIR}
 
 # Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2/ ${BUILD_DIR}/
+mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
 cp -r $2 ${BUILD_DIR}
 
 # OS service definition
@@ -41,7 +41,7 @@ EOT
 
 # Install instructions
 cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}-RC2/* /opt/honeycomb/
+vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
 $3 $4
 EOT
 
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index ff01f4a07..3c4e7efde 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -17,7 +17,7 @@ Summary:    fd.io Honeycomb
 Group:      Applications/Communications
 License:    Apache-1.0
 URL:        http://www.fd.io
-Source0:     vpp-integration-distribution-%{_version}-RC2-hc.zip
+Source0:     vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
 Source1:     honeycomb.service
 Requires:    %{_vpp_dependencies}, java >= 1:1.8.0
 # Required for creating honeycomb group
@@ -38,13 +38,13 @@ fd.io Honeycomb
 
 %prep
 # Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-RC2
+%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
 
 %install
 # Create directory in build root for Honeycomb
 mkdir -p $RPM_BUILD_ROOT/opt/%name
 # Copy Honeycomb from archive to its dir in build root
-cp -r ../vpp-integration-distribution-%{_version}-RC2/* $RPM_BUILD_ROOT/opt/%name
+cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name
 # Create directory in build root for systemd .service file
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 # Copy Honeycomb's systemd .service file to correct dir in build root
diff --git a/packaging/rpm/release b/packaging/rpm/release
index 6d685d2d4..4de82e41c 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
 #!/bin/bash
 # release version
-echo RC2
+# echo RELEASE
 #
 # snapshot version
 #
 # Increasing the build number by a certain margin.
 # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset
 # rewriting older packages
-# echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file
+echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index 86a0054db..b50beb436 100755
--- a/packaging/rpm/rpmbuild.sh
+++ b/packaging/rpm/rpmbuild.sh
@@ -3,7 +3,7 @@ set -xe
 DIR=$(dirname $0)
 DIR=$(readlink -f $DIR)
 ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/
-ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-RC2-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-SNAPSHOT-hc.zip
 mkdir -p ${DIR}/SOURCES/
 cp $ZIPFILE ${DIR}/SOURCES/
 cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
diff --git a/pom.xml b/pom.xml
index a22997bd4..5e81b158c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
   <artifactId>hc2vpp-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>hc2vpp</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index cfba1fe43..4a6b76ebe 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
   <artifactId>release-notes-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/routing/pom.xml b/routing/pom.xml
index 444cc1951..468a2ec98 100644
--- a/routing/pom.xml
+++ b/routing/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.routing</groupId>
     <artifactId>routing-aggregator</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml
index 64a571abe..ab084b549 100644
--- a/routing/routing-api/pom.xml
+++ b/routing/routing-api/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.fd.hc2vpp.routing</groupId>
     <artifactId>routing-api</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>
diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml
index 30ddc6664..88120868f 100644
--- a/routing/routing-impl/pom.xml
+++ b/routing/routing-impl/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.fd.hc2vpp.routing</groupId>
     <artifactId>routing-impl</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/samples/pom.xml b/samples/pom.xml
index f16ace158..1d5745098 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hc2vpp-parent</artifactId>
         <groupId>io.fd.hc2vpp.common</groupId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml
index 938107e7c..c78dc6091 100644
--- a/samples/samples-api/pom.xml
+++ b/samples/samples-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>samples-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml
index 6b8af7587..d4932fd68 100644
--- a/samples/samples-impl/pom.xml
+++ b/samples/samples-impl/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>samples-impl</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api classes generated from yang model -->
diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml
index 452b613ce..1eca45549 100644
--- a/v3po/api/pom.xml
+++ b/v3po/api/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -25,7 +25,7 @@
   <groupId>io.fd.hc2vpp.v3po</groupId>
   <artifactId>v3po-api</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/v3po/pom.xml b/v3po/pom.xml
index cb2d2fd6d..405d849df 100644
--- a/v3po/pom.xml
+++ b/v3po/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.v3po</groupId>
   <artifactId>v3po-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml
index 413360f17..aa14b42a6 100644
--- a/v3po/v3po2vpp/pom.xml
+++ b/v3po/v3po2vpp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
@@ -27,7 +27,7 @@
     <groupId>io.fd.hc2vpp.v3po</groupId>
     <artifactId>v3po2vpp</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml
index 24da28653..6bd15a5c8 100644
--- a/vpp-classifier/api/pom.xml
+++ b/vpp-classifier/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
     <artifactId>vpp-classifier-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml
index 1885d7921..69c06e327 100644
--- a/vpp-classifier/impl/pom.xml
+++ b/vpp-classifier/impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
@@ -30,14 +30,14 @@
     <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
     <artifactId>vpp-classifier-impl</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api -->
         <dependency>
             <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
             <artifactId>vpp-classifier-api</artifactId>
-            <version>1.17.04-RC2</version>
+            <version>1.17.04-SNAPSHOT</version>
         </dependency>
 
         <!-- TODO - HC2VPP-97 - change to sub-interface-api dependency once module is present
diff --git a/vpp-classifier/pom.xml b/vpp-classifier/pom.xml
index 150a1cb44..f08e2ac51 100644
--- a/vpp-classifier/pom.xml
+++ b/vpp-classifier/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml
index e6633935d..5e686d43a 100644
--- a/vpp-common/naming-context-api/pom.xml
+++ b/vpp-common/naming-context-api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>api-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/api-parent</relativePath>
   </parent>
 
@@ -26,7 +26,7 @@
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>naming-context-api</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml
index 7255d2c69..e34d95af2 100644
--- a/vpp-common/naming-context-impl/pom.xml
+++ b/vpp-common/naming-context-impl/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -27,7 +27,7 @@
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>naming-context-impl</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml
index 442972bbc..cc0c1f8dd 100644
--- a/vpp-common/pom.xml
+++ b/vpp-common/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-common-aggregator</artifactId>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 2f70a56b1..cca821f3f 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -19,17 +19,17 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>vpp-common-integration</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <properties>
-        <honeycomb.min.distro.version>1.17.04-RC2</honeycomb.min.distro.version>
+        <honeycomb.min.distro.version>1.17.04-SNAPSHOT</honeycomb.min.distro.version>
         <jvpp.version>17.04-SNAPSHOT</jvpp.version>
         <hamcrest.version>1.3</hamcrest.version>
     </properties>
diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index bfed5f344..254e2c757 100644
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>impl-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -27,7 +27,7 @@
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-impl-parent</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml
index 413d4b22d..1276ee578 100644
--- a/vpp-common/vpp-translate-test/pom.xml
+++ b/vpp-common/vpp-translate-test/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>vpp-translate-test</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml
index fa603df78..08a1c4de1 100644
--- a/vpp-common/vpp-translate-utils/pom.xml
+++ b/vpp-common/vpp-translate-utils/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>vpp-translate-utils</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 32ad19e9f..91af2b83f 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <relativePath>../../common/minimal-distribution-parent</relativePath>
   </parent>
 
@@ -27,22 +27,22 @@
   <groupId>io.fd.hc2vpp.integration</groupId>
   <artifactId>vpp-integration-distribution</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04-RC2</version>
+  <version>1.17.04-SNAPSHOT</version>
 
   <properties>
     <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
-    <v3po.version>1.17.04-RC2</v3po.version>
-    <lisp.version>1.17.04-RC2</lisp.version>
-    <vpp.common.integration.version>1.17.04-RC2</vpp.common.integration.version>
-    <vppnsh.version>1.17.04-RC2</vppnsh.version>
-    <nat.version>1.17.04-RC2</nat.version>
-    <ioam.version>1.17.04-RC2</ioam.version>
-    <routing.version>1.17.04-RC2</routing.version>
-    <acl.version>1.17.04-RC2</acl.version>
-    <dhcp.version>1.17.04-RC2</dhcp.version>
-    <vpp.classifier.version>1.17.04-RC2</vpp.classifier.version>
-    <l3-impl.version>1.17.04-RC2</l3-impl.version>
-    <vpp-management-impl.version>1.17.04-RC2</vpp-management-impl.version>
+    <v3po.version>1.17.04-SNAPSHOT</v3po.version>
+    <lisp.version>1.17.04-SNAPSHOT</lisp.version>
+    <vpp.common.integration.version>1.17.04-SNAPSHOT</vpp.common.integration.version>
+    <vppnsh.version>1.17.04-SNAPSHOT</vppnsh.version>
+    <nat.version>1.17.04-SNAPSHOT</nat.version>
+    <ioam.version>1.17.04-SNAPSHOT</ioam.version>
+    <routing.version>1.17.04-SNAPSHOT</routing.version>
+    <acl.version>1.17.04-SNAPSHOT</acl.version>
+    <dhcp.version>1.17.04-SNAPSHOT</dhcp.version>
+    <vpp.classifier.version>1.17.04-SNAPSHOT</vpp.classifier.version>
+    <l3-impl.version>1.17.04-SNAPSHOT</l3-impl.version>
+    <vpp-management-impl.version>1.17.04-SNAPSHOT</vpp-management-impl.version>
 
     <distribution.modules>
       io.fd.hc2vpp.common.integration.VppCommonModule,
diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml
index 84b41f250..ddfff6730 100644
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.integration</groupId>
     <artifactId>vpp-integration</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
     <description>Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins.</description>
diff --git a/vpp-management/api/pom.xml b/vpp-management/api/pom.xml
index 2ebbe3d28..033732892 100644
--- a/vpp-management/api/pom.xml
+++ b/vpp-management/api/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>api-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.management</groupId>
     <artifactId>vpp-management-api</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml
index 81fbc3992..da4d8ff12 100644
--- a/vpp-management/impl/pom.xml
+++ b/vpp-management/impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>vpp-impl-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
@@ -29,7 +29,7 @@
 
     <groupId>io.fd.hc2vpp.management</groupId>
     <artifactId>vpp-management-impl</artifactId>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api -->
diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml
index 08de9d778..e8f5cc445 100644
--- a/vpp-management/pom.xml
+++ b/vpp-management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>hc2vpp-parent</artifactId>
-        <version>1.17.04-RC2</version>
+        <version>1.17.04-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
     <groupId>io.fd.hc2vpp.management</groupId>
     <artifactId>vpp-management-aggregator</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04-RC2</version>
+    <version>1.17.04-SNAPSHOT</version>
     <description>Aggregator for Hc2vpp vpp-management plugin</description>
 
     <modules>
-- 
cgit 1.2.3-korg