From eb47236253465eaf1ad92313f799f4e399c24914 Mon Sep 17 00:00:00 2001
From: Piotr Darosz <piotr.darosz@nokia.com>
Date: Wed, 12 Jun 2019 07:38:19 +0200
Subject: [PATCH] Upgrade jetty-http

Upgrade the jetty-http component to the current version.

Change-Id: Ibb0e52633f3937fe9f157b3b692b488043416975
Issue-ID: SDC-2268
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
---
 pom.xml                                                              | 1 +
 sdc-distribution-client/pom.xml                                      | 4 ++--
 .../src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java    | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9e992f..c22c3e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
 		<junit.version>4.12</junit.version>
 		<snakeyaml.version>1.14</snakeyaml.version>
 		<guava.version>21.0</guava.version>
+		<jetty.version>9.4.18.v20190429</jetty.version>
 		
 		
 		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
diff --git a/sdc-distribution-client/pom.xml b/sdc-distribution-client/pom.xml
index f2deda9..a1999f3 100644
--- a/sdc-distribution-client/pom.xml
+++ b/sdc-distribution-client/pom.xml
@@ -105,13 +105,13 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
 			<scope>test</scope>
-			<version>9.2.10.v20150310</version>
+			<version>${jetty.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>9.2.10.v20150310</version>
+			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
index 7603d0c..6b52801 100644
--- a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
@@ -3,6 +3,7 @@
  * sdc-distribution-client
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,13 +30,13 @@ import static org.mockito.Mockito.when;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.jetty.util.ArrayQueue;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -56,7 +57,7 @@ import com.google.gson.GsonBuilder;
 public class NotificationConsumerTest {
 	private CambriaConsumer cambriaConsumer = mock(CambriaConsumer.class);
 	private INotificationCallback clientCallback = spy(INotificationCallback.class);
-	private Queue<Iterable<String>> notificationsQueue = new ArrayQueue<>(100);
+	private Queue<Iterable<String>> notificationsQueue = new LinkedList<>();
 	private DistributionClientImpl distributionClient = Mockito.spy(DistributionClientImpl.class);
 	private List<String> artifactsTypes = Arrays.asList(ArtifactTypeEnum.HEAT.name());
 	private List<Boolean> notificationStatusResults = new ArrayList<>();
-- 
2.16.6