X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=bdfc439f7b644283805de73ed64cfa47ec4a093a;hb=117c7e7210f00da7011275be4347aae8d500002a;hp=9d76e91412048f9dcad6767f0e6c945e4e2159dc;hpb=da976a9c10cca4249e97f6629eb17cd52a7e4955;p=appc.git

diff --git a/pom.xml b/pom.xml
index 9d76e9141..bdfc439f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 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/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.7.1-Boron-SR1</version>
-        <relativePath>../../../../../opendaylight/odlparent</relativePath>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-carbon-sr1</artifactId>
+        <version>0.1.0</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>
-    <name>APP-C</name>
+    <version>1.3.0-SNAPSHOT</version>
+    <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
     <organization>
@@ -27,52 +47,31 @@
     <!-- ================================================================================== -->
     <properties>
         <!-- VERSIONS -->
-        <!-- OpenDaylight Versions -->
-		<odl.version>1.7.1-Boron-SR1</odl.version>
-		<odl.dlux.version>0.4.1-Boron-SR1</odl.dlux.version>
-		<odl.yangtools.version>1.0.1-Boron-SR1</odl.yangtools.version>
-		<odl.mdsal.version>1.4.1-Boron-SR1</odl.mdsal.version>
-		<odl.mdsal.features.version>2.1.1-Boron-SR1</odl.mdsal.features.version>
-                <odl.controller.mdsal.features.version>1.4.1-Boron-SR1</odl.controller.mdsal.features.version>
-		<odl.mdsal.model.version>0.9.1-Boron-SR1</odl.mdsal.model.version>
-		<odl.mdsal.yang.binding.version>0.9.1-Boron-SR1</odl.mdsal.yang.binding.version>
-		<odl.restconf.version>1.4.1-Boron-SR1</odl.restconf.version>
-		<odl.controller.model.version>${odl.mdsal.model.version}</odl.controller.model.version>
-		<odl.controller.config.api.version>0.5.1-Boron-SR1</odl.controller.config.api.version>
-		<odl.karaf.empty.distro.version>${odl.version}</odl.karaf.empty.distro.version>
-		<odl.commons.opendaylight.version>${odl.version}</odl.commons.opendaylight.version>
-		<odl.ietf-inet-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-inet-types.version>
-		<odl.ietf-yang-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-yang-types.version>
-		<odl.yang.jmx.generator.version>0.5.1-Boron-SR1</odl.yang.jmx.generator.version>
-		<odl.yangtools.yang.maven.plugin.version>${odl.yangtools.version}</odl.yangtools.yang.maven.plugin.version>
-		<odl.sal.api.gen.plugin.version>0.9.1-Boron-SR1</odl.sal.api.gen.plugin.version>
 
-        <!-- OPENECOMP SDNC versions -->
-        <sdnctl.sli.version>1.1.0-SNAPSHOT</sdnctl.sli.version>
-        <sdnctl.dblib.version>1.1.0-SNAPSHOT</sdnctl.dblib.version>
-        <sdnctl.aai.service.version>1.1.0-SNAPSHOT</sdnctl.aai.service.version>
 
-        <cdp.pal.version>0.0.1</cdp.pal.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.6-oss</cdp.pal.version>
+        <dmaap.client.version>1.1.3</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>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <java.version.source>1.7</java.version.source>
-        <java.version.target>1.7</java.version.target>
         <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
         <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
         <apache.httpcomponents.version>4.4</apache.httpcomponents.version>
         <commons.lang3.version>3.4</commons.lang3.version>
         <antlr.version>4.5.1</antlr.version>
-        <mysql.connector.version>5.1.39</mysql.connector.version>
+        <logback.version>1.1.1</logback.version>
+        <toscalib.version>1.1.0</toscalib.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}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+        <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.projectVersion>${project.version}</sonar.projectVersion>
 
@@ -81,16 +80,11 @@
         <!-- ADDING TO SUPPORT APPC-PROVIDER-MODEL yang-gen-sal FOLDER GENERATION -->
         <yang.file.directory>src/main/yang</yang.file.directory>
         <features.file>features.xml</features.file>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <checkstyle.skip>true</checkstyle.skip>
-        
-        <!-- NEXUS URLS -->
-        <openecomp.nexus.host>nexus.onap.org</openecomp.nexus.host>
-        <openecomp.nexus.url>https://${openecomp.nexus.host}/content</openecomp.nexus.url>
-        <openecomp.nexus.snapshot-url>${openecomp.nexus.url}/repositories/snapshots/</openecomp.nexus.snapshot-url>
-        <openecomp.nexus.release-url>${openecomp.nexus.url}/repositories/releases/</openecomp.nexus.release-url>
-        <openecomp.nexus.javadocs-url>dav:${openecomp.nexus.url}/sites/site/org/openecomp/appc/${project.version}</openecomp.nexus.javadocs-url>
+        <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>
+
     </properties>
 
 
@@ -102,9 +96,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>2.10</version>
                 <configuration>
-                    <excludePackageNames>org.openecomp.sdnc</excludePackageNames>
+                    <excludePackageNames>org.onap.ccsdk.sli</excludePackageNames>
                     <failOnError>false</failOnError>
                     <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
                     <docletArtifact>
@@ -127,17 +121,17 @@
         <!-- This site is used for Javadocs -->
         <site>
             <id>ecomp-site</id>
-            <url>${openecomp.nexus.javadocs-url}</url>
+            <url>dav:${onap.nexus.url}/content/sites/site/org/onap/appc/${project.version}</url>
         </site>
         <repository>
             <id>ecomp-releases</id>
             <name>openecomp-repository-releases</name>
-            <url>${openecomp.nexus.release-url}</url>
+            <url>${onap.nexus.url}/content/repositories/releases</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
             <name>openecomp-repository-snapshots</name>
