From ff748f7c3a7ff09966b195bdbd07ccfb5a739314 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 a61504994e..a237fe7ea5 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -189,6 +189,12 @@
          <version>${alfresco.base.version}</version>
       </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 a1a9684540a1b117223f40def090068655f073cb 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index a237fe7ea5..aa544e2621 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -192,7 +192,7 @@
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
-         <version>5.14.10</version>
+         <version>6.10</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -261,4 +261,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
\ No newline at end of file
+</project>