Removing sdnc version properties

These versions are provided by the ccsdk parent pom
and should not be duplicated.

Change-Id: I2d013a2b4d46dcf41f2757cc3acb3b6a16c6353f
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-321

diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml
index 782710e..7af7b74 100644 (file)
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/provider/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-provider</artifactId>
-           <version>${openecomp.sdnc.sql-resource.version}</version>
+           <version>${ccsdk.sli.adaptors.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/appc-config/pom.xml b/appc-config/pom.xml
index 89f1351..387b1f0 100644 (file)
--- a/appc-config/pom.xml
+++ b/appc-config/pom.xml
@@ -21,9 +21,6 @@
         <common.collections.version>3.2.1</common.collections.version>
         <common.io.version>2.5</common.io.version>
 
-        <sdnc.sql.resource.version>1.1.0</sdnc.sql.resource.version>
-        <openecomp.sdnc.sql-resource.version>${ccsdk.sli.adaptors.version}</openecomp.sdnc.sql-resource.version>
-        <sdnc.sli.version>1.1.0</sdnc.sli.version>
         <tosca.datatype.version>1.1.0</tosca.datatype.version>
     </properties>
 
@@ -33,7 +30,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>sql-resource-provider</artifactId>
-                <version>${openecomp.sdnc.sql-resource.version}</version>
+                <version>${ccsdk.sli.adaptors.version}</version>
             </dependency>
 
             <dependency>

diff --git a/appc-directed-graph/appc-dgraph/pom.xml b/appc-directed-graph/appc-dgraph/pom.xml
index 68a0622..e35d5cc 100644 (file)
--- a/appc-directed-graph/appc-dgraph/pom.xml
+++ b/appc-directed-graph/appc-dgraph/pom.xml
@@ -43,11 +43,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version>
-        <odl.controller.mdsal.version>1.4.1-Boron-SR1</odl.controller.mdsal.version>
-        <openecomp.sdnc.sli.version>1.1.0</openecomp.sdnc.sli.version>
-        <openecomp.sdnc.dblib.version>1.1.0</openecomp.sdnc.dblib.version>
-        <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version>
         <licenseDir>${project.parent.parent.basedir}</licenseDir>
     </properties>
 

diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml
index aec188e..06c8c3a 100644 (file)
--- a/appc-directed-graph/dg-loader/features/pom.xml
+++ b/appc-directed-graph/dg-loader/features/pom.xml
@@ -22,14 +22,12 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
 
@@ -41,7 +39,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${odl.karaf.empty.distro.version}</version>
             <type>zip</type>
         </dependency>
 

diff --git a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
index 49bf358..e35943a 100644 (file)
--- a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
+++ b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
@@ -29,8 +29,8 @@
        <feature name='sdnc-dg-loader' description="SDNC DG Loader"
                version='${project.version}'>
                <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-               <feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature>
-               <feature version='${openecomp.sdnc.sli.version}'>sdnc-sli</feature>
+               <feature>odl-mdsal-broker</feature>
+               <feature>sdnc-sli</feature>
                <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
                <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
                <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>

diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml
index 1d59629..6565929 100644 (file)
--- a/appc-directed-graph/dg-loader/pom.xml
+++ b/appc-directed-graph/dg-loader/pom.xml
@@ -45,15 +45,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version.source>1.8</java.version.source>
         <java.version.target>1.8</java.version.target>
-        <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version>
-        <odl.controller.mdsal.version>1.4.1-Boron-SR1</odl.controller.mdsal.version>
         <logback.version>1.1.1</logback.version>
         <common.collections.version>3.2.1</common.collections.version>
         <common.io.version>2.5</common.io.version>
         <jettison.version>1.3.7</jettison.version>
-        <openecomp.sdnc.sli.version>1.1.0</openecomp.sdnc.sli.version>
-        <openecomp.sdnc.dblib.version>1.1.0</openecomp.sdnc.dblib.version>
-        <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version>
         <licenseDir>${project.parent.parent.basedir}</licenseDir>
     </properties>
 

diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index 16970b4..1955f04 100644 (file)
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -39,16 +39,12 @@
     <description>Application Controller Directed Graph</description>
 
     <properties>
-        <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version>
         <jackson.version>2.3.2</jackson.version>
         <snakeyaml.version>1.12</snakeyaml.version>
         <velocity.version>1.7</velocity.version>
         <jettison.version>1.3.7</jettison.version>
         <common.collections.version>3.2.1</common.collections.version>
         <common.io.version>2.5</common.io.version>
-        <sdnc.sql.resource.version>1.1.0</sdnc.sql.resource.version>
-        <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version>
-        <sdnc.sli.version>1.1.0</sdnc.sli.version>
         <tosca.datatype.version>1.1.0</tosca.datatype.version>
         <licenseDir>${project.parent.basedir}</licenseDir>
     </properties>
@@ -59,7 +55,7 @@
             <dependency>
                 <groupId>org.openecomp.sdnc.adaptors</groupId>
                 <artifactId>sql-resource-provider</artifactId>
-                <version>${openecomp.sdnc.sql-resource.version}</version>
+                <version>${ccsdk.sli.adaptors.version}</version>
             </dependency>
 
             <dependency>

diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
index 5aa32be..a88410f 100644 (file)
--- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
@@ -30,8 +30,6 @@
 
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${odl.yangtools.version}/xml/features</repository>
  <repository>mvn:org.opendaylight.controller/features-mdsal/${odl.controller.mdsal.features.version}/xml/features</repository>
-<!--  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository> 
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${odl.controller.mdsal.version}/xml/features</repository> -->
 
        <feature name='appc-design-services' description="Application Controller Design Services"
                version='${project.version}'>

diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml
index 6c7105d..2681c8d 100755 (executable)
--- a/appc-inbound/pom.xml
+++ b/appc-inbound/pom.xml
@@ -12,7 +12,6 @@
     <description>Application Controller Inbound</description>\r
 \r
     <properties>\r
-        <openecomp.sdnc.sql-resource.version>1.1.2</openecomp.sdnc.sql-resource.version>  \r
         <jackson.version>2.3.2</jackson.version>\r
         <snakeyaml.version>1.12</snakeyaml.version>\r
         <velocity.version>1.7</velocity.version>\r

diff --git a/appc-outbound/pom.xml b/appc-outbound/pom.xml
index 2398aca..28f28d9 100755 (executable)
--- a/appc-outbound/pom.xml
+++ b/appc-outbound/pom.xml
@@ -21,7 +21,7 @@
                        <dependency>\r
                                <groupId>org.openecomp.sdnc.adaptors</groupId>\r
                                <artifactId>sql-resource-provider</artifactId>\r
-                               <version>${openecomp.sdnc.sql-resource.version}</version>\r
+                               <version>${ccsdk.sli.adaptors.version}</version>\r
                        </dependency>\r
 \r
                        <dependency>\r

diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 90ac437..96930ef 100644 (file)
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -199,11 +199,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                        <artifactId>jackson-core</artifactId>
                        <version>${jackson-yaml-version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.yaml</groupId>
-                       <artifactId>snakeyaml</artifactId>
-                       <version>${snakeyaml.version}</version>
-               </dependency>
 
                <dependency>
                        <groupId>org.mockito</groupId>