X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=164141d571b24730013a3a708f1427f4793b39e8;hb=edd51e7dd63cb88c9f72e686cd699a719184f243;hp=2410001e7414d6519061cbb8f5fa1243ae600490;hpb=41854289466b405c41bab59bd1d669fcac437117;p=aai%2Fgizmo.git

diff --git a/pom.xml b/pom.xml
index 2410001..164141d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,22 +25,26 @@ limitations under the License.
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.aai.gizmo</groupId>
     <artifactId>gizmo</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <name>aai-gizmo</name>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
         <version.org.onap.aai.aai-schema-ingest>1.4.1</version.org.onap.aai.aai-schema-ingest>
-        <version.org.onap.aai.aai-schema>1.4.0</version.org.onap.aai.aai-schema>
-        <version.org.onap.aai.aai-utils>1.4.0</version.org.onap.aai.aai-utils>
-        <version.org.onap.aai.aai-auth>1.4.0</version.org.onap.aai.aai-auth>        
-        <event.client.version>1.3.1</event.client.version>
+        <version.org.onap.aai.aai-schema>1.5.0</version.org.onap.aai.aai-schema>
+        <version.org.onap.aai.aai-utils>1.5.1</version.org.onap.aai.aai-utils>
+        <version.org.onap.aai.aai-auth>1.5.1</version.org.onap.aai.aai-auth>
+        <event.client.version>1.5.0</event.client.version>
+        <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in
+         coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 -->
+        <jacoco.line.coverage.limit>0.60</jacoco.line.coverage.limit>
+        <jacoco.report.directory>${project.build.directory}/code-coverage</jacoco.report.directory>
     </properties>
 
     <dependencyManagement>
@@ -49,7 +53,7 @@ limitations under the License.
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.5.18.RELEASE</version>
+                <version>1.5.19.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -110,7 +114,7 @@ limitations under the License.
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>3.2.5</version>
         </dependency>
-        
+
 
      <dependency>
          <groupId>io.swagger</groupId>
@@ -127,11 +131,11 @@ limitations under the License.
          <artifactId>springfox-swagger-ui</artifactId>
          <version>2.9.2</version>
       </dependency>
-      
+
 
         <!-- ONAP AAI-COMMON (incl. model) -->
         <dependency>
-            <groupId>org.onap.aai.aai-common</groupId>
+            <groupId>org.onap.aai.schema-service</groupId>
             <artifactId>aai-schema</artifactId>
             <version>${version.org.onap.aai.aai-schema}</version>
         </dependency>
@@ -218,7 +222,7 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.aai</groupId>
             <artifactId>rest-client</artifactId>
-            <version>1.2.1</version>
+            <version>1.5.0</version>
         </dependency>
 
         <dependency>
@@ -366,7 +370,7 @@ limitations under the License.
             Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter
             Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order
             Use in combination to rewrite code and imports, then checkstyle
-            
+
             mvn formatter:format spotless:apply process-sources
             -->
             <plugin>
@@ -444,6 +448,8 @@ limitations under the License.
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
+			<tag>${project.docker.latesttag.version}</tag>
+			<tag>${project.major.version}.${project.minor.version}-STAGING-${maven.build.timestamp}</tag>
                     </imageTags>
                     <forceTags>true</forceTags>
                 </configuration>
@@ -499,9 +505,6 @@ limitations under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -528,7 +531,7 @@ limitations under the License.
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.onap.aai.aai-common</groupId>
+                                    <groupId>org.onap.aai.schema-service</groupId>
                                     <artifactId>aai-schema</artifactId>
                                     <version>${version.org.onap.aai.aai-schema}</version>
                                     <type>jar</type>
@@ -540,7 +543,35 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${jacoco.report.directory}/jacoco-ut.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>
+         </plugins>
     </build>
 
     <distributionManagement>