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

diff --git a/pom.xml b/pom.xml
index 8ab051076..9f66d39f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 ============LICENSE_START=======================================================
 ONAP : APPC
 ================================================================================
-Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Copyright (C) 2017 Amdocs
 =============================================================================
@@ -18,24 +18,21 @@ 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.
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============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-carbon-sr1</artifactId>
-        <version>0.1.0</version>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.1</version>
     </parent>
 
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
-    <version>1.1.0-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>
@@ -51,10 +48,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <!-- VERSIONS -->
 
 
-        <cdp.pal.version>1.1.25.2-oss</cdp.pal.version>
-        <dmaap.client.version>0.2.12</dmaap.client.version>
-        <eelf.version>0.0.1</eelf.version>
-        <eelf.maven.plugin.version>0.0.1</eelf.maven.plugin.version>
+        <cdp.pal.version>1.1.25.8-oss</cdp.pal.version>
+        <dmaap.client.version>1.1.5</dmaap.client.version>
+        <eelf.version>1.0.0</eelf.version>
+        <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
         <cadi-version>1.3.0</cadi-version>
         <inno-version>1.2.11</inno-version>
         <dme2-version>3.1.200</dme2-version>
@@ -64,18 +61,17 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <apache.httpcomponents.version>4.4</apache.httpcomponents.version>
         <commons.lang3.version>3.4</commons.lang3.version>
         <antlr.version>4.5.1</antlr.version>
-        <logback.version>1.1.1</logback.version>
-        <toscalib.version>1.1.0</toscalib.version>
-        <sdc-client.version>1.1.32-SNAPSHOT</sdc-client.version>
+        <logback.version>1.2.0</logback.version>
+        <sdc-client.version>1.3.0</sdc-client.version>
         <jackson.yml.version>2.3.2</jackson.yml.version>
 
         <!-- 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>
@@ -84,8 +80,23 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>target/generated-sources/yang-gen-config</jmxGeneratorPath>
         <!-- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> -->
-        
+
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        
+        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
+        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
+        <!-- <ccsdk.sli.adaptors.version>${ccsdk.sli.adaptors.version}</ccsdk.sli.adaptors.version> -->
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <odl.sal.api.gen.plugin.version>0.11.1</odl.sal.api.gen.plugin.version>
+        <odl.yangtools.version>1.2.1</odl.yangtools.version>
+        <odl.mdsal.yang.binding.version>0.11.1</odl.mdsal.yang.binding.version>
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
+        <odl.mdsal.features.version>2.3.1</odl.mdsal.features.version>
+        <odl.yang.jmx.generator.version>0.7.1</odl.yang.jmx.generator.version>
+        <odl.ietf-yang-types.version>2013.07.15.13.1</odl.ietf-yang-types.version>
+        <odl.ietf-inet-types.version>1.5.1</odl.ietf-inet-types.version>
+        <odl.controller.config.api.version>0.7.1</odl.controller.config.api.version>
+        <odl.commons.opendaylight.version>2.0.5</odl.commons.opendaylight.version>
 
     </properties>
 
@@ -112,6 +123,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                     <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>
 
@@ -184,6 +207,17 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <!-- ================================================================================== -->
     <dependencyManagement>
         <dependencies>
+              <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>22.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>22.0</version>
+        <scope>test</scope>
+      </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
@@ -194,21 +228,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <artifactId>sal-binding-config</artifactId>
                 <version>${odl.mdsal.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-api</artifactId>
-                <version>${odl.mdsal.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-test-model</artifactId>
                 <version>${odl.mdsal.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>sal-rest-connector</artifactId>
-                <version>${odl.mdsal.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
@@ -244,27 +268,16 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>opendaylight-karaf-empty</artifactId>
-                <version>${odl.karaf.empty.distro.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types</artifactId>
-                <version>${odl.ietf-inet-types.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-yang-types</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> -->
             <!-- <groupId>org.opendaylight.yangtools</groupId> -->
             <!-- <artifactId>features-test</artifactId> -->
-            <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
 
@@ -293,7 +306,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
-            <!-- A&AI service provider dependency override in order to use a stable 
+            <!-- A&AI service provider dependency override in order to use a stable
                 version -->
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@ -302,26 +315,26 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </dependency>
             <!-- APPC -->
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
                 <classifier>config</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -342,16 +355,28 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <version>4.12</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.9.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-guava</artifactId>
+                <version>3.1.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.1.1</version>
+		<version>${logback.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.1.1</version>
+                <version>${logback.version}</version>
                 <scope>compile</scope>
             </dependency>
             <!-- <dependency> -->
@@ -367,7 +392,17 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>0.12.0</version>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-sftp</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-scp</artifactId>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -400,10 +435,16 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>1.2.3</version>
+                <version>2.1.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    </dependencies>
 
 
     <!-- ================================================================================== -->
@@ -498,26 +539,50 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                     <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>
-            <!--maven staging 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> 
+            <!-- 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>
@@ -557,10 +622,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </plugin>
 
             <!-- blackduck maven plugin -->
-            <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> 
-                <version>2.0.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName> 
-                <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio> 
-                </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase> 
+            <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId>
+                <version>2.0.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName>
+                <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio>
+                </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase>
                 <goals> <goal>build-bom</goal> </goals> </execution> </executions> </plugin> -->
 
             <!-- force Eclipse to skip the additional-install step specified in the
@@ -585,7 +650,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->
     <modules>
-        <module>appc-common</module>
+        <module>appc-core</module>
     </modules>
     <!-- Adding profiles for testing -->
     <profiles>
@@ -603,10 +668,9 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>appc-common</module>
                 <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>
@@ -632,6 +696,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <module>appc-metric</module>
                 <module>appc-dg</module>
                 <module>appc-dg-util</module>
+                <module>services</module>
             </modules>
         </profile>
     </profiles>