summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-11-01 11:55:29 +0000
committerliamfallon <liam.fallon@est.tech>2019-11-01 11:56:46 +0000
commit3c1ae81a9c05ee9bfbb76bb23a2d2d75013d37ae (patch)
treeec77d4d4676c0ba1488f3aaadbd526650dd738fb
parent0b278005ad98bcd862bd348d08f664005e9eda60 (diff)
Add common Jersey version
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I0d61800b423bffbe584e29621a87068eef4c1e6c Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r--applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java4
-rw-r--r--pom.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java
index be553cf1..d7e85c47 100644
--- a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java
+++ b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java
@@ -3,6 +3,7 @@
* ONAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +28,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.att.research.xacml.api.Response;
+import com.google.common.collect.Lists;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -39,7 +42,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.ServiceLoader;
-import jersey.repackaged.com.google.common.collect.Lists;
import org.apache.commons.lang3.tuple.Pair;
import org.assertj.core.api.Condition;
import org.junit.BeforeClass;
diff --git a/pom.xml b/pom.xml
index c3f9a796..0bb07a3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath />
</parent>