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 /sliPluginUtils | |
| parent | d2a764b04824233f2068460c3806016abf692b31 (diff) | |
| parent | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (diff) | |
Merge "Update sli/core to ODL Oxygen"
Diffstat (limited to 'sliPluginUtils')
| -rw-r--r-- | sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml | 17 | ||||
| -rwxr-xr-x | sliPluginUtils/provider/pom.xml | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml index 3737f9e7..78f5f1e1 100644 --- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml +++ b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml @@ -21,26 +21,20 @@ <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> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -55,11 +49,6 @@ <artifactId>sliPluginUtils-provider</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>${equinox.osgi.version}</version> - <scope>provided</scope> - </dependency> + </dependencies> </project> diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index ae750636..411c1453 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -33,10 +33,7 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> |