X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=edf8bd59e99d7da1d8004625e9424e25810dafd8;hb=f4d5a2be57c0595ad311a8a8446f1c16a1830f9e;hp=39237bac3a29031996ea2089b1c5a8b014bdf506;hpb=d947be024297ca589b11b1f0121d715003ea887e;p=aai%2Fsearch-data-service.git

diff --git a/pom.xml b/pom.xml
index 39237ba..edf8bd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,15 +26,14 @@ limitations under the License.
     <parent>
       <artifactId>spring-boot-starter-parent</artifactId>
       <groupId>org.springframework.boot</groupId>
-      <version>1.5.10.RELEASE</version>
+      <version>1.5.12.RELEASE</version>
     </parent>
     <groupId>org.onap.aai</groupId>
     <artifactId>search-data-service</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <name>aai-search-data-service</name>
 
     <properties>
-
         <docker.location>${basedir}/target</docker.location>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <java.version>1.8</java.version>
@@ -53,13 +52,6 @@ limitations under the License.
 
     <dependencies>
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework</groupId>-->
-            <!--<artifactId>spring-test</artifactId>-->
-            <!--<version>5.0.4.RELEASE</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -72,6 +64,7 @@ limitations under the License.
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
@@ -84,6 +77,7 @@ limitations under the License.
             <artifactId>json-simple</artifactId>
             <version>1.1.1</version>
         </dependency>
+
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -91,19 +85,6 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.att.aft</groupId>-->
-            <!--<artifactId>dme2</artifactId>-->
-            <!--<version>3.1.200</version>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-
-
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>2.3.1</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -117,12 +98,6 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.att.aai.cl</groupId>-->
-            <!--<artifactId>common-logging</artifactId>-->
-            <!--<version>1.0.6</version>-->
-        <!--</dependency>-->
-
         <!-- Common logging framework -->
         <dependency>
           <groupId>org.onap.aai.logging-service</groupId>
@@ -141,13 +116,6 @@ limitations under the License.
             <artifactId>eelf-logging</artifactId>
             <version>1.2.2</version>
         </dependency>
-        <!--  Jersey Test Framework. -->
-        <!--<dependency>-->
-            <!--<groupId>org.glassfish.jersey.test-framework.providers</groupId>-->
-            <!--<artifactId>jersey-test-framework-provider-grizzly2</artifactId>-->
-            <!--<version>2.23.2</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
 
         <!-- For JSON Mapping Support. -->
         <dependency>
@@ -156,55 +124,55 @@ limitations under the License.
             <version>2.7.8</version>
         </dependency>
 
-        <!-- Added additional dependencies  -->
-        <!-- https://mvnrepository.com/artifact/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport -->
-        <dependency>
-          <groupId>edu.emory.mathcs.backport</groupId>
-          <artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
-          <version>3.1.0</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
-        <dependency>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
-          <version>2.0</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.directory.studio/org.apache.commons.lang -->
         <dependency>
           <groupId>org.apache.directory.studio</groupId>
           <artifactId>org.apache.commons.lang</artifactId>
           <version>2.6</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/radeox/radeox -->
         <dependency>
           <groupId>radeox</groupId>
           <artifactId>radeox</artifactId>
           <version>0.9</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
         <dependency>
           <groupId>com.github.fge</groupId>
           <artifactId>json-schema-validator</artifactId>
           <version>2.0.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>
           <groupId>org.json</groupId>
           <artifactId>json</artifactId>
           <version>20180130</version>
         </dependency>
 
-	<!-- Spring dependencies -->
-	<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>
@@ -216,13 +184,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>
@@ -326,7 +288,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>
@@ -389,6 +351,13 @@ limitations under the License.
                                         <include>**/*</include>
                                     </includes>
                                 </resource>
+                                <resource>
+                                    <directory>${basedir}</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>bundleconfig-local/**</include>
+                                    </includes>
+                                </resource>
                                 <resource>
                                     <directory>${basedir}/src/main/bin/</directory>
                                 </resource>