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 /sli/features | |
parent | d2a764b04824233f2068460c3806016abf692b31 (diff) | |
parent | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (diff) |
Merge "Update sli/core to ODL Oxygen"
Diffstat (limited to 'sli/features')
-rw-r--r-- | sli/features/odl-sli/pom.xml | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml index 4d014366..f108726d 100644 --- a/sli/features/odl-sli/pom.xml +++ b/sli/features/odl-sli/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -19,19 +21,20 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>0.11.1</version> + <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.controller</groupId> - <artifactId>mdsal-artifacts</artifactId> - <version>1.6.1</version> + <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> @@ -73,17 +76,7 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>${equinox.osgi.version}</version> - <scope>provided</scope> - </dependency> + + </dependencies> </project> |