Merge "Update Sparky README files"

[aai/sparky-be.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6e37aaa..ae567c1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,10 @@
                <groupId>com.att.ajsc</groupId>
                <version>2.0.0</version>
        </parent>
-       <groupId>org.openecomp.aai.sparky-be</groupId>
+       <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparky-be</artifactId>
-       <version>1.0-SNAPSHOT</version>
+       <version>1.2.0-SNAPSHOT</version>
+       <name>aai-sparky-be</name>
 
        <properties>
                <docker.location>${basedir}/target</docker.location>
@@ -17,6 +18,9 @@
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
                <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
                <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
+               <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
+               <frontEndArtifactId>sparky-fe</frontEndArtifactId>
+               <frontEndVersion>1.1.0-SNAPSHOT</frontEndVersion>
 
                <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> 
                        property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" 
@@ -40,11 +44,18 @@
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
                <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+
+               <!-- Sonar Configuration -->
+               <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.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
@@ -96,13 +107,6 @@
                        <version>1.7.20</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.openecomp.aai</groupId>
-                       <artifactId>rest-client</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-               </dependency>
-
-
                <dependency>
                        <groupId>org.hamcrest</groupId>
                        <artifactId>hamcrest-library</artifactId>
@@ -110,12 +114,6 @@
                        <scope>test</scope>
                </dependency>
 
-               <!-- <dependency> <groupId>com.att.csp</groupId> <artifactId>gatekeeper</artifactId> 
-                       <version>1.0</version> <scope>system</scope> <systemPath>${project.basedir}/local-repository/gatekeeper-1.0.jar</systemPath> 
-                       </dependency> <dependency> <groupId>com.att.csp</groupId> <artifactId>PSE_Lite</artifactId> 
-                       <version>1.0</version> <scope>system</scope> <systemPath>${project.basedir}/local-repository/PSE_Lite-1.0.jar</systemPath> 
-                       </dependency> -->
-
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
@@ -140,13 +138,24 @@
                        <version>2.7.4</version>
                </dependency>
 
-               <!-- Common logging framework -->
-               <dependency>
-                 <groupId>org.openecomp.aai.logging-service</groupId>
-                 <artifactId>common-logging</artifactId>
-                 <version>1.0.0</version>
-               </dependency>
-               
+        <dependency>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>common-logging</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-schema</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aai</groupId>
+            <artifactId>rest-client</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
                <dependency>
                        <groupId>com.google.code.gson</groupId>
                        <artifactId>gson</artifactId>
@@ -178,9 +187,15 @@
                </dependency>
                
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                   <groupId>com.openpojo</groupId>
+                   <artifactId>openpojo</artifactId>
+                   <version>0.8.6</version>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-fw</artifactId>
-                       <version>1.1.0</version>
+                       <version>1.3.0 </version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
@@ -383,9 +398,9 @@
                                                        <configuration>
                                                                <artifactItems>
                                                                        <artifactItem>
-                                                                               <groupId>org.openecomp.aai</groupId>
-                                                                               <artifactId>sparky-fe</artifactId>
-                                                                               <version>1.0.0-SNAPSHOT</version>
+                                                                               <groupId>${frontEndGroupdId}</groupId>
+                                                                               <artifactId>${frontEndArtifactId}</artifactId>
+                                                                               <version>${frontEndVersion}</version>
                                                                                <type>war</type>
                                                                                <outputDirectory>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps/</outputDirectory>
                                                                                <destFileName>aai.war</destFileName>
@@ -500,7 +515,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>
@@ -554,25 +569,21 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.9</version>
+                               <version>0.7.7.201606060606</version>
                                <configuration>
-                                       <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
-                                       <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
+                                       <dumpOnExit>true</dumpOnExit>
                                </configuration>
                                <executions>
                                        <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>jacoco-site</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                       </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>
 
@@ -590,4 +601,4 @@
             <url>${nexusproxy}/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
-</project>
+</project>
\ No newline at end of file