Merge pull request #1691 from telefonicaid/task/prepare_1.15.0

Step: 1.14.0_SNAPSHOT -> 1.15.0
telefonicaid · Jun 28, 2019 · 3d008b3 · 3d008b3
2 parents 6e36a03 + 528d4c9
commit 3d008b3
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 22 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,11 +0,0 @@
-[cygnus-ngsi][MySQL,PostGIS,PostgreSQL] Check values for Insert before insert
-[cygnus-ngsi][Docker] Add datamodel option to postgresql and postgis sinks
-[cygnus-ngsi][Sinks] Change log level from DEBUG to WARN for configuration errors
-[cygnus-ngsi][Docker] Add multisink mode with single config agent (non multiagent mode) (#1675)
-[cygnus-ngsi][Docker] Add skip agent sinks conf generation env vars
-[cygnus-ngsi][Docker] Add skip name mappings generation env vars
-[cygnus-ngsi][CKAN, docker] Fix docker entrypoint about namemapping
-[cygnus-ngsi][PostGIS, PostgreSQL] Insert right SQL types values, non stringify (#1661)
-[cygnus-ngsi][MySQL] Fix datetime format used (#1646)
-[cygnus-ngsi][PostGIS] Fix geo location persistence bug in column mode
-[cygnus-ngsi][ElasticSearch] Add ElasticSearch sink (#1516, #1521)

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.14.0_SNAPSHOT</version>
+    <version>1.15.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,8 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Fri Jun 28 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.15.0
+
 * Tue Jun 04 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.14.0
 - [cygnus-common][MongoDB] Warn about index creation error instead of throw exception and abort create collection (#1649)
 

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.14.0_SNAPSHOT</version>
+    <version>1.15.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>1.14.0_SNAPSHOT</version>
+            <version>1.15.0</version>
         </dependency>
     </dependencies>
 

diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
@@ -99,6 +99,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Fri Jun 28 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.15.0
+- [cygnus-ngsi][ElasticSearchSink] Add ElasticSearch sink (#1516, #1521)
+- [cygnus-ngsi][PostGISSink, PostgreSQLSink] Insert right SQL types values, non stringify (#1661)
+- [cygnus-ngsi][MySQLSink] Fix datetime format used (#1646)
+- [cygnus-ngsi][PostGISSink] Fix geo location persistence bug in column mode
+- [cygnus-ngsi][MySQLSink,PostGISSink,PostgreSQLSink] Check values for Insert before insert
+- [cygnus-ngsi][*Sink] Change log level from DEBUG to WARN for configuration errors
+- [cygnus-ngsi][CKANSink, Docker] Fix docker entrypoint about namemapping
+- [cygnus-ngsi][Docker] Add datamodel option to postgresql and postgis sinks
+- [cygnus-ngsi][Docker] Add multisink mode with single config agent (non multiagent mode) (#1675)
+- [cygnus-ngsi][Docker] Add skip agent sinks conf generation env vars
+- [cygnus-ngsi][Docker] Add skip name mappings generation env vars
+
 * Tue Jun 04 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.14.0
 
 * Wed May 22 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.13.0

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.14.0_SNAPSHOT</version>
+    <version>1.15.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.14.0_SNAPSHOT</version>
+            <version>1.15.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
+* Fri Jun 28 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.15.0
+
 * Tue Jun 04 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.14.0
 
 * Wed May 22 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.13.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.14.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.15.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"
@@ -34,7 +34,7 @@ ENV CYGNUS_API_PORT "8081"
 
 # 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/1.15.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.14.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.15.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"
@@ -231,7 +231,7 @@ ENV CYGNUS_ELASTICSEARCH_CACHE_FLASH_INTERVAL_SEC ""
 # 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_URL_CYGNUS "https://github.com/myuser/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "master"
+ENV GIT_REV_CYGNUS "release/1.15.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_HOME "/opt/apache-maven"

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.14.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.15.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"
@@ -33,7 +33,7 @@ ENV CYGNUS_JAVA_OPTS "-Xms2048m -Xmx4096m"
 
 # 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/1.15.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"