X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=blobdiff_plain;f=pom.xml;h=6fb864a309063be45c3a2107c803333935df8edd;hp=c41098013af628d15d670ff95e55ba3e8f80467e;hb=refs%2Fheads%2Fmaster;hpb=b69312bc935cbc6c2997a2a4ee24204ded9ebb29

diff --git a/pom.xml b/pom.xml
index c41098013..9f66d39f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,11 @@ 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.3.2</version>
+        <version>1.5.1</version>
     </parent>
 
 
@@ -33,7 +32,7 @@ limitations under the License.
     <packaging>pom</packaging>
     <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
@@ -68,11 +67,11 @@ limitations under the License.
 
         <!-- SONAR -->
         <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}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+        <sonar.coverage.jacoco.xmlReportPaths>
+            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
         <salGeneratorPath>target/generated-sources/yang-gen-sal</salGeneratorPath>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
@@ -124,6 +123,18 @@ limitations under the License.
                     <useStandardDocletOptions>true</useStandardDocletOptions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <reportSets>
+                  <reportSet>
+                    <reports>
+                      <!-- select non-aggregate reports -->
+                      <report>report</report>
+                    </reports>
+                  </reportSet>
+                </reportSets>
+            </plugin>
         </plugins>
     </reporting>
 
@@ -257,15 +268,11 @@ limitations under the License.
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types-2013-07-15</artifactId>
-                <version>${odl.ietf-inet-types.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-yang-types-20130715</artifactId>
-                <version>${odl.ietf-yang-types.version}</version>
-            </dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+
+            
             <!-- CURRENTLY DOES NOT EXIST IN 3.0. Replacement? -->
             <!-- Required for launching the feature tests -->
             <!-- <dependency> -->
@@ -532,14 +539,50 @@ limitations under the License.
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.9.1</version>
                 </plugin>
-                <plugin>
-                  <groupId>org.sonarsource.scanner.maven</groupId>
-                  <artifactId>sonar-maven-plugin</artifactId>
-                  <version>3.2</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
+            <!-- jacoco for testing -->
+            <plugin>
+              <groupId>org.jacoco</groupId>
+              <artifactId>jacoco-maven-plugin</artifactId>
+              <version>0.8.4</version>
+              <executions>
+                <execution>
+                  <id>default-prepare-agent</id>
+                  <goals>
+                    <goal>prepare-agent</goal>
+                  </goals>
+                </execution>
+                <execution>
+                  <id>default-report</id>
+                  <phase>prepare-package</phase>
+                  <goals>
+                    <goal>report</goal>
+                  </goals>
+                </execution>
+                <execution>
+                  <id>default-check</id>
+                  <goals>
+                    <goal>check</goal>
+                  </goals>
+                  <configuration>
+                      <rules>
+                          <rule>
+                              <element>PACKAGE</element>
+                              <limits>
+                                  <limit>
+                                      <counter>COMPLEXITY</counter>
+                                      <value>COVEREDRATIO</value>
+                                      <minimum>0.0</minimum>
+                                  </limit>
+                              </limits>
+                          </rule>
+                      </rules>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
             <!-- Javadocs Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -626,8 +669,8 @@ limitations under the License.
             </activation>
             <modules>
                 <module>appc-adapters</module>
+                <module>appc-service-communicator</module>
                 <module>appc-provider</module>
-                <module>appc-event-listener</module>
                 <module>appc-sdc-listener</module>
                 <module>appc-lifecycle-management</module>
                 <module>appc-oam</module>
@@ -636,7 +679,7 @@ limitations under the License.
                 <module>appc-outbound</module>
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
-<!--                 <module>appc-client</module> -->
+                <module>appc-client</module>
             </modules>
         </profile>
         <profile>
@@ -653,6 +696,7 @@ limitations under the License.
                 <module>appc-metric</module>
                 <module>appc-dg</module>
                 <module>appc-dg-util</module>
+                <module>services</module>
             </modules>
         </profile>
     </profiles>