From 19a32878f975c3ce3519020c4f65250a87e40bc6 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 18 Sep 2024 12:00:27 +0200 Subject: [PATCH 1/5] step 3.10.0-SNAPSHOT -> 3.11.0 --- CHANGES_NEXT_RELEASE | 5 +---- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 5 +++++ cygnus-ngsi-ld/pom.xml | 4 ++-- cygnus-ngsi/pom.xml | 4 ++-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 6 ++++++ 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, 25 insertions(+), 17 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 66f9cf6aa..789819226 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1 @@ -- [cygnus-ngsi] Upgrade Debian version from 12.5 to 12.6 in Dockerfile -- [cygnus-common][cygnus-ngsi] New setting mongo_uri (#2387) -- [cygnus-common][cygnus-ngsi] Deprecate (mongo_hosts, mongo_username, mongo_password, mongo_auth_source, mongo_replica_set) (use mongo_uri instead) -- [cygnus-ngsi][arcgis] fix log warn to info level in arcgis feature when attribute string (#2407) +a diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 98c152129..f00c4b78a 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.10.0-SNAPSHOT + 3.11.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 237e9dfce..59b53bddb 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 18 2024 Alvaro Vega 3.11.0 + +- [cygnus-common][cygnus-ngsi] New setting mongo_uri (#2387) +- [cygnus-common][cygnus-ngsi] Deprecate (mongo_hosts, mongo_username, mongo_password, mongo_auth_source, mongo_replica_set) (use mongo_uri instead) + * Thu Aug 8 2024 Alvaro Vega 3.10.0 - [cygnus-common] [mongo-backend] Use sslEnabled, sslInvalidHostNameAllowed, sslKeystorePathFile, sslKeystorePassword, sslTruststorePathFile and sslTruststorePassword options for mongoDB connections diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index a9193177a..7e6f00081 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.10.0-SNAPSHOT + 3.11.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.10.0-SNAPSHOT + 3.11.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 27bd95a19..e5500574b 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.10.0-SNAPSHOT + 3.11.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.10.0-SNAPSHOT + 3.11.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 53698aac6..410c0eda4 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,12 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog + +* Thu Sep 18 2024 Alvaro Vega 3.11.0 + +- [cygnus-ngsi] Upgrade Debian version from 12.5 to 12.6 in Dockerfile +- [cygnus-ngsi][arcgis-sink] fix log warn to info level in arcgis feature when attribute string (#2407) + * Thu Aug 8 2024 Alvaro Vega 3.10.0 - [cygnus-ngsi] [mongo-sink] Add mongo_ssl, mongo_ssl_invalid_host_allowed, mongo_ssl_keystore_path_file, mongo_ssl_keystore_password, mongo_ssl_truststore_path_file and mongo_ssl_truststore_password options for mongoDB connections - [cygnus-ngsi] [arcgis-sink] Add esri Geometry PolyLine, MultiPoint and Polygon support (#2392) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index e3d5526de..6d2c2c64f 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.10.0-SNAPSHOT + 3.11.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.10.0-SNAPSHOT + 3.11.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 654cddfb7..b191c799d 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.10.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.11.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.10.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 1f5e5a0ce..4e8df4c4c 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.10.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.11.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 1b40ebd3c..f67fbc535 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.10.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.11.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 3afbbe864..4b9e99a38 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.10.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.11.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.11.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From da650a3258849bf7c68e545ebf9f0c11c5cb40e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Wed, 18 Sep 2024 13:47:53 +0200 Subject: [PATCH 2/5] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 789819226..e69de29bb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +0,0 @@ -a From ed83d9c193d7a86685b546d4ac18fd32d760242e Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 19 Sep 2024 16:03:07 +0200 Subject: [PATCH 3/5] Update cygnus-common.spec --- cygnus-common/spec/SPECS/cygnus-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 59b53bddb..b3e4ce996 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 -* Wed Sep 18 2024 Alvaro Vega 3.11.0 +* Thu Sep 19 2024 Alvaro Vega 3.11.0 - [cygnus-common][cygnus-ngsi] New setting mongo_uri (#2387) - [cygnus-common][cygnus-ngsi] Deprecate (mongo_hosts, mongo_username, mongo_password, mongo_auth_source, mongo_replica_set) (use mongo_uri instead) From 6aa30c18af40dc70c10b9edcc35b4d2c9384d76d Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Thu, 19 Sep 2024 16:03:40 +0200 Subject: [PATCH 4/5] Update cygnus-ngsi.spec --- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 410c0eda4..10351f6e7 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -100,8 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Sep 18 2024 Alvaro Vega 3.11.0 +* Thu Sep 19 2024 Alvaro Vega 3.11.0 +- [cygnus-ngsi][restHandler] Add header value to logs about bad header (#2410) - [cygnus-ngsi] Upgrade Debian version from 12.5 to 12.6 in Dockerfile - [cygnus-ngsi][arcgis-sink] fix log warn to info level in arcgis feature when attribute string (#2407) From 2b80230d07234287652b055d4e78c39688b1be9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Thu, 19 Sep 2024 16:35:44 +0200 Subject: [PATCH 5/5] Update docker/cygnus-common/Dockerfile --- docker/cygnus-common/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index b191c799d..a5896c53f 100644 --- a/docker/cygnus-common/Dockerfile +++ b/docker/cygnus-common/Dockerfile @@ -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 "release/3.10.0" +ENV GIT_REV_CYGNUS "release/3.11.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"