summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authoradheli.tavares <adheli.tavares@est.tech>2024-04-10 14:45:09 +0100
committeradheli.tavares <adheli.tavares@est.tech>2024-04-11 16:18:23 +0100
commit21ec4ae1249c237086de637118c81c038869814d (patch)
treef71a68428ca57ad046bbb083b096314a4de63f03 /services
parent2e12a07c95af2c231eb77d9eb77293e94bdca7e4 (diff)
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>
Diffstat (limited to 'services')
-rw-r--r--services/services-engine/pom.xml13
-rw-r--r--services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java3
-rw-r--r--services/services-onappf/pom.xml27
3 files changed, 27 insertions, 16 deletions
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");
@@ -47,6 +47,11 @@
<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>
<version>${project.version}</version>
@@ -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.
@@ -49,18 +49,17 @@
</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>
<version>${version.policy.common}</version>
</dependency>
<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>