Merge pull request #2359 from telefonicaid/task/prepare_3_7_0

step 3.6.0-snapshot -> 3.7.0
telefonicaid · Mar 11, 2024 · c53e00b · c53e00b
2 parents 56d49fb + 5e2a7c9
commit c53e00b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 15 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,2 +1 @@
-- [cygnus-ngsi][ColumnAggregator] Fix lastdata when remove multiple entities by alterationType with entityDelete
-- [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities)
+
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.6.0-SNAPSHOT</version>
+    <version>3.7.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,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Mar 11 2024 Alvaro Vega <[email protected]> 3.7.0
+
 * Mon Mar 4 2024 Alvaro Vega <[email protected]> 3.6.0
 - [cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347)
 - [cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2

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.6.0-SNAPSHOT</version>
+    <version>3.7.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.6.0-SNAPSHOT</version>
+            <version>3.7.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.6.0-SNAPSHOT</version>
+    <version>3.7.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.6.0-SNAPSHOT</version>
+            <version>3.7.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
+* Mon Mar 11 2024 Alvaro Vega <[email protected]> 3.7.0
+- [cygnus-ngsi][ColumnAggregator][LastData] Fix lastdata when remove multiple entities by alterationType with entityDelete
+- [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities at the same time)
+
 * Mon Mar 4 2024 Alvaro Vega <[email protected]> 3.6.0
 - [cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349)
 

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.6.0-SNAPSHOT</version>
+    <version>3.7.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.6.0-SNAPSHOT</version>
+            <version>3.7.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 <[email protected]>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.6.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.7.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.7.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.6.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.7.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.6.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.7.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
@@ -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.6.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.7.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.7.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		- [cygnus-ngsi][ColumnAggregator] Fix lastdata when remove multiple entities by alterationType with entityDelete
		- [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities)