diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-07-28 11:29:23 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-08-02 15:43:44 +0000 |
| commit | 38713207b817ed4700f630748c681116338d32f0 (patch) | |
| tree | 9eb2097cee8d85ac14f17e3a280ae8aefb69d9de /appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml | |
| parent | 771ac55e29d099d8bbf783612de975047d75ab12 (diff) | |
Merging in bug fixes
Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-100
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 | 24 |
1 files changed, 13 insertions, 11 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 0fddd2bfa..0cb1c1d96 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 @@ -13,6 +13,11 @@ <name>chef Adapter - bundle</name> <dependencies> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20160810</version> + </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -35,8 +40,6 @@ <version>4.4.4</version> </dependency> - <!--<dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.1</version> </dependency> --> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> @@ -51,14 +54,6 @@ <groupId>org.openecomp.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> - <!-- <classifier>jar-with-dependencies</classifier> --> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.openecomp.appc</groupId> - <artifactId>appc-common</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>javax</groupId> @@ -78,6 +73,13 @@ <artifactId>jackson-jaxrs</artifactId> <version>1.9.12</version> </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.1</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -158,7 +160,7 @@ <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> |