From add2d18982f475fe0761246214c587afc0b8ecd3 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Mon, 14 Oct 2024 12:26:03 +0200 Subject: [PATCH 1/2] step 3.12.0-SNAPSHOT -> 3.13.0 --- CHANGES_NEXT_RELEASE | 5 +---- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 2 ++ cygnus-ngsi-ld/pom.xml | 4 ++-- cygnus-ngsi/pom.xml | 4 ++-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 7 +++++++ 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, 23 insertions(+), 17 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 585619ada..8b1378917 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1 @@ -- [cygnus-ngsi][arcgis] Try to get GlobalID if OID is not found in retrieved feature (#2424) -- [cygnus-ngsi][arcgis] Fix json parse for instance of PolyLine, Polygon and Multipoint (#2423) -- [cygnus-ngsi][arcgis] Check feature table is connected before use it (#2405) -- [cygnus-ngsi][arcgis] Set feature table to not connected after a connection error (#2405) + diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 913d9cb5c..5eb55c3e8 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.12.0-SNAPSHOT + 3.13.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 9bb67d0a4..d19eeef95 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 14 2024 Alvaro Vega 3.13.0 + * Fri Sep 27 2024 Alvaro Vega 3.12.0 - [cygnus-common][arcgis] toString of complex geometry is not returning equivalent input (#2418) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index fe15db475..4e029e179 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.12.0-SNAPSHOT + 3.13.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.12.0-SNAPSHOT + 3.13.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 40d8a7acb..10192b138 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.12.0-SNAPSHOT + 3.13.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.12.0-SNAPSHOT + 3.13.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 5717ecb3c..42f58638b 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -100,6 +100,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 27 2024 Alvaro Vega 3.13.0 + +- [cygnus-ngsi][arcgis] Try to get GlobalID if OID is not found in retrieved feature (#2424) +- [cygnus-ngsi][arcgis] Fix json parse for instance of PolyLine, Polygon and Multipoint (#2423) +- [cygnus-ngsi][arcgis] Check feature table is connected before use it (#2405) +- [cygnus-ngsi][arcgis] Set feature table to not connected after a connection error (#2405) + * Fri Sep 27 2024 Alvaro Vega 3.12.0 - [cygnus-ngsi][arcgis] Log json geometry before create instance and in errors related diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index aa660da5c..9dddfa652 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.12.0-SNAPSHOT + 3.13.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.12.0-SNAPSHOT + 3.13.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index e51b51837..a03889be9 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.12.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" @@ -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.13.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 aaa3abaf1..3bb378b25 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.12.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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-ld" diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile index ebd293a13..7fd09866a 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.12.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile index f4b48f454..7e8b8027b 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.12.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" @@ -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.13.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From 93d11dc33dd1b263230054ca80c28ccb032f4473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Mon, 14 Oct 2024 12:56:53 +0200 Subject: [PATCH 2/2] Update cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec --- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 42f58638b..d82668e4c 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Oct 27 2024 Alvaro Vega 3.13.0 +* Mon Oct 14 2024 Alvaro Vega 3.13.0 - [cygnus-ngsi][arcgis] Try to get GlobalID if OID is not found in retrieved feature (#2424) - [cygnus-ngsi][arcgis] Fix json parse for instance of PolyLine, Polygon and Multipoint (#2423)