[AAI-2531] | Update springboot to 2.1.12.RELEASE

[aai/sparky-be.git] / sparkybe-onap-service / pom.xml

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index d558246..f3dd245 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -2,14 +2,14 @@
   <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.19.RELEASE</version>
+         <groupId>org.onap.aai</groupId>
+         <artifactId>sparky-be</artifactId>
+         <version>1.6.1-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-service</artifactId>
-       <version>1.4.0-SNAPSHOT</version>
+       <version>1.6.1-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>
@@ -22,19 +22,16 @@
                <sslport>8000</sslport>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <camel-spring-boot.version>2.21.1</camel-spring-boot.version>
-               <config-home>${basedir}/</config-home>
+               <config-home>${basedir}/</config-home>  
                <version.aai.aai-schema-ingest>1.4.1</version.aai.aai-schema-ingest>
-               <version.aai-schema>1.3.0</version.aai-schema>
+               <version.aai-schema>1.6.0</version.aai-schema>
                <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
-               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+               <onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
+               <jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
        </properties>
 
-
-
-
        <dependencyManagement>
                <dependencies>
-
                        <!-- Camel BOM -->
                        <dependency>
                                <groupId>org.apache.camel</groupId>
@@ -200,7 +197,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.2.2</version>
+                       <version>1.5.0</version>
                </dependency>
 
 
@@ -230,7 +227,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aai.aai-common</groupId>
+                       <groupId>org.onap.aai.schema-service</groupId>
                        <artifactId>aai-schema</artifactId>
                        <version>${version.aai-schema}</version>
                </dependency>
@@ -246,7 +243,17 @@ some of the depedencies should probably have a scope of provided so they don't a
                                </exclusion>
                    </exclusions>
            </dependency>
-                               
+               <dependency>
+                       <groupId>com.att.eelf</groupId>
+                       <artifactId>eelf-core</artifactId>
+                       <exclusions> <!--excluding transitive dependency coming from this artifact, as we would need powermock-api-mockito2-->
+                               <exclusion>
+                                       <groupId>org.powermock</groupId>
+                                       <artifactId>powermock-api-mockito</artifactId>
+                               </exclusion>
+                       </exclusions>
+                       <version>1.0.1-oss</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.aai</groupId>
                        <artifactId>rest-client</artifactId>
@@ -277,6 +284,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>
+                       <version>20140107</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -289,7 +297,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-fw</artifactId>
-                       <version>2.5.0</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
@@ -327,9 +334,8 @@ some of the depedencies should probably have a scope of provided so they don't a
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <version>1.6.2</version>
-                       <scope>test</scope>
+                       <artifactId>powermock-api-mockito2</artifactId>
+                       <version>2.0.2</version>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
@@ -337,6 +343,12 @@ some of the depedencies should probably have a scope of provided so they don't a
                        <version>1.6.2</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-core</artifactId>
+                       <version>2.0.0</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4-rule-agent</artifactId>
@@ -348,13 +360,19 @@ some of the depedencies should probably have a scope of provided so they don't a
                    <artifactId>javax.inject</artifactId>
                    <version>1</version>
                        <scope>test</scope>
-               </dependency>           
+               </dependency>
 
                <dependency>
                        <groupId>org.hamcrest</groupId>
                        <artifactId>hamcrest-library</artifactId>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-core</artifactId>
+                       <version>1.3</version>
+                       <scope>compile</scope>
+               </dependency>
 
        </dependencies>
 
@@ -491,6 +509,28 @@ some of the depedencies should probably have a scope of provided so they don't a
                                                        <goal>report</goal>
                                                </goals>
                                        </execution>
+                                       <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/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>
 
@@ -596,28 +636,11 @@ some of the depedencies should probably have a scope of provided so they don't a
             <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
-                    <executions>
-                        <execution>
-                            <id>default-deploy</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <nexusUrl>${onap.nexus.url}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
                 </plugin>
              </plugins>
 </build>
 
-       
+
     <distributionManagement>
        <repository>
           <id>ecomp-releases</id>