aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkorzeni <mateusz.korzeniowski@nokia.com>2018-05-09 13:26:13 +0200
committermkorzeni <mateusz.korzeniowski@nokia.com>2018-05-09 13:29:53 +0200
commit8b971cd42183793e3363e850456282081b2c09ec (patch)
tree6c19f9973bc978e0f0b5646b486a46acc01b3e14
parent5ca09dd45d884f68a1bfbdf09d9df309fddda381 (diff)
Remove backport dependency
since we already have built-in in JDK8 Change-Id: I73ccb1c084405c45eabd50b0a58278b1037ac5f8 Issue-ID: AAI-1130 Signed-off-by: mkorzeni <mateusz.korzeniowski@nokia.com>
-rw-r--r--pom.xml9
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java2
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java3
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java3
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java2
5 files changed, 7 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index 8561a2a..83597f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,13 +125,6 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>edu.emory.mathcs.backport</groupId>
- <artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
@@ -285,7 +278,7 @@ limitations under the License.
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
- <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+ <imageName>onap/${project.artifactId}</imageName>
<dockerDirectory>${docker.location}</dockerDirectory>
<imageTags>
<imageTag>latest</imageTag>
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
index ad32129..019d867 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.emory.mathcs.backport.java.util.Arrays;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
@@ -76,6 +75,7 @@ import java.net.ProtocolException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
index 529529e..cef1d84 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
@@ -21,7 +21,8 @@
package org.onap.aai.sa.searchdbabstraction.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
-import edu.emory.mathcs.backport.java.util.Arrays;
+
+import java.util.Arrays;
public class AggregationBucket {
private Object key;
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
index b63adbe..100fbf6 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
@@ -21,7 +21,8 @@
package org.onap.aai.sa.searchdbabstraction.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
-import edu.emory.mathcs.backport.java.util.Arrays;
+
+import java.util.Arrays;
public class AggregationResult {
private String name;
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
index 949f1ea..b84fe53 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
@@ -21,7 +21,7 @@
package org.onap.aai.sa.searchdbabstraction.searchapi;
import com.fasterxml.jackson.annotation.JsonProperty;
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;