summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-03-21 08:34:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-21 08:34:31 +0000
commit10414799b301d26fee6195ab0128fd3dde140b0a (patch)
tree23d4ac22ef92b5e2d3a59538b107f1132662bd7d
parent5d2f93c6fb594fb0197a082a4cf1ba6aea0ead02 (diff)
parent36ba4897bed80bcc0cbbd803ae590fdb58a2e995 (diff)
Merge changes Iff25510f,I599e74e7
* changes: Add default URLs for supported ONAP services Fix SECURITY ISSUES
-rw-r--r--deployment/zip/src/main/release/data/onap-beijing-profile.json8
-rw-r--r--framework/pom.xml6
-rw-r--r--profiles/http/pom.xml2
-rw-r--r--validate/sample-mock-generator/pom.xml2
4 files changed, 9 insertions, 9 deletions
diff --git a/deployment/zip/src/main/release/data/onap-beijing-profile.json b/deployment/zip/src/main/release/data/onap-beijing-profile.json
index 0c186e11..5cd58c4c 100644
--- a/deployment/zip/src/main/release/data/onap-beijing-profile.json
+++ b/deployment/zip/src/main/release/data/onap-beijing-profile.json
@@ -2,7 +2,7 @@
{
"product" : "onap-beijing",
"name" : "aai:host-url",
- "value" : ""
+ "value" : "https://192.168.17.35:30233"
},
{
"product" : "onap-beijing",
@@ -17,12 +17,12 @@
{
"product" : "onap-beijing",
"name" : "msb:host-url",
- "value" : ""
+ "value" : "http://192.168.17.35:30081"
},
{
"product" : "onap-beijing",
"name" : "sdc:host-url",
- "value" : ""
+ "value" : "http://192.168.17.35:30206"
},
{
"product" : "onap-beijing",
@@ -37,7 +37,7 @@
{
"product" : "onap-beijing",
"name" : "so:host-url",
- "value" : ""
+ "value" : "http://192.168.17.35:30223"
},
{
"product" : "onap-beijing",
diff --git a/framework/pom.xml b/framework/pom.xml
index 56c9681f..013948e9 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>3.2.9.RELEASE</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -82,12 +82,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.3</version>
+ <version>2.9.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.9.3</version>
+ <version>2.9.4</version>
</dependency>
</dependencies>
</project>
diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml
index 913c8cec..0edade95 100644
--- a/profiles/http/pom.xml
+++ b/profiles/http/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.9.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml
index d9cdc46e..104247ee 100644
--- a/validate/sample-mock-generator/pom.xml
+++ b/validate/sample-mock-generator/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.9.4</version>
</dependency>
</dependencies>