Merge pull request #282 from Cumulocity-IoT/develop

4.6.0 release
Cumulocity-IoT · Nov 12, 2024 · 08d2705 · 08d2705
2 parents d5e9941 + 6527b52
commit 08d2705
Show file tree

Hide file tree

Showing 172 changed files with 11,307 additions and 10,068 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -48,6 +48,8 @@ jobs:
           node-version: 18.x
       - run: npm i
         working-directory: ./dynamic-mapping-ui
+      - run: cp ./LICENSE ./dynamic-mapping-ui/LICENSE
+        working-directory: ./
       - run: npm install -g @angular/cli > /dev/null
         working-directory: ./dynamic-mapping-ui
       - run: npm run build --if-present

diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ dynamic-mapping-ui/cypress/screenshots
 dynamic-mapping-ui/cypress/fixtures/mqttConnectionPostRequest.json
 dynamic-mapping-service/src/main/configuration/dynamic-mapping-service-logging.xml
 JSONata4Java/dependency-reduced-pom.xml
+dynamic-mapping-ui/node_modules_tmp/
diff --git a/USERGUIDE.md b/USERGUIDE.md
diff --git a/dynamic-mapping-interface/pom.xml b/dynamic-mapping-interface/pom.xml
@@ -22,14 +22,14 @@
 <project
 	xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.softwareag.c8y.mapping</groupId>
 	<artifactId>dynamic-mapping-interface</artifactId>
 	<parent>
 		<groupId>com.softwareag.c8y.mapping</groupId>
 		<artifactId>dynamic-mapping-solution</artifactId>
-        <version>${revision}</version>
+		<version>${revision}</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -48,10 +48,10 @@
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>com.hivemq</groupId>
+			<artifactId>hivemq-mqtt-client</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.ibm.jsonata4java</groupId>
 			<artifactId>JSONata4Java</artifactId>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-joda</artifactId>
-            <scope>provided</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -82,15 +82,19 @@
 			<artifactId>slf4j-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.loki4j</groupId>
-            <artifactId>loki-logback-appender</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka-clients</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.github.loki4j</groupId>
+			<artifactId>loki-logback-appender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<sourceDirectory>../dynamic-mapping-service/src/main/java</sourceDirectory>
 		<plugins>
@@ -113,9 +117,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin><artifactId>maven-compiler-plugin</artifactId><version>3.11.0</version><configuration><includes><include>dynamic/mapping/model/*.java</include><include>dynamic/mapping/processor/model/*.java</include><include>dynamic/mapping/processor/model/ProcessingContext.java</include><include>
+			<!--
+			<plugin><artifactId>maven-compiler-plugin</artifactId><version>3.11.0</version><configuration><includes><include>dynamic/mapping/model/*.java</include><include>dynamic/mapping/processor/model/*.java</include><include>dynamic/mapping/processor/model/ProcessingContext.java</include><include>
                                     dynamic/mapping/processor/extension/ProcessorExtensionInbound.java</include><include>
-                                    dynamic/mapping/processor/extension/ProcessorExtensionOutbound.java</include></includes></configuration></plugin> -->
+			dynamic/mapping/processor/extension/ProcessorExtensionOutbound.java</include></includes></configuration></plugin> -->
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.4.2</version>
@@ -130,10 +135,10 @@
 					</includes>
 				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-            </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>