Upversion to oparent 2.0.0

[aai/search-data-service.git] / search-data-service-app / pom.xml

diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index c1f2c6a..71fe188 100644 (file)
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -27,16 +27,17 @@
        <parent>
                <artifactId>spring-boot-starter-parent</artifactId>
                <groupId>org.springframework.boot</groupId>
-               <version>1.5.18.RELEASE</version>
+               <version>1.5.19.RELEASE</version>
        </parent>
 
        <groupId>org.onap.aai.search-data-service</groupId>
        <artifactId>search-data-service-app</artifactId>
-       <version>1.4.0-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <name>AAI Search Data Service Application</name>
 
        <properties>
                <docker.location>${basedir}/target</docker.location>
+               <docker.image.name.suffix>search-data-service</docker.image.name.suffix>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <java.version>1.8</java.version>
                <generatedSourceDir>${basedir}/src/main/java-gen</generatedSourceDir>
@@ -50,6 +51,7 @@
                </sonar.jacoco.reportPath>
                <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>
        </properties>
 
        <dependencies>
@@ -99,19 +101,19 @@
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.2.2</version>
+                       <version>1.5.0</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>logging-api</artifactId>
-                       <version>1.2.2</version>
+                       <version>1.5.0</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>eelf-logging</artifactId>
-                       <version>1.2.2</version>
+                       <version>1.5.0</version>
                </dependency>
 
         <!-- For JSON Mapping Support. -->
@@ -293,7 +295,7 @@
                                <configuration>
                                        <verbose>true</verbose>
                                        <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                                       <imageName>${docker.push.registry}/onap/${docker.image.name.suffix}</imageName>
                                        <dockerDirectory>${docker.location}</dockerDirectory>
                                        <imageTags>
                                                <imageTag>latest</imageTag>
@@ -301,18 +303,6 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
-                       </plugin>
-
             <!-- This plugin is used to generate Java POJO's from json format schema
                 file. -->
                        <plugin>
@@ -393,13 +383,9 @@
                                        </execution>
                                </executions>
                        </plugin>
-
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
@@ -425,6 +411,28 @@
                             <!-- <append>true</append> -->
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <id>default-check</id>
+                                               <goals>
+                                                       <goal>check</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
+                                                       <rules>
+                                <!--  implementation is needed only for Maven 2  -->
+                                                               <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                                                       <element>BUNDLE</element>
+                                                                       <limits>
+                                                                               <limit implementation="org.jacoco.report.check.Limit">
+                                                                                       <counter>LINE</counter>
+                                                                                       <value>COVEREDRATIO</value>
+                                                                                       <minimum>${jacoco.line.coverage.limit}</minimum>
+                                                                               </limit>
+                                                                       </limits>
+                                                               </rule>
+                                                       </rules>
+                                               </configuration>
+                                       </execution>
                                </executions>
                        </plugin>