Merge branch 'rc' of github.com:thingsboard/thingsboard into fix/queue-prefix
This commit is contained in:
		
						commit
						0e8e460434
					
				
							
								
								
									
										4
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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>
 | 
			
		||||
 | 
			
		||||
@ -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>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user