diff options
| author |   Patrick Brady <patrick.brady@att.com> | 2019-01-03 11:21:43 -0800 |
|---|---|---|
| committer | Patrick Brady <patrick.brady@att.com> | 2019-01-07 16:49:36 +0000 |
| commit | 50472bf49f725bf6c4ea659ca7e387a2c6436ff2 (patch) | |
| tree | 6c73b1ec9b4bd4aa227a264643b3bf17e20db1e3 /appc-adapters/appc-rest-adapter | |
| parent | d7175fbbaa1b750b3d025770631d96edd3531b5f (diff) | |
Fixes feature install on latest ccsdk
Updated rest adapter to resolve dependencies the same way that other
appc features do. This fixed the karaf crash during install.
Added necessary dependencies as embedded or karaf bundles to other
appc features, as needed.
Change-Id: Id04d08cd09c2ff0cae0db8ecbc61405da10882d7
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1304
Diffstat (limited to 'appc-adapters/appc-rest-adapter')
| -rw-r--r-- | appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml | 3 | ||||
| -rw-r--r-- | appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml | 52 |
2 files changed, 3 insertions, 52 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 317823d54..f513c96be 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 @@ -213,7 +213,8 @@ <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>*</Import-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> <Embed-Transitive>true</Embed-Transitive> </instructions> </configuration> diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml index 3b4647cae..8210316f6 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml @@ -61,56 +61,6 @@ limitations under the License. <artifactId>appc-rest-adapter-bundle</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.glassfish.jersey.bundles.repackaged</groupId> - <artifactId>jersey-guava</artifactId> - <version>2.25.1</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-base</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <version>2.25.1</version> - </dependency> - <dependency> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - <version>1.9.39</version> - </dependency> - <dependency> - <groupId>org.glassfish.grizzly</groupId> - <artifactId>grizzly-http-servlet</artifactId> - <version>2.3.28</version> - </dependency> - <dependency> - <groupId>org.glassfish.grizzly</groupId> - <artifactId>grizzly-http</artifactId> - <version>2.3.28</version> - </dependency> </dependencies> @@ -121,7 +71,7 @@ limitations under the License. <artifactId>karaf-maven-plugin</artifactId> <extensions>true</extensions> <configuration> - <includeTransitiveDependency>true</includeTransitiveDependency> + <includeTransitiveDependency>false</includeTransitiveDependency> <excludedArtifactIds> <excludedArtifactId>slf4j-api</excludedArtifactId> <excludedArtifactId>tomcat-jdbc</excludedArtifactId> |