From 702d69601ecf5a42302ca4afea8385cbc74f9419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Tue, 18 Oct 2022 15:39:37 +0200 Subject: [PATCH] Step: 2.19.0-SNAPSHOT -> 2.20.0 --- CHANGES_NEXT_RELEASE | 10 ---------- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 6 ++++++ cygnus-ngsi-ld/pom.xml | 4 ++-- cygnus-ngsi/pom.xml | 4 ++-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 8 ++++++++ cygnus-twitter/pom.xml | 4 ++-- cygnus-twitter/spec/SPECS/cygnus-twitter.spec | 2 ++ docker/cygnus-common/Dockerfile | 4 ++-- docker/cygnus-ngsi-ld/Dockerfile | 2 +- docker/cygnus-ngsi/Dockerfile | 2 +- docker/cygnus-twitter/Dockerfile | 4 ++-- 12 files changed, 29 insertions(+), 23 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 0f4b0423c..e69de29bb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,10 +0,0 @@ -- [cygnus-ngsi][SQL-sinks] New datamodels added: `data_model=dm-by-fixed-entity-type`, `data_model=dm-by-fixed-entity-type-database-schema`, `data_model=dm-by-fixed-entity-type-database` (#2190) -- [cygnus-ngsi] Fix aggregate using event servicepath (#2185) -- [cygnus-ngsi] Fix wrong table destination when namemapping is not used in datamodels db-by-entity-type-database, dm-by-entity-type-database-schema and dm-by-entity-type -- [cygnus-common] Upgrade postgresql from 42.3.3 to 42.4.1 -- [cygnus-common][MySQLBackend] Upgrade mysql-connector-java from 8.0.27 to 8.0.28 -- [cygnus-ngsi] Upgrade Debian version from 11.2 to 11.3 in Dockerfile -- [cygnus-ngsi] Remove apache-flume and apache-maven tar.gz files from docker -- [cygnus-common] Remove grouping rules functionality (deprecated since version 1.6.0 in December 2016) -- [cygnus-common][SQLBackend] Ordernig batch INSERT sentences upon upsert to avoid deadlocks (#2197) -- [cygnus-ngsi] Ensure columns are in a given order in column aggregator (#2197) diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index e7549e675..8c7e33cd6 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 2.19.0-SNAPSHOT + 2.20.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 9fa418a67..2e378ffbb 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -171,6 +171,12 @@ rm -rf $RPM_BUILD_ROOT /var/run/%{_project_name} %changelog +* Tue Oct 18 2022 Fermin Galan 2.20.0 +- [cygnus-common][SQLBackend] Ordernig batch INSERT sentences upon upsert to avoid deadlocks (#2197) +- [cygnus-common][MySQLBackend] Upgrade mysql-connector-java from 8.0.27 to 8.0.28 +- [cygnus-common] Upgrade postgresql from 42.3.3 to 42.4.1 +- [cygnus-common] Remove grouping rules functionality (deprecated since version 1.6.0 in December 2016) + * Fri Jun 03 2022 Alvaro Vega 2.19.0 - [cygnus-common] FIX: change log level should change log level of all cygnus loggers, not just rootLogger (#1827) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index ae560f7da..1ff787d23 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 2.19.0-SNAPSHOT + 2.20.0 jar cygnus-ngsi-ld @@ -55,7 +55,7 @@ com.telefonica.iot cygnus-common - 2.19.0-SNAPSHOT + 2.20.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 66fd22b28..5f132177f 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 2.19.0-SNAPSHOT + 2.20.0 jar cygnus-ngsi @@ -56,7 +56,7 @@ com.telefonica.iot cygnus-common - 2.19.0-SNAPSHOT + 2.20.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 9644b58d2..07cebc083 100644 --- 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 +* Tue Oct 18 2022 Fermin Galan 2.20.0 +- [cygnus-ngsi][SQL-sinks] New datamodels added: `data_model=dm-by-fixed-entity-type`, `data_model=dm-by-fixed-entity-type-database-schema`, `data_model=dm-by-fixed-entity-type-database` (#2190) +- [cygnus-ngsi] Fix aggregate using event servicepath (#2185) +- [cygnus-ngsi] Fix wrong table destination when namemapping is not used in datamodels db-by-entity-type-database, dm-by-entity-type-database-schema and dm-by-entity-type +- [cygnus-ngsi] Remove apache-flume and apache-maven tar.gz files from docker +- [cygnus-ngsi] Ensure columns are in a given order in column aggregator (#2197) +- [cygnus-ngsi] Upgrade Debian version from 11.2 to 11.3 in Dockerfile + * Fri Jun 03 2022 Alvaro Vega 2.19.0 * Wed May 11 2022 Alvaro Vega 2.18.0 diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index 6a3da5d8c..f5c8c81c4 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 2.19.0-SNAPSHOT + 2.20.0 jar cygnus-twitter @@ -45,7 +45,7 @@ com.telefonica.iot cygnus-common - 2.19.0-SNAPSHOT + 2.20.0 diff --git a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec index 815eeb0b2..d134e6779 100644 --- a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec +++ b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec @@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Tue Oct 18 2022 Fermin Galan 2.20.0 + * Fri Jun 03 2022 Alvaro Vega 2.19.0 * Wed May 11 2022 Alvaro Vega 2.18.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 73edd2fa1..a9111abba 100644 --- a/docker/cygnus-common/Dockerfile +++ b/docker/cygnus-common/Dockerfile @@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.19.0-SNAPSHOT" +ENV CYGNUS_VERSION "2.20.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" @@ -40,7 +40,7 @@ ENV CYGNUS_API_PORT "8081" # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile # 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/2.20.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" diff --git a/docker/cygnus-ngsi-ld/Dockerfile b/docker/cygnus-ngsi-ld/Dockerfile index d761a8f2f..119a8a3af 100644 --- a/docker/cygnus-ngsi-ld/Dockerfile +++ b/docker/cygnus-ngsi-ld/Dockerfile @@ -27,7 +27,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.19.0-SNAPSHOT" +ENV CYGNUS_VERSION "2.20.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-ld" diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile index f2c538a25..eacf6960e 100644 --- a/docker/cygnus-ngsi/Dockerfile +++ b/docker/cygnus-ngsi/Dockerfile @@ -23,7 +23,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.19.0-SNAPSHOT" +ENV CYGNUS_VERSION "2.20.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" diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile index 62a2b8022..1a896ac92 100644 --- a/docker/cygnus-twitter/Dockerfile +++ b/docker/cygnus-twitter/Dockerfile @@ -27,7 +27,7 @@ MAINTAINER Javi Palanca # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.19.0-SNAPSHOT" +ENV CYGNUS_VERSION "2.20.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" @@ -39,7 +39,7 @@ ENV CYGNUS_JAVA_OPTS "-Xms2048m -Xmx4096m" # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile # 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/2.20.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"