-            <url>${openecomp.nexus.snapshot-url}</url>
+            <url>${onap.nexus.url}/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -188,7 +182,6 @@
     <!-- ================================================================================== -->
     <dependencyManagement>
         <dependencies>
-            <!-- ODL -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
@@ -237,7 +230,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>features-mdsal</artifactId>
-                <version>${odl.controller.mdsal.features.version}</version>
+                <version>${odl.mdsal.features.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
@@ -254,6 +247,16 @@
                 <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>
             <!-- CURRENTLY DOES NOT EXIST IN 3.0. Replacement? -->
             <!-- Required for launching the feature tests -->
             <!-- <dependency> -->
@@ -273,50 +276,50 @@
             </dependency>
             <!-- SDNC -->
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
                 <version>${sdnctl.sli.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-provider</artifactId>
                 <version>${sdnctl.sli.version}</version>
             </dependency>
             <!-- dblib -->
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
-            <!-- A&AI service provider dependency override in order to use 
-                a stable version -->
+            <!-- A&AI service provider dependency override in order to use a stable
+                version -->
             <dependency>
-                <groupId>org.openecomp.sdnc.adaptors</groupId>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </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>
@@ -337,23 +340,35 @@
                 <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>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.12</version>
-            </dependency>
+            <!-- <dependency> -->
+            <!-- <groupId>org.slf4j</groupId> -->
+            <!-- <artifactId>slf4j-api</artifactId> -->
+            <!-- <version>1.7.12</version> -->
+            <!-- </dependency> -->
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
@@ -391,6 +406,12 @@
                 <artifactId>eelf-core</artifactId>
                 <version>${eelf.version}</version>
             </dependency>
+            <!-- Maria DB -->
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>1.2.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -420,10 +441,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compile.plugin.version}</version>
-                    <configuration>
-                        <source>${java.version.source}</source>
-                        <target>${java.version.target}</target>
-                    </configuration>
                 </plugin>
                 <!-- Define the javadoc plugin -->
                 <plugin>
@@ -431,7 +448,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.10</version>
                     <configuration>
-                        <excludePackageNames>org.opendaylight.*:org.openecomp.sdnc</excludePackageNames>
+                        <excludePackageNames>org.opendaylight.*:org.onap.ccsdk.sli</excludePackageNames>
                     </configuration>
                 </plugin>
                 <!-- Define the source plugin -->
@@ -491,23 +508,22 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.9.1</version>
                 </plugin>
-                <!-- SonarQube plugin -->
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.2</version>
+                  <groupId>org.sonarsource.scanner.maven</groupId>
+                  <artifactId>sonar-maven-plugin</artifactId>
+                  <version>3.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
-            <!--maven staging plugin-->
+            <!--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>https://${openecomp.nexus.host}</nexusUrl>
+                    <nexusUrl>${onap.nexus.url}</nexusUrl>
                     <stagingProfileId>176c31dfe190a</stagingProfileId>
                     <serverId>ecomp-staging</serverId>
                 </configuration>
@@ -525,36 +541,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <!-- license plugin -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>1.10</version>
-                <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <licenseName>apache_v2</licenseName>
-                    <inceptionYear>2017</inceptionYear>
-                    <organizationName>AT&amp;T Intellectual Property. All rights
-						reserved.</organizationName>
-                    <projectName>openECOMP : APP-C</projectName>
-                    <canUpdateCopyright>true</canUpdateCopyright>
-                    <canUpdateDescription>true</canUpdateDescription>
-                    <canUpdateLicense>true</canUpdateLicense>
-                    <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>first</id>
-                        <goals>
-                            <goal>update-file-header</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
@@ -577,29 +563,30 @@
                         </configuration>
                     </execution>
                 </executions>
+
             </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>
+                <goals> <goal>build-bom</goal> </goals> </execution> </executions> </plugin> -->
+
+            <!-- force Eclipse to skip the additional-install step specified in the
+                org.opendaylight.odlparent:odlparent-lite:1.7.1-Boron-SR1.pom profile -->
             <plugin>
-                <groupId>com.blackducksoftware.integration</groupId>
-                <artifactId>hub-maven-plugin</artifactId>
-                <version>1.4.0</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <hubProjectName>${project.name}</hubProjectName>
-                    <outputDirectory>${project.basedir}</outputDirectory>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>create-bdio-file</id>
-                        <phase>package</phase>
+                        <id>additional-install</id>
                         <goals>
-                            <goal>createHubOutput</goal>
+                            <goal>install-file</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>
 
@@ -617,9 +604,6 @@
             <properties>
                 <ssl.allowall>true</ssl.allowall>
                 <ssl.insecure>true</ssl.insecure>
-                <openecomp.nexus.host>nexus.onap.org</openecomp.nexus.host>
-                <openecomp.nexus.release-url>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.release-url>
-                <openecomp.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshot-url>
                 <openecomp.git.port>7999</openecomp.git.port>
                 <openecomp.git.project>st_osecomp</openecomp.git.project>
                 <openecomp.git.protocol>http</openecomp.git.protocol>
@@ -633,7 +617,16 @@
                 <module>appc-adapters</module>
                 <module>appc-provider</module>
                 <module>appc-event-listener</module>
-                <module>appc-asdc-listener</module>
+                <module>appc-sdc-listener</module>
+                <module>appc-lifecycle-management</module>
+                <module>appc-oam</module>
+                <module>appc-config</module>
+                <module>appc-directed-graph</module>
+                <module>appc-outbound</module>
+                <module>appc-inbound</module>
+                <module>appc-sequence-generator</module>
+                <module>appc-client</module>
+                <module>appc-test-dependencies</module>
             </modules>
         </profile>
         <profile>