summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-10-25 10:16:08 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-25 10:16:08 +0000
commit9964a487590b2dc52fec730e1466224675189219 (patch)
tree969b26ef05b28a9419459ffed76588fb8b7413db
parent37932a1c374c90338fe39a08ef68e194dfe7c384 (diff)
parentd7cc2df5b0fa4032baa97e47ff5c5e8b6e27938a (diff)
Merge "update portal url"
-rw-r--r--pom.xml4
-rw-r--r--sdc-os-chef/environments/Template.json2
-rw-r--r--test-apis-ci/pom.xml8
-rw-r--r--ui-ci-dev/pom.xml15
4 files changed, 3 insertions, 26 deletions
diff --git a/pom.xml b/pom.xml
index d188dacca6..6a7d39d8f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,6 @@
<!-- Elastic Search mapper (reference the elastic search version actually). -->
<elastic-search.version>2.1.0</elastic-search.version>
- <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
- <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
<jetty.version>9.2.10.v20150310</jetty.version>
<!-- JSON and YAML Parsing -->
@@ -87,7 +85,7 @@
<extentreports.version>3.0.3</extentreports.version>
<!-- parser-->
- <sdc-tosca-parser.version>1.1.14-SNAPSHOT</sdc-tosca-parser.version>
+ <sdc-tosca-parser.version>1.1.34</sdc-tosca-parser.version>
<!--JaCoCO -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index a19f7cf9fd..1022a03285 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -17,7 +17,7 @@
"private": "eth1"
},
"ECompP": {
- "ecomp_rest_url": "http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi",
+ "ecomp_rest_url": "http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi",
"ueb_url_list": "10.0.11.1,10.0.11.1",
"app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
"app_key": "x9UfO7JsDn8BESVX",
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 875888facc..d9c080dd7a 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -281,16 +281,10 @@
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
- <!-- <dependency>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
- <artifactId>sdc-tosca-parser</artifactId>
- <version>${sdc-tosca-parser.version}</version>
- <scope>compile</scope>
- </dependency> -->
<dependency>
<groupId>org.openecomp.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.1.32-SNAPSHOT</version>
+ <version>${sdc-tosca-parser.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/ui-ci-dev/pom.xml b/ui-ci-dev/pom.xml
index f0ead6de8a..1d6afa9c01 100644
--- a/ui-ci-dev/pom.xml
+++ b/ui-ci-dev/pom.xml
@@ -252,21 +252,6 @@
</descriptorRefs>
</configuration>
</execution>
-
- <!---->
- <!--<execution>-->
- <!--<id>tarball</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>single</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<finalName>${project.artifactId}-${full.release.version}${build.type}</finalName>-->
- <!--<appendAssemblyId>false</appendAssemblyId>-->
- <!--<descriptor>${project.basedir}/tarball.xml</descriptor>-->
- <!--<attach>false</attach>-->
- <!--</configuration>-->
- <!--</execution>-->
</executions>
</plugin>