From e00d97ed845a0dfd922242302e5456f663b8e647 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 13 Nov 2024 11:56:03 +0100 Subject: [PATCH 1/3] step 3.14.0-SNAPSHOT -> 3.15.0 --- CHANGES_NEXT_RELEASE | 2 +- 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 | 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, 20 insertions(+), 14 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index f6fb2d947..8b1378917 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1 @@ -- [cygnus-ngsi][cygnus-comon] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) + diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 0842e6330..298da2926 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.14.0-SNAPSHOT + 3.15.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index a7f74b105..6e6a5b45c 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 +* Web Nov 13 2024 Alvaro Vega 3.15.0 + * Thu Nov 7 2024 Alvaro Vega 3.14.0 * Mon Oct 14 2024 Alvaro Vega 3.13.0 diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index 98ee4dd1d..41725da45 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.14.0-SNAPSHOT + 3.15.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.14.0-SNAPSHOT + 3.15.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index d1d29e09a..c83d74a00 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.14.0-SNAPSHOT + 3.15.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.14.0-SNAPSHOT + 3.15.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index fac594316..f6b6079eb 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 13 2024 Alvaro Vega 3.15.0 + +- [cygnus-ngsi][cygnus-comon] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) + * Thu Nov 7 2024 Alvaro Vega 3.14.0 - [cygnus-ngsi][arcgis] Log feature table error diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index aa3dbd58a..06444f2c1 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.14.0-SNAPSHOT + 3.15.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.14.0-SNAPSHOT + 3.15.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index e7e7fdf79..9cb245ada 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.14.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.15.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.15.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 efd49f6c5..6f61c035a 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.14.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.15.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 fa9fa7533..b67ed9c48 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.14.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.15.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 c1ef893fd..33e353b06 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.14.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.15.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.15.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From d2ef3aa83d82e77d7ddb3a0bd619e9ced0e161b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Thu, 14 Nov 2024 12:52:28 +0100 Subject: [PATCH 2/3] Apply suggestions from code review --- cygnus-common/spec/SPECS/cygnus-common.spec | 2 ++ cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 6e6a5b45c..6873a1450 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -174,6 +174,8 @@ rm -rf $RPM_BUILD_ROOT * Web Nov 13 2024 Alvaro Vega 3.15.0 +- [cygnus-ngsi][cygnus-common] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) + * Thu Nov 7 2024 Alvaro Vega 3.14.0 * Mon Oct 14 2024 Alvaro Vega 3.13.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index f6b6079eb..def35091c 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Nov 13 2024 Alvaro Vega 3.15.0 -- [cygnus-ngsi][cygnus-comon] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) +- [cygnus-ngsi][cygnus-common] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) * Thu Nov 7 2024 Alvaro Vega 3.14.0 From 7ba622853e9684c8d7bf12764c2915eeaae70475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Thu, 14 Nov 2024 12:53:42 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- cygnus-common/spec/SPECS/cygnus-common.spec | 2 +- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 6873a1450..6ecc0d5ef 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Web Nov 13 2024 Alvaro Vega 3.15.0 +* Thu Nov 14 2024 Alvaro Vega 3.15.0 - [cygnus-ngsi][cygnus-common] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440) diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index def35091c..7cbaf1740 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 -* Wed Nov 13 2024 Alvaro Vega 3.15.0 +* Thu Nov 14 2024 Alvaro Vega 3.15.0 - [cygnus-ngsi][cygnus-common] Add arcgis_connectionTimeout and arcgis_readTimeout sink options to allow set non infinite conection timeouts with arcgis (#2440)