diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-18 10:49:42 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-18 10:49:42 -0400 |
| commit | a63bbe21b7394951d782b6f8f0769dfcbc616dd0 (patch) | |
| tree | e956fc46967a15bdae83c3143cfde20348d8c145 | |
| parent | 68b56b1f8c79daa114c59cee29a4de98c4b10685 (diff) | |
Update sli/northbound to ODL Oxygen
Updated features poms to get clean compile with ODL Oxygen-based parent
poms.
Change-Id: I812ad71ff07117baf62b6111011ce52229ebe6e0
Issue-ID: CCSDK-282
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
| -rw-r--r-- | asdcApi/features/ccsdk-asdcApi/pom.xml | 27 | ||||
| -rwxr-xr-x | asdcApi/provider/pom.xml | 6 | ||||
| -rw-r--r-- | dataChange/features/ccsdk-dataChange/pom.xml | 27 | ||||
| -rwxr-xr-x | dataChange/provider/pom.xml | 6 | ||||
| -rw-r--r-- | lcm/features/ccsdk-lcm/pom.xml | 27 |
5 files changed, 62 insertions, 31 deletions
diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml index c4c7b7fad..d26c9485a 100644 --- a/asdcApi/features/ccsdk-asdcApi/pom.xml +++ b/asdcApi/features/ccsdk-asdcApi/pom.xml @@ -16,16 +16,29 @@ <packaging>feature</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> - + + <dependencyManagement> + <dependencies> + <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> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>mdsal-artifacts</artifactId> + <version>${odl.mdsal.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> <version>${ccsdk.sli.core.version}</version> diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml index d52c702ba..1098160b6 100755 --- a/asdcApi/provider/pom.xml +++ b/asdcApi/provider/pom.xml @@ -53,11 +53,7 @@ <artifactId>sal-test-model</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-connector</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml index bbe3e417d..9ed0ac73c 100644 --- a/dataChange/features/ccsdk-dataChange/pom.xml +++ b/dataChange/features/ccsdk-dataChange/pom.xml @@ -17,14 +17,27 @@ <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> - + <dependencyManagement> + <dependencies> + <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> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>mdsal-artifacts</artifactId> + <version>${odl.mdsal.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml index 59d58ac43..29a832449 100755 --- a/dataChange/provider/pom.xml +++ b/dataChange/provider/pom.xml @@ -46,11 +46,7 @@ <artifactId>sal-test-model</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-connector</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml index 9a0e0806a..5ea28878b 100644 --- a/lcm/features/ccsdk-lcm/pom.xml +++ b/lcm/features/ccsdk-lcm/pom.xml @@ -17,14 +17,27 @@ <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> - + <dependencyManagement> + <dependencies> + <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> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>mdsal-artifacts</artifactId> + <version>${odl.mdsal.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> |