Merge "update pom and change aaf config"
diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
index a3aa565..b9a99e0 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
@@ -40,7 +40,7 @@
#db.connectionURL = jdbc:mariadb:failover://localhost:3306/ecomp_portal
#db.userName = XXXX
#db.password = XXXX
-db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_3_2_os
+db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_os
db.userName = root
db.password = root
# is the db.password property encrypted?
@@ -147,7 +147,7 @@
# External Access System Basic Auth Credentials & Rest endpoint(These credentials doesn't work as these are place holders for now)
ext_central_access_user_name = aaf_admin@people.osaaf.org
ext_central_access_password = CkmGguWw+Yn0yzqximmSExkOSJ7BdKvOTHFmTMg9Yvc=
-ext_central_access_url = https://aaf-service:31110/authz/
+ext_central_access_url = https://aaf-service:30247/authz/
ext_central_access_user_domain = @csp.onap.org
# External Central Auth system access
diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index 615e7fa..4c8a529 100644
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -10,6 +10,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipnode>false</skipnode>
<skipcopy>false</skipcopy>
+ <skipTests>false</skipTests>
<sonar.typescript.lcov.reportPaths>coverage/lcov.info</sonar.typescript.lcov.reportPaths>
<sonar.sources>src</sonar.sources>
<sonar.projectKey>portal-FE-os</sonar.projectKey>
@@ -106,7 +107,7 @@
<arguments>install</arguments>
</configuration>
</execution>
-
+
<execution>
<id>npm run test</id>
<goals>
@@ -117,6 +118,7 @@
<configuration>
<arguments>run-script test</arguments>
+ <skip>${skipTests}</skip>
</configuration>
</execution>