Merge pull request #1871 from telefonicaid/task/prepare-2.1.0

Step: 2.0.0_SNAPSHOT -> 2.1.0
telefonicaid · May 7, 2020 · f5fa1d3 · f5fa1d3
2 parents 1af4e99 + ff98917
commit f5fa1d3
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +0,0 @@
-- Remove \" in value handled by getGeometry
-- [cygnus-common][cygnus-ngsi] Add following parameters (and environment variables for docker) to be able to connect to sql database with SSL/TLS: "mysql_options" (`CYGNUS_MYSQL_OPTIONS`), "postgresql_options" (`CYGNUS_POSTGRESQL_OPTIONS`) and "postgis_options" (`CYGNUS_POSTGIS_OPTIONS`) (#1867)
-- Fix: new env var CYGNUS_POSTGRESQL_DATABASE to set Postgresql database in Docker

diff --git 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.0.0_SNAPSHOT</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>

diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec
@@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Thu May 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.1.0
+- [cygnus-common][cygnus-ngsi] Add following parameters (and environment variables for docker) to be able to connect to sql database with SSL/TLS: "mysql_options" (`CYGNUS_MYSQL_OPTIONS`), "postgresql_options" (`CYGNUS_POSTGRESQL_OPTIONS`) and "postgis_options" (`CYGNUS_POSTGIS_OPTIONS`) (#1867)
+
 * Thu Apr 16 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.0.0
 - [cygnus-common][PostgreSQL, MySQL] Refactor code to use a SQL generic backend for all SQL-based sinks (#1836)
 - [cygnus-common][PostgreSQL, MySQL] Lazy singleton to share pool connections of SQL backends among instances on JVM (#1836)

diff --git 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.0.0_SNAPSHOT</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.0.0_SNAPSHOT</version>
+            <version>2.1.0</version>
         </dependency>
         <!-- libreria arcgis -->
         <dependency>

diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
@@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Thu May 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.1.0
+- [cygnus-ngsi][NGSIPostgreSQLSink][Docker] Add new env var CYGNUS_POSTGRESQL_DATABASE to set Postgresql database in Docker
+- [cygnus-ngsi][NGSIPostgreSQLSink][NGSIPostGISSink] Remove \" in value handled by getGeometry
+
 * Thu Apr 16 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.0.0
 - [cygnus-ngsi][PostgisSink, PostGRESQLSink] Enable datamodel by entity type (dm-by-entity-type) (#1684)
 - [cygnus-ngsi] Add correlatorId rollbacked transactions (#1770)

diff --git 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.0.0_SNAPSHOT</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.0.0_SNAPSHOT</version>
+            <version>2.1.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>

diff --git a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec
@@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Thu May 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.1.0
+
 * Thu Apr 16 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.0.0
 
 * Fri Feb 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.18.0

diff --git 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.0.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.1.0"
 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 "master"
+ENV GIT_REV_CYGNUS "release/2.1.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"

diff --git 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.0.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.1.0"
 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
@@ -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.0.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.1.0"
 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 "master"
+ENV GIT_REV_CYGNUS "release/2.1.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"