Merge pull request #2267 from telefonicaid/task/prepare_3_2_0

step 3.1.0 -> 3.2.0
telefonicaid · Jun 20, 2023 · 9b21eae · 9b21eae
2 parents af9af84 + 3ac359d
commit 9b21eae
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 23 deletions.
diff --git 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
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>

diff --git 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 <alvaro.vegagarcia@telefonica.com> 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 <alvaro.vegagarcia@telefonica.com> 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
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi-ld</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi-ld</name>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
     </dependencies>
 

diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
         <dependency>

diff --git 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
+* Thu Jun 20 2023 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 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 <alvaro.vegagarcia@telefonica.com> 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
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.2.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>

diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile
@@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno <francisco.romerobueno@telefonica.com>
 # 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
@@ -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
@@ -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
@@ -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
@@ -27,7 +27,7 @@ MAINTAINER Javi Palanca <jpalanca@dsic.upv.es>
 # 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"