summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2020-01-31 16:49:59 -0500
committerPatrick Brady <patrick.brady@att.com>2020-02-06 23:09:13 +0000
commit7b7befa39b7b70b4b18b1f1a561398b8bede6224 (patch)
treeb4c0877d43973cd47a3bd67f51c82cf5bf195a49
parente4c07d4c7eb3105bc6a20eee00fdca592f0cf59b (diff)
build with ONAP-ODL dist
ODL provides ONAP distribution for Neon SR1 Issue-ID: APPC-1731 Change-Id: I21b26f4ddf6ac9940e7162b9e1fa081e4b25c269 Signed-off-by: Taka Cho <takamune.cho@att.com>
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml1
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml1
-rw-r--r--appc-config/appc-config-params/features/src/main/resources/features.xml2
-rw-r--r--appc-config/appc-config-params/provider/pom.xml2
-rw-r--r--appc-config/pom.xml2
-rw-r--r--appc-core/appc-common-bundle/pom.xml9
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml2
-rw-r--r--appc-directed-graph/pom.xml2
-rwxr-xr-xappc-inbound/pom.xml1
-rw-r--r--appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml1
-rwxr-xr-xappc-outbound/appc-network-inventory-client/pom.xml1
-rwxr-xr-xappc-outbound/appc-network-inventory-client/provider/pom.xml5
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/pom.xml2
13 files changed, 19 insertions, 12 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml
index 4bf27b9bc..292bcfdd9 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml
@@ -46,7 +46,6 @@ limitations under the License.
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.60</version>
</dependency>
</dependencies>
</project>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml
index 60165a43f..465f4eaeb 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml
@@ -63,7 +63,6 @@ limitations under the License.
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.60</version>
</dependency>
</dependencies>
diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml
index 083fb5cf4..6a2fec796 100644
--- a/appc-config/appc-config-params/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-params/features/src/main/resources/features.xml
@@ -40,7 +40,7 @@
<!-- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> -->
<bundle>wrap:mvn:org.onap.sdc.common/onap-tosca-datatype/${tosca.datatype.version}</bundle>
- <bundle>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
+ <bundle>mvn:org.yaml/snakeyaml/1.15</bundle>
</feature>
</features>
diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml
index 69318eb5c..81db4ecd1 100644
--- a/appc-config/appc-config-params/provider/pom.xml
+++ b/appc-config/appc-config-params/provider/pom.xml
@@ -120,7 +120,7 @@
org.onap.sdnc.config.params.parser,org.onap.sdnc.config.params.transformer,
org.onap.sdnc.config.params.transformer.tosca,org.onap.sdnc.config.params.transformer.tosca.exceptions</Export-Package>
<Import-Package>groovy.lang;resolution:=optional,org.codehaus.groovy.*;resolution:=optional,!com.google.common.collect,*</Import-Package>
- <Embed-Dependency>guava,jackson-databind,jackson-core,jackson-dataformat-yaml,eelf-core,logback-core,logback-classic</Embed-Dependency>
+ <Embed-Dependency>snakeyaml,guava,jackson-databind,jackson-core,jackson-dataformat-yaml,eelf-core,logback-core,logback-classic</Embed-Dependency>
</instructions>
</configuration>
</plugin>
diff --git a/appc-config/pom.xml b/appc-config/pom.xml
index bcad4b765..8c64051a2 100644
--- a/appc-config/pom.xml
+++ b/appc-config/pom.xml
@@ -35,7 +35,7 @@
<properties>
<jackson.version>2.3.2</jackson.version>
- <snakeyaml.version>1.12</snakeyaml.version>
+ <snakeyaml.version>1.15</snakeyaml.version>
<velocity.version>1.7</velocity.version>
<jettison.version>1.3.7</jettison.version>
<common.collections.version>3.2.2</common.collections.version>
diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml
index e3670f731..8651b9b1a 100644
--- a/appc-core/appc-common-bundle/pom.xml
+++ b/appc-core/appc-common-bundle/pom.xml
@@ -31,6 +31,15 @@
<packaging>bundle</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
index 51380fcf6..c0256be64 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
@@ -38,7 +38,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson-yaml-version>2.8.6</jackson-yaml-version>
- <snakeyaml.version>1.15</snakeyaml.version>
</properties>
<dependencies>
@@ -75,7 +74,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml
index 2f0db35ac..542fb9482 100644
--- a/appc-directed-graph/pom.xml
+++ b/appc-directed-graph/pom.xml
@@ -37,7 +37,7 @@
<properties>
<jackson.version>2.3.2</jackson.version>
- <snakeyaml.version>1.12</snakeyaml.version>
+ <snakeyaml.version>1.15</snakeyaml.version>
<velocity.version>1.7</velocity.version>
<jettison.version>1.3.7</jettison.version>
<commons.collections.version>3.2.2</commons.collections.version>
diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml
index 4bed62fa0..b8d063236 100755
--- a/appc-inbound/pom.xml
+++ b/appc-inbound/pom.xml
@@ -33,7 +33,6 @@
<properties>
<jackson.version>2.3.2</jackson.version>
- <snakeyaml.version>1.12</snakeyaml.version>
<velocity.version>1.7</velocity.version>
<jettison.version>1.3.7</jettison.version>
<commons.collections.version>3.2.2</commons.collections.version>
diff --git a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
index 0effc0d4c..75f94e53f 100644
--- a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
+++ b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml
@@ -39,6 +39,7 @@
<bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
<bundle>mvn:com.sun.jersey/jersey-client/1.17</bundle>
+ <bundle>mvn:org.yaml/snakeyaml/1.25</bundle>
<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml
index c5f98f617..e7ea3a16c 100755
--- a/appc-outbound/appc-network-inventory-client/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/pom.xml
@@ -41,7 +41,6 @@
<jettison.version>1.3.7</jettison.version>
<velocity.version>1.7</velocity.version>
<jackson.version>2.3.2</jackson.version>
- <snakeyaml.version>1.12</snakeyaml.version>
</properties>
diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index d65cf4b0d..18aee6863 100755
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -66,6 +66,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 5cde920b2..1253ffa30 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -34,7 +34,6 @@ limitations under the License.
<properties>
<jackson-yaml-version>2.8.6</jackson-yaml-version>
- <snakeyaml.version>1.15</snakeyaml.version>
</properties>
<artifactId>appc-sdc-listener-bundle</artifactId>
@@ -94,7 +93,6 @@ limitations under the License.
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
<dependency>