Merge pull request #1269 from telefonicaid/task/close_1.5.0

task/close_1.5.0
telefonicaid · Nov 2, 2016 · fba6639 · fba6639
2 parents 2164985 + b85a4f7
commit fba6639
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 43 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,27 +0,0 @@
-- [cygnus][hardening] Add NGSICKANSink configuration in docker's agent.conf file (#1193)
-- [cygnus][doc] Add entry for Grouping Rules in Installation and Administration Guide (#1206)
-- [cygnus-ngsi][hardening] Delay the retries of not persisted batches (#1138)
-- [cygnus-ngsi][hardening] Add support for regular expressions in Name Mappings (#1202)
-- [cygnus-ngsi][bug] Fix accepted charset by Kafka (#1217)
-- [cygnus][doc] Add missing creation of log4j path (#1212)
-- [cygnus][hardening] Add compilation scripts (#1213)
-- [cygnus][doc] Warn about the incompatibility of installing cygnus-ngsi and cygnus-twitter in the same base path (#1214)
-- [cygnus-ngsi][hardening] Fix automated builds because of "filelock denied" (#1208)
-- [cygnus][doc] Fix docker links in badges (#1222)
-- [cygnus-common][hardening] Add -Dfile.encoding=UTF-8 Java option (#1225)
-- [cygnus-ngsi][hardening] Update JMeter tests (#1229)
-- [cygnus][doc] Update link about getting tokens in documentations (#1227)
-- [cygnus][doc] Replace references to JDK 1.6 with JDK 1.7 (#1232)
-- [cygnus][hardening] Add NGSIHDFSSink configuration in docker's agent.conf file (#1172)
-- [cygnus][hardening] Fix NGSIMySQLSink configuration in docker's agent.conf file (#1237)
-- [cygnus][hardening] Fix NGSIMongoSink and NGSISTHSink configuration in docker's agent.conf file (#1239)
-- [cygnus][bug] Discard Http responses not containing Json payload when creating JsonResponse objects (#1243)
-- [cygnus][hardening] Force the usage of certain version in libraries used by cygnus-ngsi docker (#1233)
-- [cygnus][hardening] Fix yum install command (#1249)
-- [cygnus][hardening] Add FIWARE architecture section in the documentation (#1248)
-- [cygnus][doc] Fix API entries in documentation (#1246)
-- [cygnus][doc] Add entries about running as process and running as service in documentation (#1255)
-- [cygnus-common][hardening] Add traces regarding loaded .jar files (#1210)
-- [cygnus][hardening] Do configurable the CKAN viewer attached to resources (#1258)
-- [cygnus][hardening] Document IPv6 support (#1058)
-- [cygnus][hardening] Add introductory course slides link (#1265)

diff --git a/README.md b/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=1005) **introductory course** in FIWARE Academy.
+* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1006) **introductory course** in FIWARE Academy.
 * The [Contributing Guidelines](doc/contributing/contributing_guidelines.md) if your aim is to extend Cygnus.
 
 ##Licensing

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.4.0_SNAPSHOT</version>
+    <version>1.5.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
@@ -169,6 +169,24 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Wed Nov 02 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.5.0
+- [cygnus][hardening] Add entry for Grouping Rules in Installation and Administration Guide (#1206)
+- [cygnus][hardening] Add missing creation of log4j path (#1212)
+- [cygnus][hardening] Add compilation scripts (#1213)
+- [cygnus][hardening] Warn about the incompatibility of installing cygnus-ngsi and cygnus-twitter in the same base path (#1214)
+- [cygnus][hardening] Fix docker links in badges (#1222)
+- [cygnus-common][hardening] Add -Dfile.encoding=UTF-8 Java option (#1225)
+- [cygnus][hardening] Update link about getting tokens in documentations (#1227)
+- [cygnus][hardening] Replace references to JDK 1.6 with JDK 1.7 (#1232)
+- [cygnus][hardening] Fix yum install command (#1249)
+- [cygnus][hardening] Add FIWARE architecture section in the documentation (#1248)
+- [cygnus][hardening]] Fix API entries in documentation (#1246)
+- [cygnus][hardening] Add entries about running as process and running as service in documentation (#1255)
+- [cygnus-common][hardening] Add traces regarding loaded .jar files (#1210)
+- [cygnus][hardening] Do configurable the CKAN viewer attached to resources (#1258)
+- [cygnus][hardening] Document IPv6 support (#1058)
+- [cygnus][hardening] Add introductory course slides link (#1265)
+
 * Fri Oct 07 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.4.0
 
 * Fri Sep 09 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.3.0
@@ -177,7 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 - [cygnus-common][hardening] Add implementation for /admin/log route (#807)
 - [cygnus-common][hardening] Create ManagementInterfaceUtils class (#1115)
 - [cygnus-common][bug] Add fiware-service and fiware-servicePath headers to all API operations (#1124)
-- [cygnus][doc] Add Orion-Cygnus-Kafka integration example (#1132)
+- [cygnus][hardening] Add Orion-Cygnus-Kafka integration example (#1132)
 - [cygnus-common][bug] Release connection upon persistence error (#1139)
 - [cygnus-common][bug] Insert NULL in CKAN columns when an empty attribute value ("", null, {} or []) or empty attribute metadata (null or []) is notified (#1144)
 

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.4.0_SNAPSHOT</version>
+    <version>1.5.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.4.0_SNAPSHOT</version>
+            <version>1.5.0</version>
         </dependency>
     </dependencies>
 

diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
@@ -97,6 +97,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Wed Nov 02 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.5.0
+- [cygnus][hardening] Add NGSICKANSink configuration in docker's agent.conf file (#1193)
+- [cygnus][hardening] Add entry for Grouping Rules in Installation and Administration Guide (#1206)
+- [cygnus-ngsi][hardening] Delay the retries of not persisted batches (#1138)
+- [cygnus-ngsi][hardening] Add support for regular expressions in Name Mappings (#1202)
+- [cygnus-ngsi][bug] Fix accepted charset by Kafka (#1217)
+- [cygnus][hardening] Add missing creation of log4j path (#1212)
+- [cygnus][hardening] Add compilation scripts (#1213)
+- [cygnus][hardening] Warn about the incompatibility of installing cygnus-ngsi and cygnus-twitter in the same base path (#1214)
+- [cygnus-ngsi][hardening] Fix automated builds because of "filelock denied" (#1208)
+- [cygnus][hardening] Fix docker links in badges (#1222)
+- [cygnus-ngsi][hardening] Update JMeter tests (#1229)
+- [cygnus][hardening] Update link about getting tokens in documentations (#1227)
+- [cygnus][hardening] Replace references to JDK 1.6 with JDK 1.7 (#1232)
+- [cygnus][hardening] Add NGSIHDFSSink configuration in docker's agent.conf file (#1172)
+- [cygnus][hardening] Fix NGSIMySQLSink configuration in docker's agent.conf file (#1237)
+- [cygnus][hardening] Fix NGSIMongoSink and NGSISTHSink configuration in docker's agent.conf file (#1239)
+- [cygnus][bug] Discard Http responses not containing Json payload when creating JsonResponse objects (#1243)
+- [cygnus][hardening] Force the usage of certain version in libraries used by cygnus-ngsi docker (#1233)
+- [cygnus][hardening] Fix yum install command (#1249)
+- [cygnus][hardening] Add FIWARE architecture section in the documentation (#1248)
+- [cygnus][hardening] Fix API entries in documentation (#1246)
+- [cygnus][hardening] Add entries about running as process and running as service in documentation (#1255)
+- [cygnus][hardening] Do configurable the CKAN viewer attached to resources (#1258)
+- [cygnus][hardening] Document IPv6 support (#1058)
+- [cygnus][hardening] Add introductory course slides link (#1265)
+
 * Fri Oct 07 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.4.0
 - [cygnus][bug] Fix documentation about DELETE subscriptions (#1147)
 - [cygnus-ngsi][hardening] Remove unused hashing feature in NGSIMongoSink and NGSISTHSink (#1113)
@@ -106,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 - [cygnus-ngsi][bug] Add certain Http responses as condition for changing host (#1176)
 - [cygnus-ngsi][feature] Name mappings (#1076)
 - [cygnus-ngis][hardening] Add a cache for already created elements in PostgreSQLSink (#1171)
-- [cygnus][doc] Update mkdocs.yml with the google analytics ID (#1183)
+- [cygnus][hardening] Update mkdocs.yml with the google analytics ID (#1183)
 - [cygnus][hardening] Update default agent.conf file with latests paremeters (#1194)
 
 * Fri Sep 09 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.3.0
@@ -117,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 - [cygnus-ngsi][hardening] Reduce the size of the Docker image (#1117)
 - [cygnus-ngsi][hardening] Docker image must print the logs in console (#1125)
 - [cygnus-ngsi][feature] Do per-sink active checkings of element name sizes (#407)
-- [cygnus][doc] Add Orion-Cygnus-Kafka integration example (#1132)
+- [cygnus][hardening] Add Orion-Cygnus-Kafka integration example (#1132)
 - [cygnus-ngsi][hardening] Decrease to DEBUG the logging level of batching related traces (#1126)
 
 * Wed Sep 07 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.2.1

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.4.0_SNAPSHOT</version>
+    <version>1.5.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.4.0_SNAPSHOT</version>
+            <version>1.5.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
@@ -97,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Wed Nov 02 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.5.0
+
 * Fri Oct 07 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.4.0
 
 * Fri Sep 09 2016 Francisco Romero <francisco.romerobueno@telefonica.com> 1.3.0

diff --git a/doc/index.md b/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=1005) **introductory course** in FIWARE Academy.
+* [cygnus-ngsi](https://edu.fiware.org/mod/resource/view.php?id=1006) **introductory course** in FIWARE Academy.
 * The [Contributing Guidelines](../doc/contributing/contributing_guidelines.md) if your aim is to extend Cygnus.
 
 ##Licensing

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.4.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.5.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.5.0"
 
 ENV MVN_VER "3.3.9"
 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.4.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.5.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"
@@ -50,7 +50,7 @@ ENV CYGNUS_HDFS_TOKEN ""
 # 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.5.0"
 # ENV GIT_REV_CYGNUS "mybranch"
 
 ENV MVN_VER "3.3.9"

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.4.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.5.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.5.0"
 
 ENV MVN_VER "3.3.9"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"