Release appc

[appc.git] / appc-inbound / appc-artifact-handler / model / pom.xml

diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml
index 2763d0f..73e6ae7 100755 (executable)
--- a/appc-inbound/appc-artifact-handler/model/pom.xml
+++ b/appc-inbound/appc-artifact-handler/model/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   Copyright (C) 2017 Amdocs
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,13 +25,13 @@
        <parent>
                <groupId>org.onap.appc.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.4.0</version>
+               <version>2.6.0-SNAPSHOT</version>
                 <relativePath />
        </parent>
         <groupId>org.onap.appc</groupId>
        <artifactId>appc-artifact-handler-model</artifactId>
-       <name>APPC Artifact Handler - Model</name>
        <packaging>bundle</packaging>
+       <name>APPC Artifact Handler - Model</name>
 
        <build>
 
@@ -42,7 +42,7 @@
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>
-                                               <Import-Package>!com.google.common.collect,*</Import-Package>
+                                               <Import-Package>com.google.common.collect,com.google.common.base,*</Import-Package>
                                                <Embed-Dependency>guava</Embed-Dependency>
                                        </instructions>
                                </configuration>
@@ -50,12 +50,10 @@
                        <plugin>
                                <groupId>org.opendaylight.yangtools</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
-                                <version>${odl.yangtools.version}</version>
                                <dependencies>
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <!-- <version>${odl.yangtools.version}</version> -->
                                                <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
@@ -78,6 +76,7 @@
                                        </execution>
                                </executions>
                        </plugin>
+
                        <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
@@ -112,16 +111,12 @@
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
+                       <artifactId>ietf-inet-types-2013-07-15</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
+                       <artifactId>ietf-yang-types-20130715</artifactId>
                </dependency>
        </dependencies>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.6.0</version>
 </project>