From 9952a4a743d2be791771d01396ce91049cc13daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?=
 <fermin.galanmarquez@telefonica.com>
Date: Tue, 20 Oct 2020 16:10:33 +0200
Subject: [PATCH] Step: 2.5.0 -> 2.5.0_SNAPSHOT

---
 cygnus-common/pom.xml            | 2 +-
 cygnus-ngsi-ld/pom.xml           | 4 ++--
 cygnus-ngsi/pom.xml              | 4 ++--
 cygnus-twitter/pom.xml           | 4 ++--
 docker/cygnus-common/Dockerfile  | 4 ++--
 docker/cygnus-ngsi-ld/Dockerfile | 2 +-
 docker/cygnus-ngsi/Dockerfile    | 2 +-
 docker/cygnus-twitter/Dockerfile | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml
index b61c7e626..14b730934 100644
--- a/cygnus-common/pom.xml
+++ b/cygnus-common/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.0_SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>
diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml
index 454c32ca2..62378546c 100644
--- a/cygnus-ngsi-ld/pom.xml
+++ b/cygnus-ngsi-ld/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi-ld</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.0_SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi-ld</name>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.0_SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml
index 3f6aaf7d5..4e5e5fc8c 100644
--- a/cygnus-ngsi/pom.xml
+++ b/cygnus-ngsi/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.0_SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.0_SNAPSHOT</version>
         </dependency>
         <!-- libreria arcgis -->
         <dependency>
diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml
index 544447062..9b441b7e0 100644
--- a/cygnus-twitter/pom.xml
+++ b/cygnus-twitter/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>2.5.0</version>
+    <version>2.5.0_SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-	    <version>2.5.0</version>
+	    <version>2.5.0_SNAPSHOT</version>	    
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>
diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile
index 52c15a04e..5c6ec7be6 100644
--- a/docker/cygnus-common/Dockerfile
+++ b/docker/cygnus-common/Dockerfile
@@ -23,7 +23,7 @@ MAINTAINER Francisco Romero Bueno <francisco.romerobueno@telefonica.com>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.5.0"
+ENV CYGNUS_VERSION "2.5.0_SNAPSHOT"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-common"
@@ -36,7 +36,7 @@ ENV CYGNUS_API_PORT "8081"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "release/2.5.0"
+ENV GIT_REV_CYGNUS "master"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
diff --git a/docker/cygnus-ngsi-ld/Dockerfile b/docker/cygnus-ngsi-ld/Dockerfile
index 54b1fde1d..e4108978a 100644
--- a/docker/cygnus-ngsi-ld/Dockerfile
+++ b/docker/cygnus-ngsi-ld/Dockerfile
@@ -23,7 +23,7 @@ MAINTAINER Andres Muñoz <joseandres.munoz@upm.es>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.5.0"
+ENV CYGNUS_VERSION "2.5.0_SNAPSHOT"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi-ld"
diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile
index aaaf4fb7c..82538a970 100644
--- a/docker/cygnus-ngsi/Dockerfile
+++ b/docker/cygnus-ngsi/Dockerfile
@@ -23,7 +23,7 @@ MAINTAINER Francisco Romero Bueno <francisco.romerobueno@telefonica.com>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.5.0"
+ENV CYGNUS_VERSION "2.5.0_SNAPSHOT"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi"
diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile
index ab987422f..335eeeee3 100644
--- a/docker/cygnus-twitter/Dockerfile
+++ b/docker/cygnus-twitter/Dockerfile
@@ -23,7 +23,7 @@ MAINTAINER Javi Palanca <jpalanca@dsic.upv.es>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.5.0"
+ENV CYGNUS_VERSION "2.5.0_SNAPSHOT"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-twitter"
@@ -35,7 +35,7 @@ ENV CYGNUS_JAVA_OPTS "-Xms2048m -Xmx4096m"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "release/2.5.0"
+ENV GIT_REV_CYGNUS "master"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"