Merge pull request #1405 from telefonicaid/task/close_1.7.0

task/close_1.7.0

CHANGES_NEXT_RELEASE

@@ -1,17 +0,0 @@
-- [cygnus-ngsi][feature] Add global data capping/expirationn options based on time and size (#1317)
-- [cygnus-ngsi][feature] Add specific data capping/expiration implementation for NGSICKANSink (#1344)
-- [cygnus-ngsi][feature] Add specific data capping/expiration implementation for NGSIMySQLSink (#1365)
-- [cygnus] Add Travis CI (#1347)
-- [cygnus-ngsi][hardening] Force lowercase organization, dataset and resource names in NGSICKANSink (#1352)
-- [cygnus-ngsi][hardening] Replace warnings upon unnecessary header received with debug traces at NGSIRestHandler (#1354)
-- [cygnus-ngsi][hardening] Improve persistence error logs at NGSISink (#1358)
-- [cygnus-ngsi][hardening] Add raw bytes to NGSIEvent (#1345)
-- [cygnus-ngsi][hardening] Add cache to NGSIMySQLSink (#130)
-- [cygnus][hardening] Fix "FIWARE" name in license headers (#1369)
-- [cygnus-ngsi][bug] Differentiate among enterprise and individual Carto accounts (#1382)
-- [cygnus-common][hardening] Clean and modularize ManagementInterface.java (#1368)
-- [cygnus-common][feature] Add KPIs API (#1339)
-- [cygnus-common][bug] Fix error handling upon MongoDB collection creation (#1377)
-- [cygnus-ngsi][hardening] Add integration example with Apache Spark (#1397)
-- [cygnus-ngsi][hardening] Add a piece of documentation about capping and/or expirating records in CKAN, MySQL, MongoDB and STH Comet (#1391)
-- [cygnus-ngsi][hardening] Update Cygnus NGSI README with last features and new advanced topics (#1390)

README.md

@@ -50,7 +50,7 @@ Other interesting links are:
 
 * Our [Apiary Documentation](http://telefonicaid.github.io/fiware-cygnus/api/latest) if you want to know how to use our API methods for Cygnus.
 * [cygnus-ngsi](doc/cygnus-ngsi/integration) **integration** examples .
-* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1015) **introductory course** in FIWARE Academy.
+* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1037) **introductory course** in FIWARE Academy.
 * The [Contributing Guidelines](doc/contributing/contributing_guidelines.md) if your aim is to extend Cygnus.
 
 ##Licensing

cygnus-common/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>1.6.0_SNAPSHOT</version>
+    <version>1.7.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>

cygnus-common/spec/SPECS/cygnus-common.spec

@@ -171,6 +171,13 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Tue Jan 31 2017 Francisco Romero <[email protected]> 1.7.0
+- [cygnus] Add Travis CI (#1347)
+- [cygnus][hardening] Fix "FIWARE" name in license headers (#1369)
+- [cygnus-common][hardening] Clean and modularize ManagementInterface.java (#1368)
+- [cygnus-common][feature] Add KPIs API (#1339)
+- [cygnus-common][bug] Fix error handling upon MongoDB collection creation (#1377)
+
 * Fri Dec 02 2016 Francisco Romero <[email protected]> 1.6.0
 - [cygnus][hardening] Add IPv6 support to API and GUI (#1261)
 

cygnus-ngsi/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>1.6.0_SNAPSHOT</version>
+    <version>1.7.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.6.0_SNAPSHOT</version>
+            <version>1.7.0</version>
         </dependency>
     </dependencies>
 

cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec

@@ -99,6 +99,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Tue Jan 31 2017 Francisco Romero <[email protected]> 1.7.0 
+- [cygnus-ngsi][feature] Add global data capping/expirationn options based on time and size (#1317)
+- [cygnus-ngsi][feature] Add specific data capping/expiration implementation for NGSICKANSink (#1344)
+- [cygnus-ngsi][feature] Add specific data capping/expiration implementation for NGSIMySQLSink (#1365)
+- [cygnus] Add Travis CI (#1347)
+- [cygnus-ngsi][hardening] Force lowercase organization, dataset and resource names in NGSICKANSink (#1352)
+- [cygnus-ngsi][hardening] Replace warnings upon unnecessary header received with debug traces at NGSIRestHandler (#1354)
+- [cygnus-ngsi][hardening] Improve persistence error logs at NGSISink (#1358)
+- [cygnus-ngsi][hardening] Add raw bytes to NGSIEvent (#1345)
+- [cygnus-ngsi][hardening] Add cache to NGSIMySQLSink (#130)
+- [cygnus][hardening] Fix "FIWARE" name in license headers (#1369)
+- [cygnus-ngsi][bug] Differentiate among enterprise and individual Carto accounts (#1382)
+- [cygnus-ngsi][hardening] Add integration example with Apache Spark (#1397)
+- [cygnus-ngsi][hardening] Add a piece of documentation about capping and/or expirating records in CKAN, MySQL, MongoDB and STH Comet (#1391)
+- [cygnus-ngsi][hardening] Update Cygnus NGSI README with last features and new advanced topics (#1390)
+
 * Fri Dec 02 2016 Francisco Romero <[email protected]> 1.6.0
 - [cygnus-ngsi][hardening] Update migration script for HDFS regarding new encoding (#1271)
 - [cygnus-ngsi][feature] Add support for geo:json Orion's type in NGSICartoDBSink (#1275)

cygnus-twitter/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>1.6.0_SNAPSHOT</version>
+    <version>1.7.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.6.0_SNAPSHOT</version>
+            <version>1.7.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>

cygnus-twitter/spec/SPECS/cygnus-twitter.spec

@@ -99,7 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
-* Fri Dec 02 2016 Francisco Romero <[email protected]> 1.6.0
+* Tue Jan 31 2016 Francisco Romero <[email protected]> 1.7.0
+
+* Fri Dec 02 2016 Francisco Romero <[email protected]> 1.6.0
 
 * Wed Nov 02 2016 Francisco Romero <[email protected]> 1.5.0
 

doc/index.md

@@ -50,7 +50,7 @@ Other interesting links are:
 
 * Our [Apiary Documentation](http://telefonicaid.github.io/fiware-cygnus/api/latest) if you want to know how to use our API methods for Cygnus.
 * [cygnus-ngsi](doc/cygnus-ngsi/integration) **integration** examples .
-* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1015) **introductory course** in FIWARE Academy.
+* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1037) **introductory course** in FIWARE Academy.
 * The [Contributing Guidelines](../doc/contributing/contributing_guidelines.md) if your aim is to extend Cygnus.
 
 ##Licensing

docker/cygnus-common/Dockerfile

@@ -23,7 +23,7 @@ MAINTAINER Francisco Romero Bueno <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "1.6.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.7.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.7.0"
 
 ENV MVN_VER "3.3.9"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"

docker/cygnus-ngsi/Dockerfile

@@ -23,7 +23,7 @@ MAINTAINER Francisco Romero Bueno <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "1.6.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.7.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"
@@ -52,7 +52,7 @@ ENV CYGNUS_CARTO_KEY "carto"
 # 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.7.0"
 # ENV GIT_REV_CYGNUS "mybranch"
 
 ENV MVN_VER "3.3.9"

docker/cygnus-twitter/Dockerfile

@@ -23,7 +23,7 @@ MAINTAINER Javi Palanca <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "1.6.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.7.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"
@@ -32,7 +32,7 @@ ENV CYGNUS_LOG_APPENDER "console"
 
 # 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.7.0"
 
 ENV MVN_VER "3.3.9"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"