Set hc2vpp version to 1.17.04.1-SNAPSHOT

Follows vpp's & honeycomb's development cycle.
Requires https://gerrit.fd.io/r/#/c/6543/

Change-Id: I91e5a08b3223e270e260ab8ece7e68179f8d2d31
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml
index 6f5a24c..3ec956a 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index ba8c3a6..f02de30 100644 (file)
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -20,17 +20,17 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
-        <version>1.17.04</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>17.04</jvpp.acl.version>
+        <jvpp.acl.version>17.04-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>

diff --git a/acl/pom.xml b/acl/pom.xml
index 3ec7f65..bf00cde 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>acl-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 dce23a1..30d59cf 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <build>

diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml
index 865c533..0ea75be 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-parent</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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 b9ed54c..e7ca6d7 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-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>${project.version}</version>
+                <version>1.17.04.1-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 0677a3b..da8af73 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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>${project.version}</version>
+                <version>1.17.04.1-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>${project.version}</version>
+                            <version>1.17.04.1-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -144,7 +144,7 @@
                         <dependency>
                             <groupId>io.fd.honeycomb.common</groupId>
                             <artifactId>minimal-assembly-descriptor</artifactId>
-                            <version>${project.version}</version>
+                            <version>1.17.04.1-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                     <executions>

diff --git a/common/pom.xml b/common/pom.xml
index 50ed9cd..3a335d9 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>hc2vpp-parent</relativePath>
     </parent>
 
 
     <groupId>io.fd.hc2vpp.common</groupId>
     <artifactId>hc2vpp-common-aggregator</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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 9ed8555..3fe8897 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml
index 4c3cea9..d4aaee4 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>io.fd.honeycomb</groupId>
             <artifactId>translate-impl</artifactId>
-            <version>${project.version}</version>
+            <version>1.17.04.1-SNAPSHOT</version>
         </dependency>
 
 

diff --git a/dhcp/pom.xml b/dhcp/pom.xml
index f181682..79d55db 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
   <artifactId>dhcp-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 f594d89..e6c496b 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 6552d15..26ff85e 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -26,12 +26,12 @@
   <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-impl</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>17.04</ioam.version>
-    <jvpp.version>17.04</jvpp.version>
+    <ioam.version>17.04-SNAPSHOT</ioam.version>
+    <jvpp.version>17.04-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>

diff --git a/ioam/pom.xml b/ioam/pom.xml
index 710d0f3..a9df157 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.ioam</groupId>
   <artifactId>vppioam-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 0d361ee..348908b 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>api-test</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <name>${project.artifactId}</name>
 
     <dependencies>

diff --git a/it/pom.xml b/it/pom.xml
index 538add2..5426199 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/jvpp-version b/jvpp-version
index cde36c5..416238e 100755 (executable)
--- a/jvpp-version
+++ b/jvpp-version
@@ -1,2 +1,2 @@
 #!/bin/sh
-echo 17.04
+echo 17.04-SNAPSHOT

diff --git a/l3/api/pom.xml b/l3/api/pom.xml
index 9abb824..9ca63ea 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml
index ac582d3..0a8f41d 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/l3/pom.xml b/l3/pom.xml
index 2f9558b..f7acd83 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml
index cf96f20..54c63de 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml
index a44db67..a2f252a 100755 (executable)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
         <project.translate.groupId>io.fd.honeycomb</project.translate.groupId>
-        <naming.context.version>1.17.04</naming.context.version>
+        <naming.context.version>1.17.04.1-SNAPSHOT</naming.context.version>
     </properties>
 
     <dependencies>

diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml
index 7ee035c..7ba4575 100755 (executable)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>

diff --git a/lisp/pom.xml b/lisp/pom.xml
index b273d5f..475f188 100755 (executable)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.lisp</groupId>
     <artifactId>lisp-aggregator</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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 a1b458e..794cd49 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
