Merge pull request #51 from SoftwareAG/develop

Develop
Cumulocity-IoT · Oct 16, 2023 · 61f987c · 61f987c
2 parents 5b065ac + 98e26da
commit 61f987c
Show file tree

Hide file tree

Showing 21 changed files with 733 additions and 37,395 deletions.
diff --git a/mqtt-mapping-interface/pom.xml b/mqtt-mapping-interface/pom.xml
@@ -112,6 +112,16 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230618</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/mqtt-mapping-service/pom.xml b/mqtt-mapping-service/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>jackson-datatype-joda</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230618</version>
+        </dependency>
+
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
@@ -136,7 +142,7 @@
                 <groupId>com.nsn.cumulocity.clients-java</groupId>
                 <artifactId>microservice-package-maven-plugin</artifactId>
                 <!-- <version>1015.334.0</version> -->
-                <version>1017.187.0</version>
+                <version>1018.0.206</version>
                 <executions>
                     <execution>
                         <id>package</id>

diff --git a/mqtt-mapping-ui/mqtt-mapping/.npmrc b/mqtt-mapping-ui/mqtt-mapping/.npmrc
@@ -0,0 +1,2 @@
+registry=https://registry.npmjs.org/
+@c8y:registry=https://download.cumulocity.com/npm/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		registry=https://registry.npmjs.org/
		@c8y:registry=https://download.cumulocity.com/npm/