From 42460743909bf010c3cbf0ca55e8a903faad6e22 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 20 Jun 2023 16:47:43 +0200 Subject: [PATCH 1/2] step 3.1.0 -> 3.2.0 --- CHANGES_NEXT_RELEASE | 10 ---------- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 11 +++++++++++ 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-ngsi/cygnus-entrypoint.sh | 1 + docker/cygnus-twitter/Dockerfile | 4 ++-- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index b5e8526f8..e69de29bb 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,10 +0,0 @@ -- [cygnus-ngsi] Check access to arrayList getting attribute name -- [cygnus-common][pSQL] Allow use null for ST_GeomFromGeoJSON -- [cygnus-common][SQL] cache tablename with schema in pSQL for capRecords case -- [cygnus-common][sql] Log full values in insert_error instead of placeholder -- [cygnus-common][sql] Check keys for delete lastdata in lowercase for PSQL -- [cygnus-common][sql] Check if delete query for lastdata was completed before use it -- [cygnus-common][cygnus-ngsi] Fix: exclude of attribute processing alterationType send by a subscription in all of their values (#2231, reopened) -- [cygnus-common] [sql] Fix sql syntax for expiration records (select, delete, filters) in non mysql instances (#2242) -- [cygnus-common] [sql] Exclude error table from persist policy (cap records is based on recvtime which is non used by persistError) -- [cygnus-common] [sql] Add missed capRecords implementation for PSQL backends diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 94d07b884..d4c9198dc 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.1.0-SNAPSHOT + 3.2.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index a12b9f16f..0ca0ff4bf 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 20 2023 Alvaro Vega 3.2.0 +- [cygnus-common][pSQL] Allow use null for ST_GeomFromGeoJSON +- [cygnus-common][SQL] cache tablename with schema in pSQL for capRecords case +- [cygnus-common][sql] Log full values in insert_error instead of placeholder +- [cygnus-common][sql] Check keys for delete lastdata in lowercase for PSQL +- [cygnus-common][sql] Check if delete query for lastdata was completed before use it +- [cygnus-common][cygnus-ngsi] Fix: exclude of attribute processing alterationType send by a subscription in all of their values (#2231, reopened) +- [cygnus-common] [sql] Fix sql syntax for expiration records (select, delete, filters) in non mysql instances (#2242) +- [cygnus-common] [sql] Exclude error table from persist policy (cap records is based on recvtime which is non used by persistError) +- [cygnus-common] [sql] Add missed capRecords implementation for PSQL backends + * Thu May 24 2023 Alvaro Vega 3.1.0 - [cygnus-common] Add: delete entity in lastData when alterationType entityDelete is received (#2231). Requires Orion 3.9+ - [cygnus-common] Add: exclude of attribute processing alterationType send by a subscription in all of their values (#2231) diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index eb22e5af2..63b83ab0b 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.1.0-SNAPSHOT + 3.2.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.1.0-SNAPSHOT + 3.2.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 87c2a9277..e8fb99580 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.1.0-SNAPSHOT + 3.2.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.1.0-SNAPSHOT + 3.2.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 744bb7551..85d08aa83 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 +* Thu Jun 20 2023 Alvaro Vega 3.2.0 +- [cygnus-ngsi] Check access to arrayList getting attribute name + * Thu May 24 2023 Alvaro Vega 3.1.0 - [cygnus-ngsi] Add: delete entity in lastData when alterationType entityDelete is received (#2231). Requires Orion 3.9+ - [cygnus-ngsi] Add: exclude of attribute processing alterationType send by a subscription in all of their values (#2231) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index a970827e1..ac7865327 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.1.0-SNAPSHOT + 3.2.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.1.0-SNAPSHOT + 3.2.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 12be5e748..7a55d8ad9 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.1.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.2.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.2.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 fff109c03..fff9ad39c 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.1.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.2.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 477dd960b..1a6ae9c06 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.1.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.2.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-ngsi/cygnus-entrypoint.sh b/docker/cygnus-ngsi/cygnus-entrypoint.sh index 6bf97eb88..2f2d759b7 100755 --- a/docker/cygnus-ngsi/cygnus-entrypoint.sh +++ b/docker/cygnus-ngsi/cygnus-entrypoint.sh @@ -58,6 +58,7 @@ trap 'kill -TERM $PIDS' TERM INT # Export JAVA_OPTS JAVA_OPTS=${CYGNUS_JAVA_OPTS} export JAVA_OPTS +echo "INFO: Using JAVA_OPTS: <${JAVA_OPTS}>" AGENT_CONF_FILE=agent.conf NAMEMAPPING_CONF_FILE=name_mappings.conf diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile index 8385ba498..9e193a23b 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.1.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.2.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.2.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz" From 3ac359df7eefc7165539eb03a11663246d1756bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Tue, 20 Jun 2023 16:50:59 +0200 Subject: [PATCH 2/2] Apply suggestions from code review --- cygnus-common/spec/SPECS/cygnus-common.spec | 12 ++++++------ cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 0ca0ff4bf..a0099ffd5 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -175,13 +175,13 @@ rm -rf $RPM_BUILD_ROOT * Tue Jun 20 2023 Alvaro Vega 3.2.0 - [cygnus-common][pSQL] Allow use null for ST_GeomFromGeoJSON - [cygnus-common][SQL] cache tablename with schema in pSQL for capRecords case -- [cygnus-common][sql] Log full values in insert_error instead of placeholder -- [cygnus-common][sql] Check keys for delete lastdata in lowercase for PSQL -- [cygnus-common][sql] Check if delete query for lastdata was completed before use it +- [cygnus-common][SQL] Log full values in insert_error instead of placeholder +- [cygnus-common][SQL] Check keys for delete lastdata in lowercase for PSQL +- [cygnus-common][SQL] Check if delete query for lastdata was completed before use it - [cygnus-common][cygnus-ngsi] Fix: exclude of attribute processing alterationType send by a subscription in all of their values (#2231, reopened) -- [cygnus-common] [sql] Fix sql syntax for expiration records (select, delete, filters) in non mysql instances (#2242) -- [cygnus-common] [sql] Exclude error table from persist policy (cap records is based on recvtime which is non used by persistError) -- [cygnus-common] [sql] Add missed capRecords implementation for PSQL backends +- [cygnus-common][SQL] Fix sql syntax for expiration records (select, delete, filters) in non mysql instances (#2242) +- [cygnus-common][SQL] Exclude error table from persist policy (cap records is based on recvtime which is non used by persistError) +- [cygnus-common][SQL] Add missed capRecords implementation for PSQL backends * Thu May 24 2023 Alvaro Vega 3.1.0 - [cygnus-common] Add: delete entity in lastData when alterationType entityDelete is received (#2231). Requires Orion 3.9+ diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 85d08aa83..20b0f3e0c 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -101,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Jun 20 2023 Alvaro Vega 3.2.0 - [cygnus-ngsi] Check access to arrayList getting attribute name +- [cygnus-common][cygnus-ngsi] Fix: exclude of attribute processing alterationType send by a subscription in all of their values (#2231, reopened) * Thu May 24 2023 Alvaro Vega 3.1.0 - [cygnus-ngsi] Add: delete entity in lastData when alterationType entityDelete is received (#2231). Requires Orion 3.9+