diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-06-18 17:56:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-18 17:56:02 +0000 |
| commit | a2af7369129998533139d57f0f1a0757c7e13a10 (patch) | |
| tree | 6f0ecea6b5cebf987d195f5a066d13eac909f743 /sliapi | |
| parent | d2a764b04824233f2068460c3806016abf692b31 (diff) | |
| parent | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (diff) | |
Merge "Update sli/core to ODL Oxygen"
Diffstat (limited to 'sliapi')
| -rw-r--r-- | sliapi/features/ccsdk-sliapi/pom.xml | 21 | ||||
| -rwxr-xr-x | sliapi/provider/pom.xml | 18 |
2 files changed, 14 insertions, 25 deletions
diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/sliapi/features/ccsdk-sliapi/pom.xml index f868f345..f4f63948 100644 --- a/sliapi/features/ccsdk-sliapi/pom.xml +++ b/sliapi/features/ccsdk-sliapi/pom.xml @@ -16,31 +16,26 @@ <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> + <dependencyManagement> + <dependencies> + <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>mdsal-model-artifacts</artifactId> - <version>0.11.1</version> + <version>${odl.mdsal.model.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>1.6.1</version> + <version>${odl.mdsal.version}</version> <type>pom</type> <scope>import</scope> </dependency> - </dependencies> - </dependencyManagement> + </dependencies> + </dependencyManagement> + <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 3be16f42..994557a5 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -17,17 +17,7 @@ <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>mdsal-artifacts</artifactId> - <version>1.6.1</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependencies> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -39,16 +29,19 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-config</artifactId> + <version>${odl.mdsal.version}</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-api</artifactId> + <version>${odl.mdsal.version}</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> + <version>${odl.mdsal.version}</version> </dependency> @@ -65,10 +58,12 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-api</artifactId> + <version>${odl.mdsal.version}</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> + <version>2.0.3</version> </dependency> <dependency> @@ -87,7 +82,6 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.11.1.1</version> <scope>test</scope> </dependency> </dependencies> |