From: James Forsyth <jf2512@att.com>
Date: Wed, 23 May 2018 20:13:28 +0000 (+0000)
Subject: Merge "Remove backport dependency"
X-Git-Tag: 1.3.1~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfddea09f44d6e61fe1c3a78d325ed62b523f3d1;hp=f2053bbbf38fe3243528eff983c7e5089fd1579a;p=aai%2Fsearch-data-service.git

Merge "Remove backport dependency"
---

diff --git a/pom.xml b/pom.xml
index 6664392..dbd0e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,13 +124,6 @@ limitations under the License.
             <version>2.7.8</version>
         </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>
@@ -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;