X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f9cd324528238b4081a24504d29d2507142c4392;hb=refs%2Fheads%2Fdublin;hp=6729c99bcb16829def981c8cc304eebd99562add;hpb=f0852a8174e38cc0c203a21a59af98e6c3889d5f;p=appc.git

diff --git a/pom.xml b/pom.xml
index 6729c99bc..f9cd32452 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,22 @@ 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">
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-carbon-sr1</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <artifactId>odlparent</artifactId>
+        <version>1.0.3</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.5.3-SNAPSHOT</version>
     <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
@@ -51,10 +49,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <!-- VERSIONS -->
 
 
-        <cdp.pal.version>1.1.7-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,10 +62,9 @@ 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>
-        <mysql.connector.version>5.1.39</mysql.connector.version>
-        <logback.version>1.1.1</logback.version>
+        <logback.version>1.2.0</logback.version>
         <toscalib.version>1.1.0</toscalib.version>
-        <sdc-client.version>1.1.13-SNAPSHOT</sdc-client.version>
+        <sdc-client.version>1.3.0</sdc-client.version>
         <jackson.yml.version>2.3.2</jackson.yml.version>
 
         <!-- SONAR -->
@@ -85,8 +82,24 @@ 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>
+        <odl.karaf.empty.distro.version>1.8.3-Carbon</odl.karaf.empty.distro.version>
 
     </properties>
 
@@ -124,7 +137,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <!-- This site is used for Javadocs -->
         <site>
             <id>ecomp-site</id>
-            <url>dav:${onap.nexus.url}/sites/site/org/onap/appc/${project.version}</url>
+            <url>dav:${onap.nexus.url}/content/sites/site/org/onap/appc/${project.version}</url>
         </site>
         <repository>
             <id>ecomp-releases</id>
@@ -185,6 +198,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>
@@ -205,11 +229,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <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>
@@ -252,12 +271,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types</artifactId>
+                <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</artifactId>
+                <artifactId>ietf-yang-types-20130715</artifactId>
                 <version>${odl.ietf-yang-types.version}</version>
             </dependency>
             <!-- CURRENTLY DOES NOT EXIST IN 3.0. Replacement? -->
@@ -265,7 +284,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <!-- <dependency> -->
             <!-- <groupId>org.opendaylight.yangtools</groupId> -->
             <!-- <artifactId>features-test</artifactId> -->
-            <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
 
@@ -294,7 +312,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>
@@ -303,26 +321,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>
@@ -343,16 +361,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> -->
@@ -368,7 +398,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>
@@ -397,8 +437,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <artifactId>eelf-core</artifactId>
                 <version>${eelf.version}</version>
             </dependency>
+            <!-- Maria DB -->
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>2.1.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    </dependencies>
 
 
     <!-- ================================================================================== -->
@@ -501,18 +553,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </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> 
             <!-- Javadocs Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -552,10 +592,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
@@ -580,7 +620,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>
@@ -598,7 +638,6 @@ 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-provider</module>
                 <module>appc-event-listener</module>