diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-06-01 10:45:37 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-06-02 13:05:15 -0700 |
| commit | c7d0075d223eab9f89fd28853c4b138792059be9 (patch) | |
| tree | 40aa3e41e598ea7a59bcf6899a2004c1abab11c2 /appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml | |
| parent | 8aac2df744820304ee29354333661699e9695939 (diff) | |
Merge of new rebased code
Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>
Diffstat (limited to 'appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml')
| -rw-r--r-- | appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 1ef168a24..2ccf432f5 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -12,6 +12,11 @@ <name>chef Adapter - bundle</name> <dependencies> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20160810</version> + </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -29,33 +34,33 @@ <version>4.4.4</version> </dependency> - <dependency> + <!-- <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.5.1</version> - </dependency> + </dependency> --> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.47</version> + <version>1.55</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.47</version> + <version>1.55</version> </dependency> <dependency> <groupId>org.openecomp.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> - <classifier>jar-with-dependencies</classifier> - <scope>compile</scope> +<!-- <classifier>jar-with-dependencies</classifier> --> + <scope>test</scope> </dependency> <dependency> <groupId>org.openecomp.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> - <scope>test</scope> + </dependency> <dependency> <groupId>javax</groupId> @@ -216,11 +221,11 @@ <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator> <Export-Package>org.openecomp.appc.adapter.chef</Export-Package> <Import-Package>org.openecomp.sdnc.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|mysql-connector-java|xml-apis</Embed-Dependency> + <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> - <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> + <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> </configuration> </plugin> </plugins> |