-    <naming.context.version>1.17.04</naming.context.version>
+    <naming.context.version>1.17.04.1-SNAPSHOT</naming.context.version>
   </properties>
 
   <dependencies>

diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 60a6785..d827c3c 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
-        <honeycomb.infra.version>1.17.04</honeycomb.infra.version>
-        <hc2vpp.common.version>1.17.04</hc2vpp.common.version>
+        <honeycomb.infra.version>1.17.04.1-SNAPSHOT</honeycomb.infra.version>
+        <hc2vpp.common.version>1.17.04.1-SNAPSHOT</hc2vpp.common.version>
     </properties>
 
     <dependencies>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-snat</artifactId>
-            <version>17.04</version>
+            <version>17.04-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->

diff --git a/nat/pom.xml b/nat/pom.xml
index 40fb7ba..f921948 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nat</groupId>
   <artifactId>nat-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 c398eeb..86bd79d 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index ddb9acb..7d755c1 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
@@ -89,12 +89,12 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>17.04</version>
+        <version>17.04-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>17.04</version>
+        <version>17.04-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>

diff --git a/nsh/pom.xml b/nsh/pom.xml
index 83161f6..491c052 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.nsh</groupId>
   <artifactId>vppnsh-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 a23832c..69d5353 100755 (executable)
