Merge branch 'master' into remove/ngsiv1-deadcode

telefonicaid · Sep 12, 2024 · 9128579 · 9128579
2 parents e43723c + f644e2c
commit 9128579
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,10 +1 @@
-- Add: custom notification ngsi patching evaluation priority based in evalPriority builtin metadata (#4556)
-- Add: attribute metadata to JEXL context (#4594, #4560)
-- Fix: $max and $min operators were not supported with DateTime attributes (#4585)
-- Fix: wrong date values should not allowed in subscription's expires field (#4541)
-- Fix: do not raise DB alarm in case of wrong GeoJSON in client request
-- Fix: registrations with more tha one contextRegistration element (not possible in NGSIv2) are logged as Runtime Errors
-- Fix: metadata modifications are not considered as change (with regards to subscription alterationTypes) if notifyOnMetadataChange is false (#4605)
-- Upgrade cjexl version from 0.3.0 to 0.4.0 (new transformations: now, getTime and toIsoString)
-- Upgrade Debian version from 12.4 to 12.6 in Dockerfile
-- Fix: invalid date in expires field of subscription (#2303)
+- Fix: registrations with more than one contextRegistration element (not possible in NGSIv2) are logged as Runtime Errors
diff --git a/Changelog b/Changelog
@@ -1,3 +1,15 @@
+4.1.0 (September 12th, 2024)
+
+- Add: custom notification ngsi patching evaluation priority based in evalPriority builtin metadata (#4556)
+- Add: attribute metadata to JEXL context (#4594, #4560)
+- Fix: $max and $min operators were not supported with DateTime attributes (#4585)
+- Fix: wrong date values should not allowed in subscription's expires field (#4541)
+- Fix: do not raise DB alarm in case of wrong GeoJSON in client request
+- Fix: metadata modifications are not considered as change (with regards to subscription alterationTypes) if notifyOnMetadataChange is false (#4605)
+- Fix: invalid date in expires field of subscription (#2303)
+- Upgrade cjexl version from 0.3.0 to 0.4.0 (new transformations: now, getTime and toIsoString)
+- Upgrade Debian version from 12.4 to 12.6 in Dockerfile
+
 4.0.0 (June 6th, 2024)
 
 - Add: JEXL expression support in custom notification macro replacement (using cjexl 0.3.0) (#4004)

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ recommended to have a look to the brief
 
 -   Orion Context Broker
     [(en)](https://www.slideshare.net/slideshow/orion-context-broker-introduction-20240911/271735060)
-    [(jp)](https://www.slideshare.net/slideshow/orion-context-broker-introduction-20240605/269515246)
+    [(jp)](https://www.slideshare.net/slideshow/orion-context-broker-introduction-20240912/271755441)
 -   NGSIv2 Overview for Developers That Already Know NGSIv1
     [(en)](https://www.slideshare.net/fermingalan/orion-context-broker-ngsiv2-overview-for-developers-that-already-know-ngsiv1-20220523)
     [(jp)](https://www.slideshare.net/fisuda/orion-context-broker-ngsiv2-overview-for-developers-that-already-know-ngsiv1-20220526)

diff --git a/src/app/contextBroker/version.h b/src/app/contextBroker/version.h
@@ -28,6 +28,6 @@
 
 
 
-#define ORION_VERSION "4.0.0-next"
+#define ORION_VERSION "4.1.0-next"
 
 #endif  // SRC_APP_CONTEXTBROKER_VERSION_H_