Merge branch 'rc' of github.com:thingsboard/thingsboard into fix/queue-prefix

1 year ago · 0e8e460434
2 changed files with 4 additions and 4 deletions
--- a/pom.xml
+++ b/pom.xml
@ -2233,7 +2233,7 @@
            </dependency>
            <dependency>
                <groupId>org.mock-server</groupId>
-                <artifactId>mockserver-netty-no-dependencies</artifactId>
+                <artifactId>mockserver-netty</artifactId>
                <version>${mock-server.version}</version>
                <scope>test</scope>
                <exclusions>
@ -2245,7 +2245,7 @@
            </dependency>
            <dependency>
                <groupId>org.mock-server</groupId>
-                <artifactId>mockserver-client-java-no-dependencies</artifactId>
+                <artifactId>mockserver-client-java</artifactId>
                <version>${mock-server.version}</version>
                <scope>test</scope>
            </dependency>
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@ -141,12 +141,12 @@
        </dependency>
        <dependency>
            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty-no-dependencies</artifactId>
+            <artifactId>mockserver-netty</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-client-java-no-dependencies</artifactId>
+            <artifactId>mockserver-client-java</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>