diff options
| author |   Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-04-30 11:06:36 +0200 |
|---|---|---|
| committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-04-30 11:06:36 +0200 |
| commit | e20974c5cb1d7696d9f4714a66d18b86c892ee2b (patch) | |
| tree | 8f45dc141bcabe04970aad85d1fa48c37ad4fce9 | |
| parent | c15a09c4491131bf1da76297befd08df54caa291 (diff) | |
Fix issues with inserting dashboard user into database1.4.3
Issue-ID: DCAEGEN2-2751
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I60039fddf5493464b49f6a97d0fde4b4d8939773
| -rw-r--r-- | ccsdk-app-common/pom.xml | 4 | ||||
| -rw-r--r-- | ccsdk-app-os/create_table.sql | 5 | ||||
| -rw-r--r-- | ccsdk-app-os/pom.xml | 4 | ||||
| -rw-r--r-- | ccsdk-app-overlay/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml index 255f29c..a231d2e 100644 --- a/ccsdk-app-common/pom.xml +++ b/ccsdk-app-common/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-parent</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-common</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> <packaging>jar</packaging> <name>DCAE Dashboard common</name> <description>CCSDK Dashboard common Java code</description> diff --git a/ccsdk-app-os/create_table.sql b/ccsdk-app-os/create_table.sql index d8d3356..f7ae3ed 100644 --- a/ccsdk-app-os/create_table.sql +++ b/ccsdk-app-os/create_table.sql @@ -1,5 +1,6 @@ -- ================================================================================ -- Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. +-- Copyright (c) 2021 Nokia Intellectual Property. All rights reserved. -- ================================================================================ -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. @@ -1011,7 +1012,7 @@ Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values Insert into dashboard_pg_db_common.fn_user (USER_ID,ORG_ID,MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values - (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@om.ops.com',null,null,null,'su1234',null,'su1234','fusion',to_date('21-AUG-14','%d-%M-%Y'),'Y',null,to_date('15-DEC-05','%d-%M-%Y'),1,to_date('21-AUG-14','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null) + (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@om.ops.com',null,null,null,'su1234',null,'su1234','fusion',to_date('21-AUG-14','dd-MON-YY'),'Y',null,to_date('15-DEC-05','dd-MON-YY'),1,to_date('21-AUG-14','dd-MON-YY'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null) ; -- fn_app @@ -1147,4 +1148,4 @@ Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_api'); INSERT INTO dashboard_pg_db_common.fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) - VALUES (30015,'Cloudify Plugins', 30011, 50,'ecd#/iplug', 'menu_inventory', 'Y','N/A','N/A','N/A','N/A','APP','N',NULL);
\ No newline at end of file + VALUES (30015,'Cloudify Plugins', 30011, 50,'ecd#/iplug', 'menu_inventory', 'Y','N/A','N/A','N/A','N/A','APP','N',NULL); diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml index a995d09..07edcfb 100644 --- a/ccsdk-app-os/pom.xml +++ b/ccsdk-app-os/pom.xml @@ -7,12 +7,12 @@ <parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-parent</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-os</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> <packaging>war</packaging> <name>DCAE Dashboard</name> <description>CCSDK Dashboard Web Application for external release</description> diff --git a/ccsdk-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml index ce662cc..5b34f0e 100644 --- a/ccsdk-app-overlay/pom.xml +++ b/ccsdk-app-overlay/pom.xml @@ -7,12 +7,12 @@ <parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-parent</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-overlay</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> <packaging>war</packaging> <name>DCAE Dashboard overlay</name> <description>CCSDK Dashboard web resources</description> @@ -14,7 +14,7 @@ <!-- Maven parent project for convenience of building and cleaning --> <groupId>org.onap.ccsdk.dashboard</groupId> <artifactId>ccsdk-app-parent</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>1.4.3-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-dashboard</name> diff --git a/version.properties b/version.properties index 77e67b1..44e6ad0 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=4 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} |