Merge pull request #2323 from telefonicaid/task/prepare_3_3_0

step 3.2.0-snapshot -> 3.3.0

CHANGES_NEXT_RELEASE

@@ -1,15 +1,2 @@
-- [cygnus-common] [MongoDB] fix error about reindex when datamodel changed
-- [cygnus-common] [Arcgis] check featureId ignore case (#2320)
-- [cygnus-common] [Arcgis] check object_id ignore case (#2313)
-- [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311)
-- [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302)
-- [cygnus-common] Upgrade gson dependency from 2.6.2 to 2.10.1
-- [cygnus-common] Upgrade mysql-java-connector dependency from 8.0.28 to 8.0.33
-- [cygnus-ngsi][cygnus-common] upgrade mockito dep from 1.9.5 to 5.5.0
-- [cygnus-ngsi] Fix runtime error: check access aggregator size (#2293)
-- [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2286)
-- [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265)
-- [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273)
-- [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis)
-- [cygnus-ngsi] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile
-- [cygnus-common] Upgrade mongodb driver dep from 3.12.12 to 3.12.14
+
+

cygnus-common/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>

cygnus-common/spec/SPECS/cygnus-common.spec

@@ -172,6 +172,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Nov 16 2023 Alvaro Vega <[email protected]> 3.3.0
+- [cygnus-common] [MongoDB] fix error about reindex when datamodel changed
+- [cygnus-common] [Arcgis] check featureId ignore case (#2320)
+- [cygnus-common] [Arcgis] check object_id ignore case (#2313)
+- [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311)
+- [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302)
+- [cygnus-common] Upgrade gson dependency from 2.6.2 to 2.10.1
+- [cygnus-common] Upgrade mysql-java-connector dependency from 8.0.28 to 8.0.33
+- [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265)
+- [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273)
+- [cygnus-common] Upgrade mongodb driver dep from 3.12.12 to 3.12.14        
+
 * Tue Jun 20 2023 Alvaro Vega <[email protected]> 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-ngsi-ld/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi-ld</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.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.2.0-SNAPSHOT</version>
+            <version>3.3.0</version>
         </dependency>
     </dependencies>
 

cygnus-ngsi/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.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.2.0-SNAPSHOT</version>
+            <version>3.3.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
         <dependency>

cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec

@@ -99,6 +99,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Thu Nov 16 2023 Alvaro Vega <[email protected]> 3.3.0
+- [cygnus-ngsi][cygnus-common] upgrade mockito dep from 1.9.5 to 5.5.0
+- [cygnus-ngsi] Fix runtime error: check access aggregator size (#2293)
+- [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2286)
+- [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis)
+- [cygnus-ngsi] UPGRADE: Debian version from 11.6 to 12.1 in Dockerfile
+
 * Thu Jun 20 2023 Alvaro Vega <[email protected]> 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)

cygnus-twitter/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.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.2.0-SNAPSHOT</version>
+            <version>3.3.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>

docker/cygnus-common/Dockerfile

@@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.2.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.3.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.3.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"

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.2.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.3.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"

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.2.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.3.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"

docker/cygnus-twitter/Dockerfile

@@ -27,7 +27,7 @@ MAINTAINER Javi Palanca <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.2.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.3.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.3.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"