Update the aai-common pom to 1.2.2-SNAPSHOT

[aai/data-router.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e674983..0f3b288 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,24 @@
+<!--
+============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>
@@ -9,7 +30,8 @@
     </parent>
     <groupId>org.onap.aai.data-router</groupId>
     <artifactId>data-router</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
+    <name>aai-data-router</name>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
@@ -41,10 +63,43 @@
         <testEnv>DEV</testEnv>
         <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
+                      <!-- Sonar Properties -->
+              <sonar.language>java</sonar.language>
+              <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+              <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+              <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+              <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
+              <sonar.projectVersion>${project.version}</sonar.projectVersion>
     </properties>
 
     <dependencies>
-
+<dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-javaagent</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4-rule-agent</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>   
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -61,12 +116,12 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.router-core</groupId>
             <artifactId>router-core</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>
@@ -87,13 +142,19 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.aai.logging-service</groupId>
-            <artifactId>common-logging</artifactId>
-            <version>1.0.0</version>
+                       <groupId>org.onap.aai.logging-service</groupId>
+                       <artifactId>common-logging</artifactId>
+                       <version>1.1.0</version>
+               </dependency>
+
+        <dependency>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>logging-api</artifactId>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.aai</groupId>
+            <groupId>org.onap.aai</groupId>
             <artifactId>rest-client</artifactId>
             <version>1.1.0</version>
         </dependency>
@@ -168,7 +229,7 @@
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>                              
+                    <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>                              
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
@@ -177,6 +238,7 @@
                 </configuration>
             </plugin>
             <!-- license plugin -->
+            <!-- Uncomment this to add a license header to every source file 
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -185,6 +247,7 @@
                     <header>License.txt</header>
                     <includes>
                         <include>src/main/java/**</include>
+                        <include>src/test/java/**</include>
                     </includes>
                 </configuration>
                 <executions>
@@ -196,6 +259,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -239,6 +303,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
         </plugins>
     </build>
 
@@ -353,6 +418,7 @@
                             </dependency>
                         </dependencies>
                     </plugin>
+                   
                 </plugins>
             </build>
         </profile>