Merge branch 'master' into task/upgrade_junit_dep

telefonicaid · Sep 14, 2023 · ea958f0 · ea958f0
2 parents 8d57270 + 11e4b85
commit ea958f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,4 +1,5 @@
 - [cygnus-ngsi][cygnus-common] upgrade junit dep from 4.13.1 to juniper 5.9.1
+- [cygnus-commons] Upgrade gson dependency from 2.6.2 to 2.10.1
 - [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)

diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.6.2</version>
+            <version>2.10.1</version>
         </dependency>
         <!-- Required by the Management Interface and CygnusGropuingRule(s) -->
         <dependency>

diff --git a/cygnus-ngsi/src/test/java/com/telefonica/iot/cygnus/containers/NameMappingsTest.java b/cygnus-ngsi/src/test/java/com/telefonica/iot/cygnus/containers/NameMappingsTest.java
@@ -249,7 +249,7 @@ public class NameMappingsTest {
             + "               \"newServicePath\": \"/new_default\","
             + "               \"entityMappings\": ["
             + "                  {"
-            + "                     \"originalEntityId\": \"Room\\.(\\d*)\","
+            + "                     \"originalEntityId\": \"Room*\","
             + "                     \"originalEntityType\": \"Room\","
             + "                     \"newEntityId\": \"new_Room1\","
             + "                     \"newEntityType\": \"new_Room\","