From d39680f54d4b65344cde7f6b62586c7237348463 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 1 Feb 2024 12:04:06 +0100 Subject: [PATCH] step 3.3.0-snapshot -> 3.4.0 --- CHANGES_NEXT_RELEASE | 4 ---- 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 | 2 ++ cygnus-twitter/pom.xml | 4 ++-- docker/cygnus-common/Dockerfile | 4 ++-- docker/cygnus-ngsi-ld/Dockerfile | 2 +- docker/cygnus-ngsi/Dockerfile | 2 +- docker/cygnus-twitter/Dockerfile | 4 ++-- 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 0196e8b20..8b1378917 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,5 +1 @@ -- [cygnus-common] [Arcgis] include error in log about cast attributes json -- [cygnus-common] Upgrade Debian version from 12.1 to 12.4 in Dockerfile -- [cygnus-common][NGSIGenericColumnAggregator] Fix getValue when gson object is null -- [cygnus-common] [Arcgis] Replace esriFieldTypeNumber by esriFieldTypeSingle (#2334) diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index d1229af52..bece7b329 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.3.0-SNAPSHOT + 3.4.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 00946a81c..c73be5c37 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 1 2024 Alvaro Vega 3.4.0 +- [cygnus-common] [Arcgis] include error in log about cast attributes json +- [cygnus-common] Upgrade Debian version from 12.1 to 12.4 in Dockerfile +- [cygnus-common] [NGSIGenericColumnAggregator] Fix getValue when gson object is null +- [cygnus-common] [Arcgis] Replace esriFieldTypeNumber by esriFieldTypeSingle (#2334) + * Thu Nov 16 2023 Alvaro Vega 3.3.0 - [cygnus-common] [MongoDB] fix error about reindex when datamodel changed - [cygnus-common] [Arcgis] check featureId ignore case (#2320) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index 396ad23b0..c49376104 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.3.0-SNAPSHOT + 3.4.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.3.0-SNAPSHOT + 3.4.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index fd4b7ef37..df75c2690 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.3.0-SNAPSHOT + 3.4.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.3.0-SNAPSHOT + 3.4.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 341c4067f..a8c2e1fa1 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Thu Feb 1 2024 Alvaro Vega 3.4.0 + * Thu Nov 16 2023 Alvaro Vega 3.3.0 - [cygnus-ngsi][cygnus-common] upgrade mockito dep from 1.9.5 to 5.5.0 - [cygnus-ngsi] Fix runtime error: check access aggregator size (#2293) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index c06919b9a..65abedc86 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.3.0-SNAPSHOT + 3.4.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.3.0-SNAPSHOT + 3.4.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index eb7f13981..28aea5291 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 "3.3.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.4.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/3.4.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 cc77731fe..df8486276 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 "3.3.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.4.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 b46bd5d9b..4b23e9c0e 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 "3.3.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.4.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 965dab9ff..2c3cb6a8c 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 "3.3.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.4.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/3.4.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"