From 6c6d9398b10cb44598192373b3e939c4311cf864 Mon Sep 17 00:00:00 2001
From: David Webster <david@cognite.net>
Date: Thu, 9 Mar 2017 10:55:37 +0000
Subject: [PATCH 1/2] MNT-17550: Update POM to work around build issue
 (BDE-996)

---
 rm-server/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 12b59dee39..a8037e8dbe 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -195,6 +195,12 @@
          <classifier>config</classifier>
       </dependency>
       <!-- Test dependencies -->
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <version>5.14.10</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>

From 079c0a6823e17a14b4b0f609635fd9e108cf6094 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Thu, 9 Mar 2017 11:37:13 +0000
Subject: [PATCH 2/2] MNT-17550/BDE-996 Fix TestNG version to 6.10

---
 rm-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index a8037e8dbe..611d48f9c7 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -198,7 +198,7 @@
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
-         <version>5.14.10</version>
+         <version>6.10</version>
          <scope>test</scope>
       </dependency>
       <dependency>