Policy

From: Michael Mokry Date: Thu, 29 Aug 2019 19:20:19 +0000 (-0500) Subject: Additional Changes for Portal SDK 2.6.0 upgrade X-Git-Tag: 1.5.2~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=dde7c80b605c459569bf32838983c5e4c163521a Additional Changes for Portal SDK 2.6.0 upgrade - Modified policyEditor.html to upgrade the angular version to 1.4.13 which is compatible with 2.6.0 SDK - Created new sql script file for Portal db table upgrades in 2.5.0 and 2.6.0 - Modified top level pom to upgrade springframework version to 4.3.24 Change-Id: I5f6e719a2f57891a1b2b76312f446211b6b60abd Issue-ID: POLICY-1539 Signed-off-by: Michael Mokry --- diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html index 6efb8b637..b93bc338e 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,272 +20,272 @@ - - Policy + + Policy - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- - + + + +

+ +

+ + diff --git a/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql new file mode 100644 index 000000000..6fefe6bf0 --- /dev/null +++ b/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql @@ -0,0 +1,42 @@ +-- ============LICENSE_START======================================================= +-- ONAP Policy Engine +-- ================================================================================ +-- Copyright (C) 2019 AT&T 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. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- ============LICENSE_END========================================================= +use onap_sdk; + +SET FOREIGN_KEY_CHECKS=0; + +-- Changes for epsdk 2.5.0 version +update fn_menu set action = 'welcome' where action = 'welcome.htm'; + +-- Changes for epsdk 2.6.0 version upgrade +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/add_formfield_tab_data/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/save_formfield_tab_data/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/retrieve_form_tab_wise_data/*/delete','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/list_child_report_col/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/list_child_report_ff/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('serviceModels','serviceModels '); +INSERT INTO fn_restricted_url VALUES('serviceModels','menu_admin'); +INSERT INTO fn_restricted_url VALUES('report/wizard/list_columns','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/list_formfields','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/retrieve_data/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/retrieve_col_tab_wise_data/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('welcome','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/addReportUser','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/addReportRole','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/get_report_log/*','menu_reports'); + diff --git a/pom.xml b/pom.xml index 7957b0f63..ad839abc3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ reuseReports - 4.3.18.RELEASE + 4.3.24.RELEASE 9.2.3.v20140905 2.9.4 1.3.3