X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4711142236f0589777c71a47e9c044beb960fcad;hb=15af66b115f3e8046b2d0f2634fb77b3d835f730;hp=afd2fa54f0a5addd685d7e210e1955746b8f5034;hpb=4fbee8b6e9a8134e2f99096ef2ae2050eae6f7d9;p=aai%2Fsearch-data-service.git

diff --git a/pom.xml b/pom.xml
index afd2fa5..4711142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@ limitations under the License.
     <parent>
       <artifactId>spring-boot-starter-parent</artifactId>
       <groupId>org.springframework.boot</groupId>
-      <version>1.5.12.RELEASE</version>
+      <version>1.5.15.RELEASE</version>
     </parent>
     <groupId>org.onap.aai</groupId>
     <artifactId>search-data-service</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <name>aai-search-data-service</name>
 
     <properties>
@@ -69,7 +69,6 @@ limitations under the License.
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
             <version>2.2.0</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -79,9 +78,9 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
+            <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -124,12 +123,6 @@ limitations under the License.
             <version>2.7.8</version>
         </dependency>
 
-        <dependency>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
-          <version>2.0</version>
-        </dependency>
-
         <dependency>
           <groupId>org.apache.directory.studio</groupId>
           <artifactId>org.apache.commons.lang</artifactId>
@@ -154,10 +147,31 @@ limitations under the License.
           <version>20180130</version>
         </dependency>
 
-	<dependency>
+		<dependency>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+    	</dependency>
+    	
+    	<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
+		<dependency>
+  			<groupId>org.springframework.boot</groupId>
+  			<artifactId>spring-boot-starter-jersey</artifactId>
+		</dependency>
 
         <dependency>
           <groupId>org.springframework.boot</groupId>
@@ -169,12 +183,7 @@ limitations under the License.
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-        </dependency>
-
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -275,17 +284,10 @@ limitations under the License.
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.4.11</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.github.jnr</groupId>
-                        <artifactId>jnr-unixsocket</artifactId>
-                        <version>0.13</version>
-                    </dependency>
-                </dependencies>
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>onap/${project.artifactId}</imageName>
+                    <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>