Release appc

[appc.git] / appc-directed-graph / pom.xml

diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index 16970b4..e8d3ab8 100644 (file)
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================
   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================


@@ -17,8 +17,6 @@
   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.
   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=========================================================
   -->
 
   ============LICENSE_END=========================================================
   -->
 


@@ -27,28 +25,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

-        <groupId>org.openecomp.appc</groupId>
+        <groupId>org.onap.appc</groupId>

         <artifactId>appc</artifactId>
         <artifactId>appc</artifactId>

-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.6.1</version>

     </parent>
 
     </parent>
 

-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>

     <artifactId>appc-directed-graph</artifactId>
     <packaging>pom</packaging>
     <name>Application Controller Directed Graph</name>
     <description>Application Controller Directed Graph</description>
 
     <properties>
     <artifactId>appc-directed-graph</artifactId>
     <packaging>pom</packaging>
     <name>Application Controller Directed Graph</name>
     <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>
         <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>
+        <commons.collections.version>3.2.2</commons.collections.version>

         <common.io.version>2.5</common.io.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>
         <tosca.datatype.version>1.1.0</tosca.datatype.version>
         <licenseDir>${project.parent.basedir}</licenseDir>
     </properties>


@@ -57,9 +51,9 @@
         <dependencies>
 
             <dependency>
         <dependencies>
 
             <dependency>

-                <groupId>org.openecomp.sdnc.adaptors</groupId>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>

                 <artifactId>sql-resource-provider</artifactId>
                 <artifactId>sql-resource-provider</artifactId>

-                <version>${openecomp.sdnc.sql-resource.version}</version>
+                <version>${ccsdk.sli.adaptors.version}</version>

             </dependency>
 
             <dependency>
             </dependency>
 
             <dependency>


@@ -96,6 +90,17 @@
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>

+                <exclusions>
+                     <exclusion>
+                          <artifactId>commons-collections</artifactId>
+                          <groupId>commons-collections</groupId>
+                     </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>

             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>