summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Darosz <piotr.darosz@nokia.com>2019-06-13 07:42:06 +0200
committerPiotr Darosz <piotr.darosz@nokia.com>2019-06-18 13:56:17 +0200
commitc82ace5a5ed259b0fd4dec29a414046fd3be9c6e (patch)
tree0e3ff9b16394730cdffe4caba743141da928e534
parent4bf6e7f32c573b9c5096b84f6dd11674f2a53ad9 (diff)
Upgrade netty
Upgrade netty-related dependencies. Change-Id: I040287114e21b6d61b84425bd4c15996af27b13c Issue-ID: SDC-2263 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
-rw-r--r--pom.xml5
-rw-r--r--test-apis-ci/pom.xml3
-rw-r--r--test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java4
-rw-r--r--ui-ci/pom.xml4
4 files changed, 11 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index d1533c267d..462aa6cf1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@ Modifications copyright (c) 2018 Nokia
<spring.security.version>3.2.3.RELEASE</spring.security.version>
<spring.ldap.version>2.0.1.RELEASE</spring.ldap.version>
<jersey-bom.version>2.27</jersey-bom.version>
+ <netty.version>4.1.36.Final</netty.version>
<servlet-api.version>3.1.0</servlet-api.version>
<wire-mock.version>2.18.0</wire-mock.version>
<ecomp.version>2.4.0</ecomp.version>
@@ -211,12 +212,12 @@ Modifications copyright (c) 2018 Nokia
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.45.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.0.45.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index f5b36598ad..2bbf089840 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -13,6 +13,7 @@
<properties>
<sonar.skip>true</sonar.skip>
+ <mockserver.netty.version>5.5.4</mockserver.netty.version>
</properties>
<dependencies>
@@ -340,7 +341,7 @@
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
- <version>3.10.4</version>
+ <version>${mockserver.netty.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
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 98c62912c1..0910a30b47 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
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.mockserver.model.HttpCallback.callback;
+import static org.mockserver.model.HttpClassCallback.callback;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;
import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult;
@@ -138,7 +138,7 @@ public class StepsTenantIsolationCI {
@Given("^MSO Final Distribution Simulator is UP$")
public void mso_Final_Distribution_Simulator_is_UP() throws Throwable {
msoHttpRequest = request().withPath(MSO_PATH_REGEX);
- msoMockServer.when(msoHttpRequest).callback(
+ msoMockServer.when(msoHttpRequest).forward(
callback().withCallbackClass("org.openecomp.sdc.cucumber.steps.PrecannedTestExpectationCallback"));
}
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index afaf49143b..20bf30fcdc 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -36,6 +36,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>