Upgrade Jetty and Jersey

The new version of Jetty and Jersey brings in Server Name Checking,
which must be eiter enabled or disabled.

Also, the bug in Swagger that drags in JUnit 5 with a non "test" scope is
worked around by excluding the junit 5 dependencies.

Issue-ID: POLICY-4474
Change-Id: Ib5ba23616c8d3cb011c5055a49c9cb325c9fd667
Signed-off-by: liamfallon <liam.fallon@est.tech>

3 files changed, 9 insertions, 6 deletions

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
index c9908edb..da8ea7ae 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,7 +121,7 @@ public class HttpClientTest {
         /* echo server - https + basic auth */
 
         final HttpServletServer echoServerAuth = HttpServletServerFactoryInstance.getServerFactory()
-                        .build("echo", true, LOCALHOST, 6667, "/", false, true);
+                        .build("echo", true, LOCALHOST, 6667, false, "/", false, true);
         echoServerAuth.setBasicAuthentication("x", "y", null);
         echoServerAuth.addServletPackage("/*", HttpClientTest.class.getPackage().getName());
         echoServerAuth.addFilterClass("/*", TestFilter.class.getName());
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpServerTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpServerTest.java
index 2d4de82b..dcb3906d 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpServerTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpServerTest.java
@@ -3,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020,2023 Nordix Foundation.
  * Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -382,6 +382,7 @@ public class HttpServerTest {
         server.addFilterClass("/*", TestFilter.class.getName());
 
         // ensure we can serialize the server
+        new GsonTestUtils().compareGson(server, HttpServerTest.class);
         assertThatCode(() -> new GsonTestUtils().compareGson(server, HttpServerTest.class)).doesNotThrowAnyException();
     }
 
@@ -423,7 +424,7 @@ public class HttpServerTest {
         logger.info("-- testMultipleServers() --");
 
         HttpServletServer server1 = HttpServletServerFactoryInstance.getServerFactory()
-                        .build("echo-1", false, LOCALHOST, port, "/", true, true);
+                        .build("echo-1", false, LOCALHOST, port, false, "/", true, true);
         server1.addServletPackage("/*", this.getClass().getPackage().getName());
         server1.waitedStart(5000);
 
@@ -523,7 +524,7 @@ public class HttpServerTest {
         logger.info("-- testSingleStaticResourceServer() --");
 
         HttpServletServer staticServer = HttpServletServerFactoryInstance.getServerFactory()
-                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, "/", true);
+                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, false, "/", true);
         Throwable thrown = catchThrowable(() -> staticServer.addServletResource("/*", null));
         assertThat(thrown).isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("No resourceBase provided");
@@ -560,7 +561,7 @@ public class HttpServerTest {
         logger.info("-- testMultiStaticResourceServer() --");
 
         HttpServletServer staticResourceServer = HttpServletServerFactoryInstance.getServerFactory()
-                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, "/", true);
+                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, false, "/", true);
         staticResourceServer.addServletResource("/root/*",
                 HttpServerTest.class.getClassLoader().getResource("webapps/root").toExternalForm());
         staticResourceServer.addServletResource("/alt-root/*",
@@ -585,7 +586,7 @@ public class HttpServerTest {
         logger.info("-- testMultiTypesServer() --");
 
         HttpServletServer staticResourceServer = HttpServletServerFactoryInstance.getServerFactory()
-                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, "/", true);
+                .buildStaticResourceServer("Static Resources Server", false, LOCALHOST, port, false, "/", true);
         staticResourceServer.addServletResource("/root/*",
                 HttpServerTest.class.getClassLoader().getResource("webapps/root").toExternalForm());
         staticResourceServer.waitedStart(5000);
diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/http/server/internal/HttpServerTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/http/server/internal/HttpServerTest.json
index 4be91727..8fa597ab 100644
--- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/http/server/internal/HttpServerTest.json
+++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/http/server/internal/HttpServerTest.json
@@ -4,5 +4,6 @@
     "host": "localhost",
     "name": "echo",
     "port": ${obj.port},
+    "sniHostCheck":false,
     "prometheus":false
 }