Skip to content

Commit

Permalink
Merge pull request #1645 from telefonicaid/task/prepare_1.13.0
Browse files Browse the repository at this point in the history
Step: 1.12.0_SNAPSHOT -> 1.13.0
  • Loading branch information
AlvaroVega committed May 23, 2019
2 parents fe27b92 + 9b3ccb2 commit 42f6ddb
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 16 deletions.
5 changes: 0 additions & 5 deletions CHANGES_NEXT_RELEASE
@@ -1,5 +0,0 @@

- [cygnus-common] [NMI] Allows th Original values to be omitted in the configuration file. (#1466)
- [cygnus-ngsi] [MysqlSink] Adds support for dm-by-entity-type data model. (#687)
- [cygnus-ngsi] [NGSIMongoSink] [NGSISTHSink] [NGSISink] Close flume transaction at exception (#1635)
- [cygnus-ngsi] [STHSink] Adds mongodb indexes management for STH collections. (#1637)
2 changes: 1 addition & 1 deletion cygnus-common/pom.xml
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>1.12.0_SNAPSHOT</version>
<version>1.13.0</version>
<packaging>jar</packaging>

<name>cygnus-common</name>
Expand Down
3 changes: 3 additions & 0 deletions cygnus-common/spec/SPECS/cygnus-common.spec
Expand Up @@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
/var/run/%{_project_name}

%changelog
* Wed May 22 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.13.0
- [cygnus-common][NMI] Allows th Original values to be omitted in the configuration file (#1466)

* Wed Apr 10 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.12.0
- [cygnus-common][PostgreSQL] Add connection pool
- [cygnus-common][YAFS][bugfix] Fixed issue, missmatching Jetty threads causes Cygnus crash (#1616)
Expand Down
4 changes: 2 additions & 2 deletions cygnus-ngsi/pom.xml
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-ngsi</artifactId>
<version>1.12.0_SNAPSHOT</version>
<version>1.13.0</version>
<packaging>jar</packaging>

<name>cygnus-ngsi</name>
Expand Down Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>1.12.0_SNAPSHOT</version>
<version>1.13.0</version>
</dependency>
</dependencies>

Expand Down
5 changes: 5 additions & 0 deletions cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
Expand Up @@ -99,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
%{_project_install_dir}

%changelog
* Wed May 22 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.13.0
- [cygnus-ngsi][MysqlSink] Adds support for dm-by-entity-type data model (#687)
- [cygnus-ngsi][NGSIMongoSink][NGSISTHSink][NGSISink] Close flume transaction at exception (#1635)
- [cygnus-ngsi][STHSink] Adds mongodb indexes management for STH collections (#1637)

* Wed Apr 10 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.12.0
- [cygnus-ngsi][NGSIHandler] Fix unexpected exception, instead 400 is returned when a non valid API request (#1588)
- [cygnus-ngsi][PostGIS] Add PostGIS sink based on PostgreSQL backend (#1618)
Expand Down
4 changes: 2 additions & 2 deletions cygnus-twitter/pom.xml
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-twitter</artifactId>
<version>1.12.0_SNAPSHOT</version>
<version>1.13.0</version>
<packaging>jar</packaging>

<name>cygnus-twitter</name>
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>1.12.0_SNAPSHOT</version>
<version>1.13.0</version>
</dependency>
<!-- Required by twitter agent -->
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions cygnus-twitter/spec/SPECS/cygnus-twitter.spec
Expand Up @@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT
%{_project_install_dir}

%changelog
* Wed May 22 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.13.0

* Wed Apr 10 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.12.0

* Wed Apr 03 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.11.0
Expand Down
4 changes: 2 additions & 2 deletions docker/cygnus-common/Dockerfile
Expand Up @@ -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.12.0_SNAPSHOT"
ENV CYGNUS_VERSION "1.13.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"
Expand All @@ -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.13.0"

ENV MVN_VER "3.5.4"
ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions docker/cygnus-ngsi/Dockerfile
Expand Up @@ -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.12.0_SNAPSHOT"
ENV CYGNUS_VERSION "1.13.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"
Expand Down Expand Up @@ -199,7 +199,7 @@ ENV CYGNUS_POSTGIS_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.13.0"

ENV MVN_VER "3.5.4"
ENV MVN_HOME "/opt/apache-maven"
Expand Down
4 changes: 2 additions & 2 deletions docker/cygnus-twitter/Dockerfile
Expand Up @@ -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.12.0_SNAPSHOT"
ENV CYGNUS_VERSION "1.13.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"
Expand All @@ -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.13.0"

ENV MVN_VER "3.5.4"
ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
Expand Down

0 comments on commit 42f6ddb

Please sign in to comment.