aboutsummaryrefslogtreecommitdiffstats
path: root/appc-inbound/appc-artifact-handler/model
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-02-22 13:37:19 -0800
committerPatrick Brady <patrick.brady@att.com>2019-02-25 22:33:05 +0000
commit13c0353d0f637ec88ca4cdbeb64c4de3917e6a2b (patch)
treea9d1561322f2f66556aa7c8a6e3ddae592a23d08 /appc-inbound/appc-artifact-handler/model
parent356dba9fb407b1df3fe89a4c8f082a09aa564d36 (diff)
Changes for new odl version
Changes required to update to latest opendaylight version. Some powermock tests have been temporarily removed due to an powermock incompatibility. They will be fixed and re-added. Change-Id: I418d44913fcd42423d2d9bd37b189f6301eaab81 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1370
Diffstat (limited to 'appc-inbound/appc-artifact-handler/model')
-rwxr-xr-xappc-inbound/appc-artifact-handler/model/pom.xml13
-rw-r--r--appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang1
2 files changed, 5 insertions, 9 deletions
diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml
index 2fef74457..48f058096 100755
--- a/appc-inbound/appc-artifact-handler/model/pom.xml
+++ b/appc-inbound/appc-artifact-handler/model/pom.xml
@@ -30,8 +30,8 @@
</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>
@@ -76,6 +76,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -110,15 +111,11 @@
</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.5.0-SNAPSHOT</version>
diff --git a/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang b/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
index f9bf7ae10..0aa8082d4 100644
--- a/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
+++ b/appc-inbound/appc-artifact-handler/model/src/main/yang/artifact-handler.yang
@@ -28,7 +28,6 @@ module artifact-handler {
namespace "org.onap.appc:artifacthandler";
prefix artifacthandler;
- import ietf-inet-types { prefix "ietf"; revision-date "2010-09-24"; }
organization "AT&T, Inc.";
description