Upgrade netty

Upgrade netty-related dependencies.

Change-Id: I040287114e21b6d61b84425bd4c15996af27b13c
Issue-ID: SDC-2263
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>

diff --git a/pom.xml b/pom.xml
index d1533c2..462aa6c 100644 (file)
--- 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 f5b3659..2bbf089 100644 (file)
--- 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 98c6291..0910a30 100644 (file)
--- 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 afaf491..20bf30f 100644 (file)
--- 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>