Merge pull request #1619 from telefonicaid/task/prepare_1.11.0

Step: 1.10.0_SNAPSHOT -> 1.11.0
telefonicaid · Apr 3, 2019 · d9c78c0 · d9c78c0
2 parents 1879477 + 801cb7d
commit d9c78c0
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 23 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,12 +0,0 @@
-- [cygnus-common][bugfix] Support empty files in mamemappings 
-- [cygnus-ngsi][Docker] Set default agent file names for "agent_"
-- [cygnus-common][MySQLBackend] Implement connection pooling (#1598, #1597)
-- [cygnus-common][feature] Add /v1/namemappings route to API (#1277)
-- [cygnus-common][bugfix] Support empty servicenames in mamemappings 
-- [cygnus-ngsi][Docker] Set default truncate size to 0.5GB for sth collections
-- [cygnus-ngsi][KafkaSink] Upgrade libthrift dependency from 0.9.1 to 0.12.0 due to github vulnerability report
-- [cygnus-common][mysql] Upgrade mysql connector from 5.1.31 to 5.1.47
-- [cygnus-common][mongo] Upgrade mongo driver from 3.0.0 to 3.0.4
-- [cygnus-common] Upgrade flume-ng-node version from 1.4.0 to 1.9.0
-- [cygnus-twitter] Upgrade flume-ng-node version from 1.4.0 to 1.9.0
-- [cygnus-ngsi][NGSIRestHandler]Fix Content Type header validation issue. (#1609)

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.10.0_SNAPSHOT</version>
+    <version>1.11.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,15 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Wed Apr 03 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.11.0
+- [cygnus-common] Upgrade flume-ng-node version from 1.4.0 to 1.9.0
+- [cygnus-common][mongo] Upgrade mongo driver from 3.0.0 to 3.0.4
+- [cygnus-common][mysql] Upgrade mysql connector from 5.1.31 to 5.1.47
+- [cygnus-common][feature] Add /v1/namemappings route to API (#1277)
+- [cygnus-common][MySQLBackend] Implement connection pooling (#1598, #1597)
+- [cygnus-common][bugfix] Support empty files in mamemappings
+- [cygnus-common][bugfix] Support empty servicenames in mamemappings
+
 * Thu Dec 13 2018 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.10.0
 - [cygnus-common] Update hive dependence from 0.13.1 to 2.3.4 due to a vulnerability alert
 - [cygnus-common] Update httpclient dependence to 4.3.6 due to a vulnerability

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.10.0_SNAPSHOT</version>
+    <version>1.11.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.10.0_SNAPSHOT</version>
+            <version>1.11.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,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Wed Apr 03 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.11.0
+- [cygnus-ngsi][Docker] Set default agent file names for "agent_"
+- [cygnus-ngsi][Docker] Set default truncate size to 0.5GB for sth collections
+- [cygnus-ngsi][KafkaSink] Upgrade libthrift dependency from 0.9.1 to 0.12.0 due to github vulnerability report
+- [cygnus-ngsi][NGSIRestHandler]Fix Content Type header validation issue (#1609)
+
 * Thu Dec 13 2018 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.10.0
 - [cygnus-ngsi][NGSINameMappingsInterceptor] Now namemapping checks sevice, subervice and (type of entity and id entity) of EntityMapping (#1535)
 - [cygnus-ngsi][NGSIEvent] Unable to deliver event: null pointer getAttributeForNaming (#1506)

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.10.0_SNAPSHOT</version>
+    <version>1.11.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.10.0_SNAPSHOT</version>
+            <version>1.11.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,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Wed Apr 03 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.11.0
+- [cygnus-twitter] Upgrade flume-ng-node version from 1.4.0 to 1.9.0
+
 * Thu Dec 13 2018 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.10.0
 
 * Wed Jun 13 2018 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.9.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.10.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.11.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.11.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.10.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.11.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"
@@ -182,7 +182,7 @@ ENV CYGNUS_ORION_ENABLE_CACHE ""
 # 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.11.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.10.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.11.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.11.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"