diff options
| author |   st398c <st398c@research.att.com> | 2019-06-14 14:36:53 -0400 |
|---|---|---|
| committer | st398c <st398c@research.att.com> | 2019-06-18 12:44:52 -0400 |
| commit | 7af2403dd9a6c95b12efec59e60d47125dc8e286 (patch) | |
| tree | e557a0e80412c15619f172b9ccefc25363fd1c83 /ecomp-sdk/epsdk-app-common | |
| parent | 0d5c6d9516afa7b28e64f7445785ecb539849876 (diff) | |
Blackduck scan fixes
Issue-ID: PORTAL-631
Change-Id: I1a09436f606831378b7f2a6211b1199ab830e06e
Signed-off-by: st398c <st398c@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-common')
3 files changed, 76 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_6_to_2_5_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_6_to_2_5_Common.sql new file mode 100644 index 00000000..e13e3efe --- /dev/null +++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_6_to_2_5_Common.sql @@ -0,0 +1,6 @@ +use ecomp_sdk; + +DELETE FROM fn_restricted_url +where RESTRICTED_URL in('report/wizard/add_formfield_tab_data/*','report/wizard/save_formfield_tab_data/*','report/wizard/retrieve_form_tab_wise_data/*/delete','report/wizard/list_child_report_col/*','report/wizard/list_child_report_ff/*','serviceModels','serviceModels','report/wizard/list_columns','report/wizard/list_formfields','report/wizard/retrieve_data/*','report/wizard/retrieve_col_tab_wise_data/*','welcome','report/security/addReportUser','report/security/addReportRole','report/security/*','report/wizard/get_report_log/*'); + +commit;
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_5_to_2_6_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_5_to_2_6_Common.sql new file mode 100644 index 00000000..5c806981 --- /dev/null +++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_5_to_2_6_Common.sql @@ -0,0 +1,22 @@ +use ecomp_sdk; + +SET FOREIGN_KEY_CHECKS=0; + +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'); + +commit;
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index 7125136e..1dba1420 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -176,7 +176,7 @@ <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> - <version>2.2.0</version> + <version>7.1.1</version> <exclusions> <exclusion> <groupId>org.apache.lucene</groupId> @@ -268,8 +268,54 @@ <groupId>org.beanshell</groupId> <artifactId>bsh-core</artifactId> </exclusion> + <exclusion> + <groupId>org.beanshell</groupId> + <artifactId>bsh-core</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j</artifactId> + <version>2.11.2</version> + <type>pom</type> + </dependency> + <!-- Jacoco for offline instrumentation --> <dependency> <groupId>org.jacoco</groupId> @@ -280,7 +326,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.4.10</version> + <version>1.4.11.1</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> |