Merge pull request #1494 from telefonicaid/task/prepare_1.9.0

Step: 1.8.0_SNAPSHOT -> 1.9.0
telefonicaid · Jun 13, 2018 · 84bd10a · 84bd10a
2 parents ed50706 + d1bd09b
commit 84bd10a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 19 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,8 +0,0 @@
-[cygnus-ngsi][Docker] Add support to run cygnus docker in multiagent mode (mysql, mongo, ckan, hdfs, postgresql and carto sinks) [#1486]
-[cygnus-ngsi][Docker] Upgrade to just enable sinks and channels depending on ENV vars [#1482]
-[cygnus-ngsi][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
-[cygnus-common][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
-[cygnus-twitter][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
-[cygnus-ngsi][NGSINameMappingsInterceptor] Allow regular expression replacement for EntityIds (#1456)
-cygnus-ngsi][HttpBackend] Add support to recover data from response header (#1455)
-[cygnus-ngsi][KeystoneUtils] Create new Auth functionality (#1471)

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.8.0_SNAPSHOT</version>
+    <version>1.9.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,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Wed Jun 13 2018 Fermin Galan <[email protected]> 1.9.0
+- [cygnus-common][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
+
 * Wed Sep 13 2017 Fermin Galan <[email protected]> 1.8.0
 - [cygnus-common, cygnus-ngsi][hardening] Fix FIWARE repository URL (#1435)
 - [cygnus-common, cygnus-ngsi][hardening] Unify test classes (#1332, #1333)

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.8.0_SNAPSHOT</version>
+    <version>1.9.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.8.0_SNAPSHOT</version>
+            <version>1.9.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,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Wed Jun 13 2018 Fermin Galan <[email protected]> 1.9.0
+- [cygnus-ngsi][NGSINameMappingsInterceptor] Allow regular expression replacement for EntityIds (#1456)
+- [cygnus-ngsi][HttpBackend] Add support to recover data from response header (#1455)
+- [cygnus-ngsi][KeystoneUtils] Create new Auth functionality (#1471)
+- [cygnus-ngsi][Docker] Add support to run cygnus docker in multiagent mode (mysql, mongo, ckan, hdfs, postgresql and carto sinks) (#1486)
+- [cygnus-ngsi][Docker] Upgrade to just enable sinks and channels depending on ENV vars (#1482)
+- [cygnus-ngsi][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
+
 * Wed Sep 13 2017 Fermin Galan <[email protected]> 1.8.0
 - [cygnus-ngsi][hardening] Add complex configuration examples (#629)
 - [cygnus-ngsi][bug] Fix NGSIMySQLSink when persisting bulks of rows with different number of columns (#1409)

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.8.0_SNAPSHOT</version>
+    <version>1.9.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.8.0_SNAPSHOT</version>
+            <version>1.9.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 Jun 13 2018 Fermin Galan <[email protected]> 1.9.0
+- [cygnus-twitter][Docker] Upgrade to CentOS 7, Maven 3.5.2 and Java 1.8.0 in Dockerfile
+
 * Wed Sep 13 2017 Fermin Galan <[email protected]> 1.8.0
 - [cygnus-twitter][bug] Fix wrong data in spec file (#1407)
 

diff --git a/docker/cygnus-common/Dockerfile b/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.8.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.9.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.9.0"
 
 ENV MVN_VER "3.5.2"
 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 <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "1.8.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.9.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"
@@ -144,7 +144,7 @@ ENV CYGNUS_CARTO_KEY ""
 # 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.9.0"
 #ENV GIT_REV_CYGNUS "mybranch"
 
 ENV MVN_VER "3.5.3"

diff --git a/docker/cygnus-twitter/Dockerfile b/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.8.0_SNAPSHOT"
+ENV CYGNUS_VERSION "1.9.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.9.0"
 
 ENV MVN_VER "3.5.3"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"