From 2c7bc5dd4d5042b08411afdd6dd4da250191662b Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Fri, 05 Oct 2018 09:23:38 +0000
Subject: [PATCH] update testng version & fix testng tests
---
opendj-server-legacy/pom.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 1e4e66f..2dc3bff 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -206,14 +206,6 @@
<version>1.5.1</version>
</dependency>
- <!-- We need to override testNG version to make test works (see OPENDJ-2389) -->
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.0.1</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -237,7 +229,6 @@
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
- <version>1.0-1</version>
</dependency>
<dependency>
@@ -1223,6 +1214,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.slf4j:slf4j-jdk14</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
+ </configuration>
<executions>
<execution>
<goals>
@@ -1261,6 +1257,7 @@
<name>configfailurepolicy</name>
<value>skip</value>
</property>
+
</properties>
<systemPropertyVariables>
<org.opends.server.BuildRoot>${basedir}</org.opends.server.BuildRoot>
@@ -1273,6 +1270,8 @@
<org.opends.test.copyClassesToTestPackage>false</org.opends.test.copyClassesToTestPackage>
</systemPropertyVariables>
<argLine>-server -Xmx2048M -XX:MaxPermSize=256m</argLine>
+ <parallel>methods</parallel>
+ <threadCount>1</threadCount>
</configuration>
</execution>
</executions>
--
Gitblit v1.10.0