From 864cdf469fbd8affec8d0321fbdac243c8343fd8 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 11 Jun 2024 16:14:01 +0200 Subject: [PATCH 1/2] step 3.8.0-snapshot -> 3.9.0 --- CHANGES_NEXT_RELEASE | 3 --- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 4 ++++ cygnus-ngsi-ld/pom.xml | 4 ++-- cygnus-ngsi/pom.xml | 4 ++-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 4 ++++ 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(+), 16 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index f0d64672d..e69de29bb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,3 +0,0 @@ -- [cygnus-arcgis] Get service and subservice using enableNameMappings flag config -- [cygnus-arcgis] Insert null attribute as is in feature table (#2376) -- [cygnus-arcgis] force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379) diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 4396498c5..11a7b876f 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.8.0-SNAPSHOT + 3.9.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index b9e902dad..c09ffad14 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 11 2024 Alvaro Vega 3.9.0 + +- [cygnus-common] [arcgis] Force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379) + * Wed Apr 17 2024 Alvaro Vega 3.8.0 - [cygnus-common] [SQL-sinks] Define default values and allow to set connection pool config for maxPoolSize(3), maxPoolIddle(2), minPoolIdle(0) and minPoolIdleTimeMillis(10000) (#2366) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index 2582a084b..2e9311b9f 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.8.0-SNAPSHOT + 3.9.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.8.0-SNAPSHOT + 3.9.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 49ebfc65d..5892a41ff 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.8.0-SNAPSHOT + 3.9.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.8.0-SNAPSHOT + 3.9.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 7cd78b1db..280840cbd 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Tue Jun 11 2024 Alvaro Vega 3.9.0 +- [cygnus-ngsi] [arcgis-sink] Get service and subservice using enableNameMappings flag config +- [cygnus-ngsi] [arcgis-sink] Insert null attribute as is in feature table (#2376) + * Wed Apr 17 2024 Alvaro Vega 3.8.0 - [cygnus-ngsi] Upgrade Debian version from 12.4 to 12.5 in Dockerfile diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index 2c45d3d7a..f6d3b1366 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.8.0-SNAPSHOT + 3.9.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.8.0-SNAPSHOT + 3.9.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index cb92faaaa..c4fc8a2c0 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.8.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" @@ -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.9.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 1996570f7..c88e6d363 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.8.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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-ld" diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile index a7f40aff3..55c6882ae 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.8.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile index 9e1cbf048..fc4b5c484 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.8.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.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" @@ -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.9.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From 5e838400ed4aef99d2a2addc524884d7b9b11f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Wed, 12 Jun 2024 12:19:16 +0200 Subject: [PATCH 2/2] Apply suggestions from code review --- cygnus-common/spec/SPECS/cygnus-common.spec | 3 +-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index c09ffad14..591ebb7d4 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,8 +172,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jun 11 2024 Alvaro Vega 3.9.0 - +* Wed Jun 12 2024 Alvaro Vega 3.9.0 - [cygnus-common] [arcgis] Force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379) * Wed Apr 17 2024 Alvaro Vega 3.8.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 280840cbd..f87579041 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog -* Tue Jun 11 2024 Alvaro Vega 3.9.0 +* Wed Jun 12 2024 Alvaro Vega 3.9.0 - [cygnus-ngsi] [arcgis-sink] Get service and subservice using enableNameMappings flag config - [cygnus-ngsi] [arcgis-sink] Insert null attribute as is in feature table (#2376)