diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-15 16:13:55 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-15 16:13:55 -0400 |
| commit | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (patch) | |
| tree | 2a507f625b889293f11ab01e642104a34b6bbb3a /dblib/features | |
| parent | 1a71779b7b1104ba6d5e289e6dc839bb4b9493d5 (diff) | |
Update sli/core to ODL Oxygen
Update sli/core artifacts to compile cleanly against ODL Oxygen
version of CCSDK parent poms.
Change-Id: I9f3b4c40b1ae62cdda1c35836466f8faf7da3b39
Issue-ID: CCSDK-280
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'dblib/features')
| -rw-r--r-- | dblib/features/ccsdk-dblib/pom.xml | 33 | ||||
| -rw-r--r-- | dblib/features/ccsdk-dblib/src/main/feature/feature.xml | 9 |
2 files changed, 6 insertions, 36 deletions
diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml index 3a2f7a1b..5d05f84b 100644 --- a/dblib/features/ccsdk-dblib/pom.xml +++ b/dblib/features/ccsdk-dblib/pom.xml @@ -17,31 +17,8 @@ <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>0.11.1</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <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.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -64,16 +41,10 @@ <artifactId>utils-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> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.11.1.1</version> </dependency> </dependencies> diff --git a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml b/dblib/features/ccsdk-dblib/src/main/feature/feature.xml index 514ce8de..771c3745 100644 --- a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml +++ b/dblib/features/ccsdk-dblib/src/main/feature/feature.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-dblib"> - <repository>mvn:org.opendaylight.controller/odl-mdsal-broker/1.6.1/xml/features</repository> + <feature name="ccsdk-dblib" description="ccsdk-sli-core :: dblib :: ccsdk-dblib" version="${project.version}"> <details>Root POM to be used in place of odlparent for CCSDK based projects</details> - <feature version="1.6.1" prerequisite="false" dependency="false">odl-mdsal-broker</feature> <feature prerequisite="true" dependency="false">wrap</feature> <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle> - <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/2.1.1</bundle> - <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/8.5.14/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> - <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/8.5.14/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> + <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle> + <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> + <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle> </feature> </features> |