Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Oct 14, 2019 · 3e0113f · 3e0113f
2 parents 525004d + 4ffeda1
commit 3e0113f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1391,7 +1391,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.0.51.Final</version>
+                <version>4.1.42.Final</version>
                 <exclusions>
                     <exclusion>
                         <groupId>ch.qos.logback</groupId>

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -41,6 +41,11 @@
 			<artifactId>schema</artifactId>
 			<version>4.0.1-SNAPSHOT</version>
 		</dependency>
+	  <dependency>
+		  <groupId>com.evolveum.midpoint.infra</groupId>
+		  <artifactId>common</artifactId>
+		  <version>4.0.1-SNAPSHOT</version>
+	  </dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>prism-api</artifactId>