diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-07-30 14:35:31 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-08-13 10:54:14 -0700 |
| commit | 7f383f98c874d5918fa6e55597f30432b13a658d (patch) | |
| tree | ea30979921816f4c43efb1e2ad2fddc79bbb84a0 /appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle | |
| parent | 9d7412db1c2cfb9c05a8d381dc7c71829291d81b (diff) | |
Karaf 4 for first few features
appc-metric
appc-dmaap-adapter
appc-chef-adapter
appc-netconf-adapter
appc-rest-adapter
Change-Id: I1d5a8e39cac7be74b05a0782f0971f8d08c8162d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1029
Diffstat (limited to 'appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle')
| -rw-r--r-- | appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index 3cdbd88f6..c55ec33c6 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -22,11 +22,13 @@ <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> - <groupId>org.onap.appc</groupId> - <artifactId>appc-rest-adapter</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>binding-parent</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.appc</groupId> <artifactId>appc-rest-adapter-bundle</artifactId> <packaging>bundle</packaging> <name>rest Adapter - bundle</name> @@ -52,16 +54,9 @@ </dependency> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> + <artifactId>appc-common-bundle</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> - <version>${project.version}</version> - <classifier>jar-with-dependencies</classifier> - <scope>test</scope> - </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-api</artifactId> @@ -78,12 +73,14 @@ <groupId>com.att.cdp</groupId> <artifactId>cdp-pal-common</artifactId> <scope>compile</scope> + <version>${cdp.pal.version}</version> </dependency> <dependency> <groupId>com.att.cdp</groupId> <artifactId>cdp-pal-openstack</artifactId> <scope>compile</scope> + <version>${cdp.pal.version}</version> </dependency> <dependency> @@ -126,11 +123,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>1.9.13</version> - </dependency> <dependency> <groupId>commons-codec</groupId> @@ -187,6 +179,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.client.version}</version> </dependency> <dependency> @@ -216,8 +209,7 @@ <Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName> <Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator> <Export-Package>org.onap.appc.adapter.rest</Export-Package> - <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package> - <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency> + <Import-Package>*</Import-Package> <Embed-Transitive>true</Embed-Transitive> </instructions> </configuration> |