diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-15 18:25:23 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-18 11:45:07 -0400 |
| commit | be72a3cd156210d0e3f8fe3a0cd16993b32c248f (patch) | |
| tree | 1b17d3d60fbd9e4f6761259b199afc153e79fbd2 /resource-assignment | |
| parent | 1408dcc8b6ee6dd9e7fd2bfa4b0a28654816905e (diff) | |
Update sli/adaptors to ODL Oxygen
Update sli/adaptors to compile against ODL Oxygen parent poms.
Change-Id: I112c5aa56dd985ad0e7e361d3839ec7069e5641c
Issue-ID: CCSDK-281
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'resource-assignment')
| -rw-r--r-- | resource-assignment/features/ccsdk-resource-assignment/pom.xml | 53 | ||||
| -rwxr-xr-x | resource-assignment/provider/pom.xml | 9 |
2 files changed, 19 insertions, 43 deletions
diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml index fdbbf6a8..509620f3 100644 --- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -16,14 +16,25 @@ <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> - + <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> - <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> @@ -46,32 +57,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${mariadb.connector.version}</version> - <type>jar</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <scope>provided</scope> - </dependency> + </dependencies> </project> diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index 4a29b54d..5f6e54f9 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -26,43 +26,36 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>${spring.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>${h2database.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${sdnctl.sli.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${sdnctl.sli.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> - <version>${sdnctl.dblib.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> </dependency> <dependency> @@ -75,12 +68,10 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> |