summaryrefslogtreecommitdiffstats
path: root/resource-assignment
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-03 16:24:22 -0500
committerDan Timoney <dtimoney@att.com>2019-01-11 22:58:05 +0000
commitf200a729ebedc2d292251e4f8a1b20b2e1668b7d (patch)
tree17313e6ec37661f887ecaacfd88a79892b6a3288 /resource-assignment
parent0cf282459fe7cf129a390d59d46b6de299ac86db (diff)
Changes for Fluorine
Update sli/adaptors to compile against ODL Fluorine Change-Id: I9ec4c89301678e9398dc2c43db4cffff03953806 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'resource-assignment')
-rw-r--r--resource-assignment/features/ccsdk-resource-assignment/pom.xml22
-rwxr-xr-xresource-assignment/features/features-resource-assignment/pom.xml4
-rwxr-xr-xresource-assignment/features/pom.xml4
-rwxr-xr-xresource-assignment/installer/pom.xml4
-rwxr-xr-xresource-assignment/pom.xml4
-rwxr-xr-xresource-assignment/provider/pom.xml17
6 files changed, 25 insertions, 30 deletions
diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
index a0fc97d0..afe0ca4a 100644
--- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml
+++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-resource-assignment</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
@@ -21,24 +21,6 @@
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${odl.mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>mdsal-model-artifacts</artifactId>
- <version>${odl.mdsal.model.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml
index 857bff8d..5438d59b 100755
--- a/resource-assignment/features/features-resource-assignment/pom.xml
+++ b/resource-assignment/features/features-resource-assignment/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>features-resource-assignment</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
index 1944715c..074f1eba 100755
--- a/resource-assignment/features/pom.xml
+++ b/resource-assignment/features/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment-features</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 23bb04fe..16c62d57 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment-installer</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index 8bacbfe7..35b5b880 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment</name>
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 5bdb9105..e5177995 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment-provider</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
@@ -21,6 +21,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>