From 21ec4ae1249c237086de637118c81c038869814d Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 10 Apr 2024 14:45:09 +0100
Subject: Dependency management update

- including dependencies to pom.xml files only where they are used,
avoiding extra dependencies being added in all packages.

Issue-ID: POLICY-4945
Change-Id: I99a922f4c124c492e28326d6e08e15cd96b68a40
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 .../plugins-event-carrier-restrequestor/pom.xml    |  6 ++++-
 pom.xml                                            |  8 +++----
 services/services-engine/pom.xml                   | 13 +++++------
 .../Apex2JsonEventConverter.java                   |  3 +--
 services/services-onappf/pom.xml                   | 27 ++++++++++++++++------
 .../performance/performance-benchmark-test/pom.xml |  6 ++++-
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
index 01fbca3d8..ed7b93903 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020, 2024 Nordix Foundation.
    Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,5 +45,9 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 1647ac8ca..d37ce458c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <!-- Apex-specific dependencies -->
         <version.activemq>5.18.3</version.activemq>
         <version.antlr.st4>4.3.4</version.antlr.st4>
-        <version.antlr-runtime>4.13.0</version.antlr-runtime>
+        <version.antlr-runtime>4.13.1</version.antlr-runtime>
         <version.artemis>2.30.0</version.artemis>
         <version.avro>1.11.3</version.avro>
         <version.caffeine>3.1.8</version.caffeine>
@@ -61,9 +61,9 @@
         <version.infinispan>14.0.13.Final</version.infinispan>
         <version.jgroups>5.2.18.Final</version.jgroups>
         <version.jms>3.1.0</version.jms>
-        <version.jnr.jffi>1.3.11</version.jnr.jffi>
-        <version.jnr.jnr-posix>3.1.17</version.jnr.jnr-posix>
-        <version.jruby-core>9.4.3.0</version.jruby-core>
+        <version.jnr.jffi>1.3.12</version.jnr.jffi>
+        <version.jnr.jnr-posix>3.1.19</version.jnr.jnr-posix>
+        <version.jruby-core>9.4.6.0</version.jruby-core>
         <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>
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml
index 55c4e757e..ec3238682 100644
--- a/services/services-engine/pom.xml
+++ b/services/services-engine/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Copyright (C) 2019-2020,2022-2023 Nordix Foundation.
+   Copyright (C) 2019-2020, 2022-2024 Nordix Foundation.
    Modifications Copyright (C) 2021 Bell Canada Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,6 +46,11 @@
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_servlet_jakarta</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.core</groupId>
             <artifactId>core</artifactId>
@@ -58,12 +63,6 @@
         <dependency>
             <groupId>org.onap.policy.models</groupId>
             <artifactId>policy-models-pdp</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>javax.ws.rs-api</artifactId>
-                </exclusion>
-            </exclusions>
             <version>${version.policy.models}</version>
         </dependency>
     </dependencies>
diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
index 976a3ae3d..a16fe8f24 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2021, 2024 Nordix Foundation.
  *  Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -172,7 +172,6 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter {
      *
      * @param apexEvent the event to Serialise
      * @return the Serialise event as JSON
-     * @throws ApexEventException exceptions on marshaling to JSON
      */
     private Object fromApexEventWithFields(final ApexEvent apexEvent) {
         // Get the event definition for the event from the model service
diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml
index ebdd022e7..c15590fac 100644
--- a/services/services-onappf/pom.xml
+++ b/services/services-onappf/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2019-2020,2023 Nordix Foundation.
+   Copyright (C) 2019-2020, 2023-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -47,6 +47,11 @@
             <artifactId>plugins-event-carrier-restserver</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+            <version>${version.policy.common}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>utils-test</artifactId>
@@ -55,12 +60,6 @@
         <dependency>
             <groupId>org.onap.policy.models</groupId>
             <artifactId>policy-models-pdp</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>javax.ws.rs-api</artifactId>
-                </exclusion>
-            </exclusions>
             <version>${version.policy.models}</version>
         </dependency>
         <dependency>
@@ -68,6 +67,20 @@
             <artifactId>kafka-clients</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_hotspot</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-fips</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
+
 
         <!--test dependencies -->
         <dependency>
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index 56100d5ea..e693bbbcc 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020,2023 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020, 2023-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,6 +41,10 @@
             <artifactId>jersey-container-grizzly2-http</artifactId>
             <version>${version.jersey}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
             <artifactId>integration-common</artifactId>
-- 
cgit 1.2.3-korg