diff options
| author |   adheli.tavares <adheli.tavares@est.tech> | 2024-11-04 10:17:03 +0000 |
|---|---|---|
| committer | Adheli Tavares <adheli.tavares@est.tech> | 2024-11-07 10:17:37 +0000 |
| commit | cd9cbc8d353e24bfff76049e187bd5f2216bf71d (patch) | |
| tree | 854465a7f91612f05f863bcaa1fc2e80bb538f8e /models-interactions/model-impl/aai | |
| parent | d8c2934b30d287011f95300bc5516f0df9dedfa9 (diff) | |
Fix references and organize dependencies after splitting
policy-endpoints and message-bus
Issue-ID: POLICY-5131
Change-Id: I7542caaccc130bc6120cc105d31a1e1e951c8cff
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'models-interactions/model-impl/aai')
| -rw-r--r-- | models-interactions/model-impl/aai/pom.xml | 45 | ||||
| -rw-r--r-- | models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java | 6 |
2 files changed, 27 insertions, 24 deletions
diff --git a/models-interactions/model-impl/aai/pom.xml b/models-interactions/model-impl/aai/pom.xml index 4c5d551ad..16cd8f74d 100644 --- a/models-interactions/model-impl/aai/pom.xml +++ b/models-interactions/model-impl/aai/pom.xml @@ -34,15 +34,6 @@ <dependencies> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>utils</artifactId> <version>${policy.common.version}</version> @@ -54,24 +45,36 @@ </dependency> <dependency> <groupId>org.onap.policy.common</groupId> - <artifactId>policy-endpoints</artifactId> + <artifactId>message-bus</artifactId> <version>${policy.common.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.aai.schema-service</groupId> <artifactId>aai-schema</artifactId> - <version>1.12.3</version> - <exclusions> - <exclusion> - <groupId>com.google.code.javaparser</groupId> - <artifactId>javaparser</artifactId> - </exclusion> - <exclusion> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java index 26a39875f..d7835d2a1 100644 --- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java +++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java @@ -34,9 +34,9 @@ import lombok.AllArgsConstructor; import org.apache.commons.lang3.tuple.Pair; import org.json.JSONArray; import org.json.JSONObject; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.utils.NetLoggerUtil; +import org.onap.policy.common.message.bus.utils.NetLoggerUtil.EventType; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.rest.RestManager; |