aboutsummaryrefslogtreecommitdiffstats
path: root/test-apis-ci
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2020-04-29 18:39:35 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-05-06 14:39:27 +0000
commita36531c38fe1a9234b8dbeaed5505cf3ca48de26 (patch)
tree66536791a3f0be1452e072448d27a55903909123 /test-apis-ci
parent5be1289bdded95df10c900d2d6f7596904287c91 (diff)
Prepare for Junit5
Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
Diffstat (limited to 'test-apis-ci')
-rw-r--r--test-apis-ci/pom.xml26
-rw-r--r--test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java4
-rw-r--r--test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java10
3 files changed, 20 insertions, 20 deletions
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index c71c666095..1613c476f6 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -342,35 +342,35 @@
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>1.2.4</version>
+ <version>${cucumber.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-core</artifactId>
- <version>1.2.4</version>
- <scope>test</scope>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
- <version>2.12.2</version>
+ <version>13.0.0</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>1.2.5</version>
+ <version>${cucumber.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-jvm-deps</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -395,9 +395,9 @@
<!-- With TestNG -->
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-testng</artifactId>
- <version>1.2.5</version>
+ <version>${cucumber.version}</version>
</dependency>
<!-- spring -->
diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java
index 85b490ea4e..2c9fca2186 100644
--- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java
+++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java
@@ -20,8 +20,8 @@
package org.openecomp.sdc.cucumber.runners;
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java
index 9f5e201fed..e19280aa46 100644
--- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java
+++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java
@@ -24,11 +24,11 @@ import com.google.common.base.Strings;
import com.google.common.net.HttpHeaders;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
import fj.data.Either;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;