From 5e3948df52ee0e2da60f387352b1e372ae228346 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Mon, 4 Mar 2024 12:05:11 +0100 Subject: [PATCH 1/3] step 3.5.0_snapshot -> 3.6.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 | 3 +++ 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(+), 16 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 3b99cda05..e69de29bb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,3 +0,0 @@ -[cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2 -[cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347) -[cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349) diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 983396eb6..0d2addf4c 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.5.0-SNAPSHOT + 3.6.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index b7a40638b..6092713f5 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 +* Mon Mar 4 2024 Alvaro Vega 3.6.0 +-[cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2 +-[cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347) + * Fri Feb 9 2024 Alvaro Vega 3.5.0 - [cygnus-common][cygnus-ngsi][cygnus-ngsi-ld] Upgrade in source code to support Java 17 build - [cygnus-common] [Arcgis] All NGSI DateTime are translated to Millis from Epoch (esriFieldTypeDate) (#2339) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index f90dc6aa8..20b970d89 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.5.0-SNAPSHOT + 3.6.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.5.0-SNAPSHOT + 3.6.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 4bab40d80..54cc620b8 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.5.0-SNAPSHOT + 3.6.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.5.0-SNAPSHOT + 3.6.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 436432956..e4069f402 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Mon Mar 4 2024 Alvaro Vega 3.6.0 +-[cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349) + * Fri Feb 9 2024 Alvaro Vega 3.5.0 - [cygnus-ngsi] Upgrade mockito-core dep from 5.5.0 to 5.10.0 - [cygnus-ngsi] Upgrade Java version from 1.11 to 1.17 in Dockerfile (#2297, #2304) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index 1e3235265..0dbf534f4 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.5.0-SNAPSHOT + 3.6.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.5.0-SNAPSHOT + 3.6.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 4d867026b..2ec8a8606 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.5.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.6.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.6.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 b5bca2f0b..08e731b9e 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.5.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.6.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 230ec4b50..1fb6c9af9 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.5.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.6.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 1e08efcef..e417c2277 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.5.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.6.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.6.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From 918d0540faf1c88841c3883fc5f1a695e73f79b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Mon, 4 Mar 2024 12:18:53 +0100 Subject: [PATCH 2/3] Update cygnus-common/spec/SPECS/cygnus-common.spec --- cygnus-common/spec/SPECS/cygnus-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 6092713f5..20244f866 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -173,8 +173,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Mar 4 2024 Alvaro Vega 3.6.0 --[cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2 --[cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347) +- [cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347) +- [cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2 * Fri Feb 9 2024 Alvaro Vega 3.5.0 - [cygnus-common][cygnus-ngsi][cygnus-ngsi-ld] Upgrade in source code to support Java 17 build From cb5fe2de7d64e153eb1be0a27970fa7f61589792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Mon, 4 Mar 2024 12:20:08 +0100 Subject: [PATCH 3/3] 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 e4069f402..86767d2d0 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 Mar 4 2024 Alvaro Vega 3.6.0 --[cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349) +- [cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349) * Fri Feb 9 2024 Alvaro Vega 3.5.0 - [cygnus-ngsi] Upgrade mockito-core dep from 5.5.0 to 5.10.0