From 4690ffd72b26597e9ce934acc0eddcc889a0a7c1 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 11 Feb 2025 11:45:31 +0000
Subject: [PATCH] Uplift jetty to version 12.x.y

Issue-ID: POLICY-5254
Change-Id: I44e174f2913d5b414dd56e035f0b74d3a4decdb7
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 .../policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java     |  4 ++--
 .../onap/policy/apex/examples/grpc/TestApexGrpcExample.java    |  4 ++--
 testsuites/integration/integration-common/pom.xml              |  3 ++-
 tools/simple-wsclient/pom.xml                                  | 10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java
index 56539a1d7..bded627f4 100644
--- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java
+++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2024 Nordix Foundation.
+ *  Copyright (C) 2020-2025 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public class GrpcTestRestSimEndpoint {
     }
 
     /**
-     * Post to Policy management log (Simulation of DMaaP).
+     * Post to Policy management log.
      *
      * @param jsonString the json string
      * @return the response
diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
index e6d71e1ff..14023777c 100644
--- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
+++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2024 Nordix Foundation.
+ *  Copyright (C) 2020-2025 Nordix Foundation.
  *  Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,7 +36,7 @@ import org.onap.policy.apex.service.engine.main.ApexMain;
 
 /**
  * Test class to run an example policy for APEX-CDS interaction over gRPC. Event received on
- * unauthenticated.DCAE_CL_OUTPUT DMaaP topic (dummy REST Endpoint here) triggers the policy Based on the event, a
+ * unauthenticated.DCAE_CL_OUTPUT topic (dummy REST Endpoint here) triggers the policy Based on the event, a
  * create/delete subscription gRPC request is triggered to the CDS (a dummy gRPC server here). Response received from
  * CDS is used to send a final output Log event on POLICY_CL_MGT topic.
  */
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index 0f49a37d2..98bdfad0a 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2020,2022-2023 Nordix Foundation.
+   Modifications Copyright (C) 2020, 2022-2023, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.26.0</version>
                 <configuration>
                     <excludes>
                         <exclude>**/test/common/**/*.java</exclude>
diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml
index 1d8341b10..481923f31 100644
--- a/tools/simple-wsclient/pom.xml
+++ b/tools/simple-wsclient/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2023 Nordix Foundation.
+   Modifications Copyright (C) 2023, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -51,13 +51,13 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-jakarta-client</artifactId>
+            <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+            <artifactId>jetty-ee10-websocket-jakarta-client</artifactId>
             <version>${version.jetty}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-jakarta-server</artifactId>
+            <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+            <artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
             <version>${version.jetty}</version>
         </dependency>
     </dependencies>
-- 
2.16.6