diff options
| author |   Lorraine Welch <lb2391@att.com> | 2020-08-07 13:46:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-07 13:46:07 +0000 |
| commit | 90a8e912331f206097f1625afdec8281fd141b1f (patch) | |
| tree | 6d77980b85ef5cc1832a0cfba6579875ce85df53 | |
| parent | dd2c6fd1355f93857dc7b5ab23776a1d6543f006 (diff) | |
| parent | 69943c58e25ad590e47fa2e6a1ceefee425127f9 (diff) | |
Merge "update pom and change aaf config"
| -rw-r--r-- | ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties | 4 | ||||
| -rw-r--r-- | portal-FE-os/pom.xml | 4 |
2 files changed, 5 insertions, 3 deletions
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 a3aa565f..b9a99e06 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.driver = org.mariadb.jdbc.Driver #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_system_notification_url= https://jira.onap.org/browse/ # 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 615e7fa9..4c8a529b 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> |