summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2023-02-17 19:13:56 +0000
committerLiam Fallon <liam.fallon@est.tech>2023-02-17 20:35:32 +0000
commit4415cacfa096f1d36e544d8c80280659471fda47 (patch)
tree28e599e56e35ab2d390c4849af5296a7239fa841
parentf937804befdaee977269704b506944df2b5de39a (diff)
Clean up dependencies for London Release
Issue-ID: POLICY-4482 Change-Id: I36b4e46604ecdbde7bb8b81e2c792214fc77af9f Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java8
-rw-r--r--models-sim/packages/models-simulator-docker/pom.xml6
-rw-r--r--models-tosca/pom.xml25
-rw-r--r--pom.xml9
4 files changed, 6 insertions, 42 deletions
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java
index 845b7ad76..8f03e7d46 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020 Nordix Foundation.
+ * Copyright (C) 2019-2020,2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@
package org.onap.policy.models.pdp.concepts;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -30,6 +29,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.onap.policy.common.gson.annotation.GsonJsonIgnore;
import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.parameters.ValidationStatus;
@@ -124,14 +124,14 @@ public class PdpGroup implements PfNameVersion, Comparable<PdpGroup> {
}
@Override
- @JsonIgnore
+ @GsonJsonIgnore
public String getVersion() {
// We need to pass a version for keying in the database
return PfKey.NULL_KEY_VERSION;
}
@Override
- @JsonIgnore
+ @GsonJsonIgnore
public void setVersion(String version) {
// Just ignore any version that is set
}
diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml
index c2ea4a28f..b541b6c18 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
Copyright (C) 2020 Bell Canada.
Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2022 Nordix Foundation.
+ Modifications Copyright (C) 2022-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
@@ -142,9 +141,6 @@
<goal>build</goal>
<goal>push</goal>
</goals>
- <configuration>
- <image>onap/policy-models-simulator</image>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/models-tosca/pom.xml b/models-tosca/pom.xml
index f875e0b14..c042a687d 100644
--- a/models-tosca/pom.xml
+++ b/models-tosca/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2020 Nordix Foundation.
+ Modifications Copyright (C) 2020,2023 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,32 +65,9 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>8.0.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey2-jaxrs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index eda0c23a7..96de5cb77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,6 @@
<description>This repo holds model code agnostic to PDP engines</description>
<properties>
- <derby.version>10.13.1.1</derby.version>
- <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<policy.common.version>1.12.1-SNAPSHOT</policy.common.version>
</properties>
@@ -105,7 +103,6 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.ws.rs-api.version}</version>
</dependency>
<dependency>
@@ -178,14 +175,8 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${version.swagger}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.4</version>
</dependency>
<dependency>
<groupId>com.att.nsa</groupId>