--- 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}-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}-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}/ ${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}/* /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 d759d8b..3c4e7ef 100644 (file)
--- 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}-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}
+%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}/* $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 86a2f4d..4de82e4 100755 (executable)
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
 #!/bin/bash
 # release version
-echo RELEASE
+# 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 fbe2ab2..3af9996 100755 (executable)
--- 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-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04.1-SNAPSHOT-hc.zip
 mkdir -p ${DIR}/SOURCES/
 cp $ZIPFILE ${DIR}/SOURCES/
 cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/

diff --git a/packaging/rpm/version b/packaging/rpm/version
index f0bea45..a05c531 100755 (executable)
--- a/packaging/rpm/version
+++ b/packaging/rpm/version
@@ -1,2 +1,2 @@
 #!/bin/bash
-echo 1.17.04
+echo 1.17.04.1

diff --git a/pom.xml b/pom.xml
index 3e45867..538a5d9 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
   <artifactId>hc2vpp-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 02a4497..8e8f9d5 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp</groupId>
   <artifactId>release-notes-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 41a1181..4882a08 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../common/hc2vpp-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.routing</groupId>
     <artifactId>routing-aggregator</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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 8349d20..2721c83 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml
index a19d124..4d7525d 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/samples/pom.xml b/samples/pom.xml
index b8b56d0..abe1f79 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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 e664c46..1d43254 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml
index 686e738..b509d12 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api classes generated from yang model -->

diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml
index fcd09fa..c62a266 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/v3po/pom.xml b/v3po/pom.xml
index 623515d..2af924f 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.v3po</groupId>
   <artifactId>v3po-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 14d4b6c..0e2cc10 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml
index d1d3a10..1eadf2d 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml
index 29a9609..aba7cdc 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api -->
         <dependency>
             <groupId>io.fd.hc2vpp.vpp.classifier</groupId>
             <artifactId>vpp-classifier-api</artifactId>
-            <version>${project.version}</version>
+            <version>1.17.04.1-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 e4786fe..4a78802 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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 08c0512..4983e2e 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-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 7832fb1..cba6666 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml
index 41e52a2..8632bf0 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../common/hc2vpp-parent</relativePath>
   </parent>
 
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-common-aggregator</artifactId>
-  <version>1.17.04</version>
+  <version>1.17.04.1-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 422a0cc..67fbdb3 100644 (file)
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -19,18 +19,18 @@
     <parent>
         <groupId>io.fd.hc2vpp.common</groupId>
         <artifactId>impl-parent</artifactId>
-        <version>1.17.04</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <properties>
-        <honeycomb.min.distro.version>1.17.04</honeycomb.min.distro.version>
-        <jvpp.version>17.04</jvpp.version>
+        <honeycomb.min.distro.version>1.17.04.1-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 f5d1da0..dd219ac 100644 (file)
--- 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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <relativePath>../../common/impl-parent</relativePath>
   </parent>
 
@@ -27,11 +27,11 @@
   <groupId>io.fd.hc2vpp.common</groupId>
   <artifactId>vpp-impl-parent</artifactId>
   <name>${project.artifactId}</name>
-  <version>1.17.04</version>
+  <version>1.17.04.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <jvpp.version>17.04</jvpp.version>
+    <jvpp.version>17.04-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>

diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml
index 8679569..528f149 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>vpp-translate-test</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-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 16cb56c..5cb1224 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 728271d..e126114 100644 (file)
--- 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</version>
+    <version>1.17.04.1-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</version>
+  <version>1.17.04.1-SNAPSHOT</version>
 
   <properties>
     <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
-    <v3po.version>1.17.04</v3po.version>
-    <lisp.version>1.17.04</lisp.version>
-    <vpp.common.integration.version>1.17.04</vpp.common.integration.version>
-    <vppnsh.version>1.17.04</vppnsh.version>
-    <nat.version>1.17.04</nat.version>
-    <ioam.version>1.17.04</ioam.version>
-    <routing.version>1.17.04</routing.version>
-    <acl.version>1.17.04</acl.version>
-    <dhcp.version>1.17.04</dhcp.version>
-    <vpp.classifier.version>1.17.04</vpp.classifier.version>
-    <l3-impl.version>1.17.04</l3-impl.version>
-    <vpp-management-impl.version>1.17.04</vpp-management-impl.version>
+    <v3po.version>1.17.04.1-SNAPSHOT</v3po.version>
+    <lisp.version>1.17.04.1-SNAPSHOT</lisp.version>
+    <vpp.common.integration.version>1.17.04.1-SNAPSHOT</vpp.common.integration.version>
+    <vppnsh.version>1.17.04.1-SNAPSHOT</vppnsh.version>
+    <nat.version>1.17.04.1-SNAPSHOT</nat.version>
+    <ioam.version>1.17.04.1-SNAPSHOT</ioam.version>
+    <routing.version>1.17.04.1-SNAPSHOT</routing.version>
+    <acl.version>1.17.04.1-SNAPSHOT</acl.version>
+    <dhcp.version>1.17.04.1-SNAPSHOT</dhcp.version>
+    <vpp.classifier.version>1.17.04.1-SNAPSHOT</vpp.classifier.version>
+    <l3-impl.version>1.17.04.1-SNAPSHOT</l3-impl.version>
+    <vpp-management-impl.version>1.17.04.1-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 219379e..840ad65 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-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 c258e50..5e6e7e8 100644 (file)
--- 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</version>
+        <version>1.17.04.1-SNAPSHOT</version>
         <relativePath>../../common/api-parent</relativePath>
     </parent>
 
     <groupId>io.fd.hc2vpp.management</groupId>
     <artifactId>vpp-management-api</artifactId>
-    <version>1.17.04</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 </project>
\ No newline at end of file

diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml
index 22d77bc..61c4ec1 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
 
     <dependencies>
         <!-- Api -->

diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml
index 24983e0..c6a0735 100644 (file)
--- 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</version>
+        <version>1.17.04.1-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</version>
+    <version>1.17.04.1-SNAPSHOT</version>
     <description>Aggregator for Hc2vpp vpp-management plugin</description>
 
     <modules>

diff --git a/vpp-version b/vpp-version
index f641712..fea07c4 100755 (executable)
--- a/vpp-version
+++ b/vpp-version
@@ -1,5 +1,5 @@
 #!/bin/sh
-echo '17.04-release'
+echo 'RELEASE'
 
 # Determines which VPP version to use in hc2vpp-integration job.
 # 'RELEASE' will use the latest VPP in the respective branch.