update portal url

Change-Id: I4245b0bdb21ac39a7cddc0d4abe830a862d0a061
Issue-Id: SDC-531
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/pom.xml b/pom.xml
index ab511df..52f876d 100644 (file)
--- 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 a19f7cf..1022a03 100644 (file)
--- 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 b725073..59dfba0 100644 (file)
--- 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 f0ead6d..1d6afa9 100644 (file)
--- 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>