X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=search-data-service-app%2Fpom.xml;h=d04e88de38e3e6d735dff329623f2b1aca4b3ec5;hb=d69f1e606431200a12f822e85f274c623ab8c43c;hp=0cf804300cea75b0a9779315c04df6c534f822d6;hpb=f94606aea2ac4a18028865c47dcd53b72a6d8c89;p=aai%2Fsearch-data-service.git

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index 0cf8043..d04e88d 100644
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -27,16 +27,18 @@
     <parent>
         <artifactId>search-data-service</artifactId>
         <groupId>org.onap.aai</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.search-data-service</groupId>
     <artifactId>search-data-service-app</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <name>AAI Search Data Service Application</name>
 
     <properties>
         <docker.image.name.suffix>search-data-service</docker.image.name.suffix>
+        <docker.location>${basedir}/../target</docker.location>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
         <java.version>1.8</java.version>
         <generatedSourceDir>${basedir}/src/main/java-gen</generatedSourceDir>
         <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
@@ -50,7 +52,7 @@
         <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
         <jacoco.line.coverage.limit>0.58</jacoco.line.coverage.limit>
-        <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.12.RELEASE</spring.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -66,26 +68,29 @@
     </dependencyManagement>
 
     <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>
         </dependency>
 
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>
@@ -131,6 +136,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <!--<version>2.7.8</version>-->
         </dependency>
 
         <dependency>
@@ -215,11 +221,13 @@
         <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>
@@ -406,6 +414,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
                     <compilerId>groovy-eclipse-compiler</compilerId>
                     <verbose>true</verbose>
@@ -425,6 +434,7 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
             <!-- This plugin is used to generate Java POJO's from json format schema
                 file. -->
             <plugin>
@@ -446,6 +456,44 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+                <executions>
+                    <execution>
+                        <id>copy-docker-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/../target</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/docker</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <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>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- license plugin -->
             <plugin>
                 <groupId>com.mycila</groupId>
@@ -472,6 +520,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -482,6 +533,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.7.201606060606</version>
                 <executions>
                     <!-- Prepares the property pointing to the JaCoCo runtime agent which
                          is passed as VM argument when Maven the Surefire plugin is executed. -->
@@ -494,6 +546,7 @@
                             <!-- Sets the path to the file which contains the execution data. -->
                             <destFile>${sonar.jacoco.reportPath}</destFile>
                             <propertyName>surefireArgLine</propertyName>
+                            <dumpOnExit>true</dumpOnExit>
                         </configuration>
                     </execution>
                     <!-- Ensures that the code coverage report for unit tests is created
@@ -564,12 +617,25 @@
                             </rules>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <id>jacoco-initialize-unit-tests</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec
+                            </destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- This plugin adds the generated sources directory to the clean lifecycle
                 so that automatically generated code will get cleaned up properly. -->
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
+                <version>3.0.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -578,6 +644,31 @@
                     </filesets>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>copy-files-on-build</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/../target</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target</directory>
+                                       <include>*.jar</include>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
     <distributionManagement>