X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=43391affef8c194e90c780c83503c61d8ddfcb15;hb=34aa4984446aeb39b64930baf64058ea22ec9da0;hp=33437b72a0955c4d33396880163b5eca4e35561e;hpb=50becb8a60c614344c85cccb20830395283a4454;p=aai%2Fsearch-data-service.git

diff --git a/pom.xml b/pom.xml
index 33437b7..43391af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,46 +1,42 @@
+<!--
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 Amdocs
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>ajsc-archetype-parent</artifactId>
-        <groupId>com.att.ajsc</groupId>
-        <version>2.0.0</version>
+      <artifactId>spring-boot-starter-parent</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <version>1.5.12.RELEASE</version>
     </parent>
     <groupId>org.onap.aai</groupId>
     <artifactId>search-data-service</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <name>aai-search-data-service</name>
 
     <properties>
-        <module.ajsc.namespace.name>search-data-service</module.ajsc.namespace.name>
-        <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-        <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
-        <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
         <docker.location>${basedir}/target</docker.location>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-
-        <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot>
-            property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT"
-            version, THIS will be used as your directory structure. If you do NOT want
-            this, simply remove the "-SNAPSHOT" from your <version> declaration at the
-            top of pom.xml -->
-        <distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
-        <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
-
-        <!-- For SOA Cloud Installation -->
-        <installOwnerUser>aaiadmin</installOwnerUser>
-        <installOwnerGroup>aaiadmin</installOwnerGroup>
-        <ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
-
-        <!-- Port Selection. A value of 0 will allow for dynamic port selection.
-            For local testing, you may choose to hardcode this value to something like
-            8080 -->
-        <serverPort>8080</serverPort>
-        <sslport>9509</sslport>
-
-        <testRouteOffer>workstation</testRouteOffer>
-        <testEnv>DEV</testEnv>
+        <java.version>1.8</java.version>
         <generatedSourceDir>${basedir}/src/main/java-gen</generatedSourceDir>
         <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
 
@@ -56,11 +52,32 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.2.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
             <version>1.1.1</version>
         </dependency>
+
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -68,39 +85,36 @@
             <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>
             <version>2.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Common logging framework -->
         <dependency>
           <groupId>org.onap.aai.logging-service</groupId>
           <artifactId>common-logging</artifactId>
-          <version>1.1.0-SNAPSHOT</version>
+          <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>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>logging-api</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>eelf-logging</artifactId>
+            <version>1.2.2</version>
         </dependency>
 
         <!-- For JSON Mapping Support. -->
@@ -110,6 +124,85 @@
             <version>2.7.8</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.apache.directory.studio</groupId>
+          <artifactId>org.apache.commons.lang</artifactId>
+          <version>2.6</version>
+        </dependency>
+
+        <dependency>
+          <groupId>radeox</groupId>
+          <artifactId>radeox</artifactId>
+          <version>0.9</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.github.fge</groupId>
+          <artifactId>json-schema-validator</artifactId>
+          <version>2.0.0</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.json</groupId>
+          <artifactId>json</artifactId>
+          <version>20180130</version>
+        </dependency>
+
+		<dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-web</artifactId>
+    	</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>
+          <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!--Logback classic-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
     </dependencies>
 
     <repositories>
@@ -133,146 +226,20 @@
             <name>ECOMP Staging Repository</name>
             <url>${nexusproxy}/content/repositories/staging/</url>
         </repository>
-
     </repositories>
 
-    <profiles>
-        <profile>
-            <id>runAjsc</id>
-            <build>
-                <defaultGoal>initialize</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.3.2</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <includeProjectDependencies>false</includeProjectDependencies>
-                                    <includePluginDependencies>true</includePluginDependencies>
-                                    <executable>java</executable>
-                                    <mainClass>com.att.ajsc.runner.Runner</mainClass>
-                                    <executableDependency>
-                                        <groupId>com.att.ajsc</groupId>
-                                        <artifactId>ajsc-runner</artifactId>
-                                    </executableDependency>
-                                    <additionalClasspathElements>
-                                        <additionalClasspathElement>${basedir}/ajsc-shared-config/etc
-                                        </additionalClasspathElement>
-                                    </additionalClasspathElements>
-
-                                    <environmentVariables>
-                                        <AJSC_HOME>${runAjscHome}</AJSC_HOME>
-                                    </environmentVariables>
-
-                                    <!-- Main AJSC System Properties below (necessary for proper startup) -->
-                                    <systemProperties>
-                                        <systemProperty>
-                                            <key>AJSC_HOME</key>
-                                            <value>${runAjscHome}</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>CONFIG_HOME</key>
-                                            <value>${basedir}/appconfig-local/</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>AJSC_CONF_HOME</key>
-                                            <value>${basedir}/bundleconfig-local</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>logback.configurationFile</key>
-                                            <value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>AJSC_SHARED_CONFIG</key>
-                                            <value>${basedir}/ajsc-shared-config</value>
-                                        </systemProperty>
-
-                                        <sysproperty>
-                                            <key>AJSC_EXTERNAL_LIB_FOLDERS</key>
-                                            <value>${basedir}/target/commonLibs</value>
-                                        </sysproperty>
-                                        <sysproperty>
-                                            <key>AJSC_EXTERNAL_PROPERTIES_FOLDERS</key>
-                                            <value>${basedir}/ajsc-shared-config/etc</value>
-                                        </sysproperty>
-
-                                        <systemProperty>
-                                            <key>AJSC_SERVICE_NAMESPACE</key>
-                                            <value>${module.ajsc.namespace.name}</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>AJSC_SERVICE_VERSION</key>
-                                            <value>${module.ajsc.namespace.version}</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>SOACLOUD_SERVICE_VERSION</key>
-                                            <value>${project.version}</value>
-                                        </systemProperty>
-                                        <systemProperty>
-                                            <key>server.port</key>
-                                            <value>${serverPort}</value>
-                                        </systemProperty>
-                                    </systemProperties>
-
-                                    <!-- Command Line Arguments to add to the java command. Here, you
-                                        can specify the port as well as the Context you want your service to run
-                                        in. Use context=/ to run in an unnamed Context (Root Context). The default
-                                        configuration of the AJSC is to run under the / Context. Setting the port
-                                        here can aid during the development phase of your service. However, you can
-                                        leave this argument out entirely, and the AJSC will default to using an Ephemeral
-                                        port. -->
-                                    <arguments>
-                                        <argument>context=//</argument>
-                                        <argument>port=${serverPort}</argument>
-                                        <argument>sslport=${sslport}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <executable>java</executable>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.att.ajsc</groupId>
-                                <artifactId>ajsc-runner</artifactId>
-                                <version>${ajscRuntimeVersion}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>2.7.8</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
-        <plugins>
+        <finalName>search-data-service-package</finalName>
+      <plugins>
+	    <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+        </plugin>
             <!-- Checkstyle plugin - used to report on compliance with -->
             <!-- the Google style guide. -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
                 <configuration>
                     <reportPlugins>
                         <plugin>
@@ -318,10 +285,17 @@
                 <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>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                    <imageName>onap/${project.artifactId}</imageName>
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
@@ -384,6 +358,13 @@
                                         <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>