summaryrefslogtreecommitdiffstats
path: root/appc-config
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 /appc-config
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>
Diffstat (limited to 'appc-config')
-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
3 files changed, 3 insertions, 3 deletions
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>