From 8cef77153510be4e41bca5ec90d90c554cbd3223 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 4 Mar 2025 09:34:14 +0000
Subject: Uplift dependencies for apex-pdp

- as part of fixing netty transitive dependencies, some other
dependencies using netty had to be uplifted as well.

Issue-ID: POLICY-5303, POLICY-5299
Change-Id: I6d94432e698c81d4c3a8bf6f739585ce24751f6d
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 .../plugins-context-locking-curator/pom.xml                    | 10 ++--------
 .../plugins-event-carrier/plugins-event-carrier-kafka/pom.xml  |  4 ++--
 pom.xml                                                        |  9 +++++----
 testsuites/integration/integration-uservice-test/pom.xml       |  3 ++-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index 108bd6ea7..fd542e106 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019,2023 Nordix Foundation.
+   Modifications Copyright (C) 2019, 2023, 2025 Nordix Foundation.
    Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,13 +36,6 @@
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
             <version>${version.curator}</version>
-            <exclusions>
-                <!-- The default Zookeeper version in Curator has vulnerabilities -->
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
@@ -74,6 +67,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
+            <version>${version.netty}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index 9820be411..949c61b96 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
-   Modifications Copyright (C) 2023-2024 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.
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.27.0</version>
+            <version>1.27.1</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index ddf5b4c52..013461277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,9 +53,9 @@
         <version.antlr.st4>4.3.4</version.antlr.st4>
         <version.antlr-runtime>4.13.1</version.antlr-runtime>
         <version.artemis>2.30.0</version.artemis>
-        <version.avro>1.11.3</version.avro>
+        <version.avro>1.11.4</version.avro>
         <version.caffeine>3.1.8</version.caffeine>
-        <version.curator>5.5.0</version.curator>
+        <version.curator>5.7.1</version.curator>
         <version.hazelcast>5.3.8</version.hazelcast>
         <version.infinispan>14.0.33.Final</version.infinispan>
         <version.jgroups>5.2.18.Final</version.jgroups>
@@ -66,11 +66,12 @@
         <version.jruby-joni>2.2.1</version.jruby-joni>
         <version.jruby-extras-bytelist>1.0.15</version.jruby-extras-bytelist>
         <version.jython-standalone>2.7.3</version.jython-standalone>
-        <version.kafka-avro-serializer>7.5.1</version.kafka-avro-serializer>
+        <version.kafka-avro-serializer>7.8.0</version.kafka-avro-serializer>
         <version.kafka-junit5>3.2.5</version.kafka-junit5>
         <version.rhino>1.7.14</version.rhino>
         <version.websocket.jakarta>2.1.1</version.websocket.jakarta>
-        <version.zookeeper>3.9.2</version.zookeeper>
+        <version.zookeeper>3.9.3</version.zookeeper>
+        <version.netty>4.1.119.Final</version.netty>
     </properties>
 
     <distributionManagement>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 7484ead58..b9adc5d14 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020,2022-2024 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020,2022-2025 Nordix Foundation.
    Modifications Copyright (C) 2020 Bell Canada.
    Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -145,6 +145,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
+            <version>${version.netty}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-- 
cgit