Merge pull request #1857 from telefonicaid/task/prepare_2.0.0

Step: 1.18.0_SNAPSHOT -> 2.0.0
telefonicaid · Apr 16, 2020 · dd1b672 · dd1b672
2 parents d7e9444 + 5a5f869
commit dd1b672
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 27 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,17 +0,0 @@
-[cygnus-ngsi][PostgisSink, PostGRESQLSink] Enable datamodel by entity type (dm-by-entity-type) (#1684)
-[cygnus-ngsi] Add correlatorId rollbacked transactions (#1770)
-[cygnus-ngsi][PostGRESQLSink] Fix schemaName when inserting data into DB
-[cygnus-common][PostgreSQL, MySQL] SQL error persistance (#1791)
-[cygnus-ngsi][PostgisSink] Enable postgis functions without native types flag on.
-[cygnus-ngsi][RestHandler] Add a not null validation for ngsiVersion header of request.
-[cygnus-ngsi][HDFSSink] Separate files by property periodicity (#1830)
-[cygnus-common][Elasticsearch] Fix a bug raised NullPointerException when 'ignore_white_spaces' is true and an attribute has null value. (#1838)
-[cygnus-ngsi][NGSISink]Handle generic exception to manage all scenarios when persisting batch (#1844)
-[cygnus-common][PostgreSQL, MySQL] Refactor code to use a SQL generic backend for all SQL-based sinks (#1806)
-[cygnus-common][PostgreSQL, MySQL] Lazy singleton to share pool connections of SQL backends among instances on JVM (#1806)
-[cygnus-ngsi][Elasticsearch] Fix a bug that non-Latin characters such as Japanese are garbled. (#1839)
-[cygnus-ngsi][MongoSink]Fix on mongo collection name asignation. (#1845)
-[cygnus-ngsi][MongoSink]Fix on mongo recvTime Date format.
-[cygnus-common][MongoBackend] Fix persistence error mongo authentication and side effect (using new configuration parameter mongo_auth_source). (#1849)
-[cygnus-ngsi][MongoSink][MongoSTH] Add a new mongoAuthSource parameter to create the Mongo backend.
-[cygnus-ngsi][MongoSink]Search for metadata even if metadata persistence is not enabled.

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>1.18.0_SNAPSHOT</version>
+    <version>2.0.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,13 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* 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 (#1806)
+- [cygnus-common][PostgreSQL, MySQL] Lazy singleton to share pool connections of SQL backends among instances on JVM (#1806)
+- [cygnus-common][PostgreSQL, MySQL] SQL error persistance (#1791)
+- [cygnus-common][MongoBackend] Fix persistence error mongo authentication and side effect (using new configuration parameter mongo_auth_source) (#1849)
+- [cygnus-common][Elasticsearch] Fix a bug raised NullPointerException when 'ignore_white_spaces' is true and an attribute has null value (#1838)
+
 * Fri Feb 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.18.0
 - [cygnus-common][MongoBackend] Proper processing of mongo errors in create index operations (#1756)
 - [cygnus-common] Fix: Changing cygnus port does not work (#1698)

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>1.18.0_SNAPSHOT</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>1.18.0_SNAPSHOT</version>
+            <version>2.0.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,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* 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)
+- [cygnus-ngsi][PostGRESQLSink] Fix schemaName when inserting data into DB
+- [cygnus-ngsi][PostgisSink] Enable postgis functions without native types flag on
+- [cygnus-ngsi][RestHandler] Add a not null validation for ngsiVersion header of request
+- [cygnus-ngsi][HDFSSink] Separate files by property periodicity (#1830)
+- [cygnus-ngsi][NGSISink] Handle generic exception to manage all scenarios when persisting batch (#1844)
+- [cygnus-ngsi][Elasticsearch] Fix a bug that non-Latin characters such as Japanese are garbled.(#1839)
+- [cygnus-ngsi][MongoSink] Fix on mongo collection name asignation (#1845)
+- [cygnus-ngsi][MongoSink] Fix on mongo recvTime Date format
+- [cygnus-ngsi][MongoSink][STHSink] Add a new mongoAuthSource parameter to create the Mongo backend
+- [cygnus-ngsi][MongoSink] Search for metadata even if metadata persistence is not enabled
+
 * Fri Feb 07 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.18.0
 - [cygnus-ngsi] Support for NGSIv2 notifications (#953)
 - [cygnus-ngsi][ArcGIS] Fix classpath for instantation of arcgis sink (#1741)

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>1.18.0_SNAPSHOT</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>1.18.0_SNAPSHOT</version>
+            <version>2.0.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 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
 
 * Tue Oct 29 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.17.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 "1.18.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.0.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.0.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 "1.18.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.0.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 "1.18.0_SNAPSHOT"
+ENV CYGNUS_VERSION "2.0.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.0.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"