diff --git a/complete/completion_oaf.sh b/complete/completion_oaf.sh index 7640db488..0c98c1373 100644 --- a/complete/completion_oaf.sh +++ b/complete/completion_oaf.sh @@ -24,7 +24,7 @@ F__helpscript=1 if [ $# -gt 0 ]; then FFOUND=0 for arg in "$@"; do - if [ "$arg" = "${!#}" ]; then FFOUND=1; break; fi + if [ "$arg" = "" ]; then FFOUND=1; break; fi # -e single option if [ "$arg" = "-e" ]; then FFOUND=1; F__e=0; fi # -c single option diff --git a/complete/completion_oafp.sh b/complete/completion_oafp.sh index 40e2ee6f1..b23c52842 100644 --- a/complete/completion_oafp.sh +++ b/complete/completion_oafp.sh @@ -352,153 +352,153 @@ F_val2icon_=1 if [ $# -gt 0 ]; then FFOUND=0 for arg in "$@"; do - if [ "$arg" = "${!#}" ]; then FFOUND=1; break; fi + if [ "$arg" = "" ]; then FFOUND=1; break; fi # in= options if [ "$arg" = "in=ask" ]; then FFOUND=1; F_in__in_ask=1; F_in_=0; fi if [ "$arg" = "in=base64" ]; then FFOUND=1; F_in__in_base64=1; F_in_=0; fi if [ "$arg" = "in=ch" ]; then FFOUND=1; F_in__in_ch=1; F_in_=0; fi - if [ "${arg#inch}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inch=0; fi - if [ "${arg#inchall}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inchall=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inch=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inchall=0; fi if [ "$arg" = "in=csv" ]; then FFOUND=1; F_in__in_csv=1; F_in_=0; fi - if [ "${arg#incsv=}" != "$arg" ]; then FFOUND=1; F_in__in_csv_incsv_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_csv_incsv_=0; fi if [ "$arg" = "in=dsv" ]; then FFOUND=1; F_in__in_dsv=1; F_in_=0; fi - if [ "${arg#indsvsep=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsep_=0; fi - if [ "${arg#indsvsepre=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsepre_=0; fi - if [ "${arg#indsvquote=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvquote_=0; fi - if [ "${arg#indsvescape=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvescape_=0; fi - if [ "${arg#indsvcomment=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvcomment_=0; fi - if [ "${arg#indsvheader=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvheader_=0; fi - if [ "${arg#indsvtrim=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvtrim_=0; fi - if [ "${arg#indsvjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvjoin_=0; fi - if [ "${arg#indsvfields=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvfields_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsep_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsepre_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvquote_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvescape_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvcomment_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvheader_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvtrim_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvfields_=0; fi if [ "$arg" = "in=db" ]; then FFOUND=1; F_in__in_db=1; F_in_=0; fi - if [ "${arg#indbjdbc=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbjdbc_=0; fi - if [ "${arg#indbuser=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbuser_=0; fi - if [ "${arg#indbpass=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbpass_=0; fi - if [ "${arg#indbtimeout=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbtimeout_=0; fi - if [ "${arg#indblib=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indblib_=0; fi - if [ "${arg#indbstream=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbstream_=0; fi - if [ "${arg#indbexec=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbexec_=0; fi - if [ "${arg#indbautocommit=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbautocommit_=0; fi - if [ "${arg#indbdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbdesc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbjdbc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbuser_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbpass_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbtimeout_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indblib_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbstream_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbexec_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbautocommit_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbdesc_=0; fi if [ "$arg" = "in=gb64json" ]; then FFOUND=1; F_in__in_gb64json=1; F_in_=0; fi if [ "$arg" = "in=hsperf" ]; then FFOUND=1; F_in__in_hsperf=1; F_in_=0; fi if [ "$arg" = "in=ini" ]; then FFOUND=1; F_in__in_ini=1; F_in_=0; fi if [ "$arg" = "in=javas" ]; then FFOUND=1; F_in__in_javas=1; F_in_=0; fi - if [ "${arg#javasinception=}" != "$arg" ]; then FFOUND=1; F_in__in_javas_javasinception_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javas_javasinception_=0; fi if [ "$arg" = "in=javagc" ]; then FFOUND=1; F_in__in_javagc=1; F_in_=0; fi - if [ "${arg#javagcjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_javagc_javagcjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javagc_javagcjoin_=0; fi if [ "$arg" = "in=javathread" ]; then FFOUND=1; F_in__in_javathread=1; F_in_=0; fi - if [ "${arg#javathreadpid=}" != "$arg" ]; then FFOUND=1; F_in__in_javathread_javathreadpid_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javathread_javathreadpid_=0; fi if [ "$arg" = "in=jfr" ]; then FFOUND=1; F_in__in_jfr=1; F_in_=0; fi - if [ "${arg#jfrjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrjoin_=0; fi - if [ "${arg#jfrdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrdesc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrdesc_=0; fi if [ "$arg" = "in=jmx" ]; then FFOUND=1; F_in__in_jmx=1; F_in_=0; fi - if [ "${arg#jmxpid=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpid_=0; fi - if [ "${arg#jmxurl=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxurl_=0; fi - if [ "${arg#jmxuser=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxuser_=0; fi - if [ "${arg#jmxpass=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpass_=0; fi - if [ "${arg#jmxprovider=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxprovider_=0; fi - if [ "${arg#jmxop=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxop_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpid_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxurl_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxuser_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpass_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxprovider_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxop_=0; fi if [ "$arg" = "in=json" ]; then FFOUND=1; F_in__in_json=1; F_in_=0; fi - if [ "${arg#jsondesc=}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsondesc_=0; fi - if [ "${arg#jsonprefix=}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsonprefix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsondesc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsonprefix_=0; fi if [ "$arg" = "in=jsonschema" ]; then FFOUND=1; F_in__in_jsonschema=1; F_in_=0; fi if [ "$arg" = "in=jwt" ]; then FFOUND=1; F_in__in_jwt=1; F_in_=0; fi - if [ "${arg#injwtverify=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtverify_=0; fi - if [ "${arg#injwtsecret=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtsecret_=0; fi - if [ "${arg#injwtpubkey=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtpubkey_=0; fi - if [ "${arg#injwtalg=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtalg_=0; fi - if [ "${arg#injwtraw=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtraw_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtverify_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtsecret_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtpubkey_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtalg_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtraw_=0; fi if [ "$arg" = "in=lines" ]; then FFOUND=1; F_in__in_lines=1; F_in_=0; fi - if [ "${arg#linesjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesjoin_=0; fi - if [ "${arg#linesvisual=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisual_=0; fi - if [ "${arg#linesvisualsepre=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualsepre_=0; fi - if [ "${arg#linesvisualheadsep}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualheadsep=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisual_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualsepre_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualheadsep=0; fi if [ "$arg" = "in=llm" ]; then FFOUND=1; F_in__in_llm=1; F_in_=0; fi if [ "$arg" = "in=llmmodels" ]; then FFOUND=1; F_in__in_llmmodels=1; F_in_=0; fi if [ "$arg" = "in=ls" ]; then FFOUND=1; F_in__in_ls=1; F_in_=0; fi - if [ "${arg#lsext=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsext_=0; fi - if [ "${arg#lsrecursive=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsrecursive_=0; fi - if [ "${arg#lsposix=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsposix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsext_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsrecursive_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsposix_=0; fi if [ "$arg" = "in=md" ]; then FFOUND=1; F_in__in_md=1; F_in_=0; fi if [ "$arg" = "in=mdtable" ]; then FFOUND=1; F_in__in_mdtable=1; F_in_=0; fi - if [ "${arg#inmdtablejoin=}" != "$arg" ]; then FFOUND=1; F_in__in_mdtable_inmdtablejoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mdtable_inmdtablejoin_=0; fi if [ "$arg" = "in=mdcode" ]; then FFOUND=1; F_in__in_mdcode=1; F_in_=0; fi if [ "$arg" = "in=mcp" ]; then FFOUND=1; F_in__in_mcp=1; F_in_=0; fi - if [ "${arg#inmcptoolslist=}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcptoolslist_=0; fi - if [ "${arg#inmcplistprompts=}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcplistprompts_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcptoolslist_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcplistprompts_=0; fi if [ "$arg" = "in=minia" ]; then FFOUND=1; F_in__in_minia=1; F_in_=0; fi - if [ "${arg#minianolog=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minianolog_=0; fi - if [ "${arg#minialogfile=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minialogfile_=0; fi - if [ "${arg#miniametrics=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_miniametrics_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minianolog_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minialogfile_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_miniametrics_=0; fi if [ "$arg" = "in=ndjson" ]; then FFOUND=1; F_in__in_ndjson=1; F_in_=0; fi - if [ "${arg#ndjsonjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonjoin_=0; fi - if [ "${arg#ndjsonfilter=}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonfilter_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonfilter_=0; fi if [ "$arg" = "in=ndslon" ]; then FFOUND=1; F_in__in_ndslon=1; F_in_=0; fi - if [ "${arg#ndslonjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonjoin_=0; fi - if [ "${arg#ndslonfilter=}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonfilter_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonfilter_=0; fi if [ "$arg" = "in=oaf" ]; then FFOUND=1; F_in__in_oaf=1; F_in_=0; fi if [ "$arg" = "in=oafp" ]; then FFOUND=1; F_in__in_oafp=1; F_in_=0; fi - if [ "${arg#inoafpseq=}" != "$arg" ]; then FFOUND=1; F_in__in_oafp_inoafpseq_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_oafp_inoafpseq_=0; fi if [ "$arg" = "in=ojob" ]; then FFOUND=1; F_in__in_ojob=1; F_in_=0; fi if [ "$arg" = "in=openmetrics" ]; then FFOUND=1; F_in__in_openmetrics=1; F_in_=0; fi if [ "$arg" = "in=raw" ]; then FFOUND=1; F_in__in_raw=1; F_in_=0; fi if [ "$arg" = "in=rawhex" ]; then FFOUND=1; F_in__in_rawhex=1; F_in_=0; fi - if [ "${arg#inrawhexline=}" != "$arg" ]; then FFOUND=1; F_in__in_rawhex_inrawhexline_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_rawhex_inrawhexline_=0; fi if [ "$arg" = "in=sh" ]; then FFOUND=1; F_in__in_sh=1; F_in_=0; fi - if [ "${arg#inshformat=}" != "$arg" ]; then FFOUND=1; F_in__in_sh_inshformat_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sh_inshformat_=0; fi if [ "$arg" = "in=slon" ]; then FFOUND=1; F_in__in_slon=1; F_in_=0; fi if [ "$arg" = "in=sql" ]; then FFOUND=1; F_in__in_sql=1; F_in_=0; fi - if [ "${arg#sqlparse=}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqlparse_=0; fi - if [ "${arg#sqloptions=}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqloptions_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqlparse_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqloptions_=0; fi if [ "$arg" = "in=snmp" ]; then FFOUND=1; F_in__in_snmp=1; F_in_=0; fi - if [ "${arg#insnmp=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmp_=0; fi - if [ "${arg#insnmpcommunity=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpcommunity_=0; fi - if [ "${arg#insnmpversion=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpversion_=0; fi - if [ "${arg#insnmptimeout=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmptimeout_=0; fi - if [ "${arg#insnmpretries=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpretries_=0; fi - if [ "${arg#insnmpsec=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpsec_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmp_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpcommunity_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpversion_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmptimeout_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpretries_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpsec_=0; fi if [ "$arg" = "in=toml" ]; then FFOUND=1; F_in__in_toml=1; F_in_=0; fi if [ "$arg" = "in=toon" ]; then FFOUND=1; F_in__in_toon=1; F_in_=0; fi if [ "$arg" = "in=xls" ]; then FFOUND=1; F_in__in_xls=1; F_in_=0; fi - if [ "${arg#inxlssheet=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlssheet_=0; fi - if [ "${arg#inxlsevalformulas=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsevalformulas_=0; fi - if [ "${arg#inxlsdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsdesc_=0; fi - if [ "${arg#inxlscol=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlscol_=0; fi - if [ "${arg#inxlsrow=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsrow_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlssheet_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsevalformulas_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsdesc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlscol_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsrow_=0; fi if [ "$arg" = "in=xml" ]; then FFOUND=1; F_in__in_xml=1; F_in_=0; fi - if [ "${arg#xmlignored=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlignored_=0; fi - if [ "${arg#xmlprefix=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlprefix_=0; fi - if [ "${arg#xmlfiltertag=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlfiltertag_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlignored_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlprefix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlfiltertag_=0; fi if [ "$arg" = "in=yaml" ]; then FFOUND=1; F_in__in_yaml=1; F_in_=0; fi # out= options if [ "$arg" = "out=base64" ]; then FFOUND=1; F_out__out_base64=1; F_out_=0; fi - if [ "${arg#base64gzip=}" != "$arg" ]; then FFOUND=1; F_out__out_base64_base64gzip_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_base64_base64gzip_=0; fi if [ "$arg" = "out=ch" ]; then FFOUND=1; F_out__out_ch=1; F_out_=0; fi - if [ "${arg#ch=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_ch_=0; fi - if [ "${arg#chkey=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chkey_=0; fi - if [ "${arg#chunset=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chunset_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_ch_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chkey_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chunset_=0; fi if [ "$arg" = "out=chart" ]; then FFOUND=1; F_out__out_chart=1; F_out_=0; fi - if [ "${arg#chart=}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chart_=0; fi - if [ "${arg#chartcls=}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chartcls_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chart_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chartcls_=0; fi if [ "$arg" = "out=cjson" ]; then FFOUND=1; F_out__out_cjson=1; F_out_=0; fi if [ "$arg" = "out=cmd" ]; then FFOUND=1; F_out__out_cmd=1; F_out_=0; fi - if [ "${arg#outcmd=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmd_=0; fi - if [ "${arg#outcmdjoin=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdjoin_=0; fi - if [ "${arg#outcmdseq=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdseq_=0; fi - if [ "${arg#outcmdnl=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdnl_=0; fi - if [ "${arg#outcmdparam=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdparam_=0; fi - if [ "${arg#outcmdtmpl=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdtmpl_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmd_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdjoin_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdseq_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdnl_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdparam_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdtmpl_=0; fi if [ "$arg" = "out=cslon" ]; then FFOUND=1; F_out__out_cslon=1; F_out_=0; fi if [ "$arg" = "out=csv" ]; then FFOUND=1; F_out__out_csv=1; F_out_=0; fi - if [ "${arg#csv=}" != "$arg" ]; then FFOUND=1; F_out__out_csv_csv_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_csv_csv_=0; fi if [ "$arg" = "out=dsv" ]; then FFOUND=1; F_out__out_dsv=1; F_out_=0; fi - if [ "${arg#dsvsep=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvsep_=0; fi - if [ "${arg#dsvquote=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvquote_=0; fi - if [ "${arg#dsvfields=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvfields_=0; fi - if [ "${arg#dsvuseslon=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvuseslon_=0; fi - if [ "${arg#dsvheader=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvheader_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvsep_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvquote_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvfields_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvuseslon_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvheader_=0; fi if [ "$arg" = "out=ctable" ]; then FFOUND=1; F_out__out_ctable=1; F_out_=0; fi if [ "$arg" = "out=ctree" ]; then FFOUND=1; F_out__out_ctree=1; F_out_=0; fi if [ "$arg" = "out=mtree" ]; then FFOUND=1; F_out__out_mtree=1; F_out_=0; fi @@ -509,87 +509,87 @@ if [ $# -gt 0 ]; then if [ "$arg" = "out=lkyaml" ]; then FFOUND=1; F_out__out_lkyaml=1; F_out_=0; fi if [ "$arg" = "out=clkyaml" ]; then FFOUND=1; F_out__out_clkyaml=1; F_out_=0; fi if [ "$arg" = "out=db" ]; then FFOUND=1; F_out__out_db=1; F_out_=0; fi - if [ "${arg#dbjdbc=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbjdbc_=0; fi - if [ "${arg#dbuser=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbuser_=0; fi - if [ "${arg#dbpass=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbpass_=0; fi - if [ "${arg#dbtimeout=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtimeout_=0; fi - if [ "${arg#dblib=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dblib_=0; fi - if [ "${arg#dbtable=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtable_=0; fi - if [ "${arg#dbnocreate=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbnocreate_=0; fi - if [ "${arg#dbicase=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbicase_=0; fi - if [ "${arg#dbbatchsize=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbbatchsize_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbjdbc_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbuser_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbpass_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtimeout_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dblib_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtable_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbnocreate_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbicase_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbbatchsize_=0; fi if [ "$arg" = "out=envs" ]; then FFOUND=1; F_out__out_envs=1; F_out_=0; fi - if [ "${arg#envscmd=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envscmd_=0; fi - if [ "${arg#envsprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsprefix_=0; fi - if [ "${arg#envsnoprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsnoprefix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envscmd_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsprefix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsnoprefix_=0; fi if [ "$arg" = "out=gb64json" ]; then FFOUND=1; F_out__out_gb64json=1; F_out_=0; fi if [ "$arg" = "out=grid" ]; then FFOUND=1; F_out__out_grid=1; F_out_=0; fi - if [ "${arg#grid=}" != "$arg" ]; then FFOUND=1; F_out__out_grid_grid_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_grid_grid_=0; fi if [ "$arg" = "out=html" ]; then FFOUND=1; F_out__out_html=1; F_out_=0; fi - if [ "${arg#htmlcompact=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlcompact_=0; fi - if [ "${arg#htmlpart=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlpart_=0; fi - if [ "${arg#htmlopen=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlopen_=0; fi - if [ "${arg#htmlwait=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlwait_=0; fi - if [ "${arg#htmldark=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmldark_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlcompact_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlpart_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlopen_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlwait_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmldark_=0; fi if [ "$arg" = "out=ini" ]; then FFOUND=1; F_out__out_ini=1; F_out_=0; fi if [ "$arg" = "out=json" ]; then FFOUND=1; F_out__out_json=1; F_out_=0; fi if [ "$arg" = "out=jwt" ]; then FFOUND=1; F_out__out_jwt=1; F_out_=0; fi - if [ "${arg#jwtsecret=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtsecret_=0; fi - if [ "${arg#jwtprivkey=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtprivkey_=0; fi - if [ "${arg#jwtalg=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtalg_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtsecret_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtprivkey_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtalg_=0; fi if [ "$arg" = "out=lines" ]; then FFOUND=1; F_out__out_lines=1; F_out_=0; fi if [ "$arg" = "out=log" ]; then FFOUND=1; F_out__out_log=1; F_out_=0; fi - if [ "${arg#logprintall=}" != "$arg" ]; then FFOUND=1; F_out__out_log_logprintall_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_log_logprintall_=0; fi if [ "$arg" = "out=map" ]; then FFOUND=1; F_out__out_map=1; F_out_=0; fi if [ "$arg" = "out=md" ]; then FFOUND=1; F_out__out_md=1; F_out_=0; fi - if [ "${arg#mdtemplate=}" != "$arg" ]; then FFOUND=1; F_out__out_md_mdtemplate_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_md_mdtemplate_=0; fi if [ "$arg" = "out=mdtable" ]; then FFOUND=1; F_out__out_mdtable=1; F_out_=0; fi if [ "$arg" = "out=mdyaml" ]; then FFOUND=1; F_out__out_mdyaml=1; F_out_=0; fi if [ "$arg" = "out=ndjson" ]; then FFOUND=1; F_out__out_ndjson=1; F_out_=0; fi if [ "$arg" = "out=ndslon" ]; then FFOUND=1; F_out__out_ndslon=1; F_out_=0; fi if [ "$arg" = "out=ndcslon" ]; then FFOUND=1; F_out__out_ndcslon=1; F_out_=0; fi if [ "$arg" = "out=oaf" ]; then FFOUND=1; F_out__out_oaf=1; F_out_=0; fi - if [ "${arg#outoaf=}" != "$arg" ]; then FFOUND=1; F_out__out_oaf_outoaf_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_oaf_outoaf_=0; fi if [ "$arg" = "out=openmetrics" ]; then FFOUND=1; F_out__out_openmetrics=1; F_out_=0; fi - if [ "${arg#metricsprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricsprefix_=0; fi - if [ "${arg#metricstimestamp=}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricstimestamp_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricsprefix_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricstimestamp_=0; fi if [ "$arg" = "out=pjson" ]; then FFOUND=1; F_out__out_pjson=1; F_out_=0; fi if [ "$arg" = "out=prettyjson" ]; then FFOUND=1; F_out__out_prettyjson=1; F_out_=0; fi if [ "$arg" = "out=pxml" ]; then FFOUND=1; F_out__out_pxml=1; F_out_=0; fi - if [ "${arg#pxmlprefix}" != "$arg" ]; then FFOUND=1; F_out__out_pxml_pxmlprefix=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_pxml_pxmlprefix=0; fi if [ "$arg" = "out=raw" ]; then FFOUND=1; F_out__out_raw=1; F_out_=0; fi if [ "$arg" = "out=rawascii" ]; then FFOUND=1; F_out__out_rawascii=1; F_out_=0; fi - if [ "${arg#rawasciistart=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciistart_=0; fi - if [ "${arg#rawasciiend=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciiend_=0; fi - if [ "${arg#rawasciitab=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciitab_=0; fi - if [ "${arg#rawasciinovisual=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinovisual_=0; fi - if [ "${arg#rawasciinolinenum=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinolinenum_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciistart_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciiend_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciitab_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinovisual_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinolinenum_=0; fi if [ "$arg" = "out=schart" ]; then FFOUND=1; F_out__out_schart=1; F_out_=0; fi - if [ "${arg#schart=}" != "$arg" ]; then FFOUND=1; F_out__out_schart_schart_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_schart_schart_=0; fi if [ "$arg" = "out=slon" ]; then FFOUND=1; F_out__out_slon=1; F_out_=0; fi if [ "$arg" = "out=sql" ]; then FFOUND=1; F_out__out_sql=1; F_out_=0; fi - if [ "${arg#sqltable=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqltable_=0; fi - if [ "${arg#sqlicase=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlicase_=0; fi - if [ "${arg#sqlnocreate=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlnocreate_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqltable_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlicase_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlnocreate_=0; fi if [ "$arg" = "out=stable" ]; then FFOUND=1; F_out__out_stable=1; F_out_=0; fi if [ "$arg" = "out=table" ]; then FFOUND=1; F_out__out_table=1; F_out_=0; fi if [ "$arg" = "out=template" ]; then FFOUND=1; F_out__out_template=1; F_out_=0; fi - if [ "${arg#template=}" != "$arg" ]; then FFOUND=1; F_out__out_template_template_=0; fi - if [ "${arg#templatepath=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatepath_=0; fi - if [ "${arg#templatedata=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatedata_=0; fi - if [ "${arg#templatetmpl=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatetmpl_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_template_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatepath_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatedata_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatetmpl_=0; fi if [ "$arg" = "out=text" ]; then FFOUND=1; F_out__out_text=1; F_out_=0; fi if [ "$arg" = "out=toml" ]; then FFOUND=1; F_out__out_toml=1; F_out_=0; fi if [ "$arg" = "out=toon" ]; then FFOUND=1; F_out__out_toon=1; F_out_=0; fi if [ "$arg" = "out=tree" ]; then FFOUND=1; F_out__out_tree=1; F_out_=0; fi if [ "$arg" = "out=xls" ]; then FFOUND=1; F_out__out_xls=1; F_out_=0; fi - if [ "${arg#xlsfile=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsfile_=0; fi - if [ "${arg#xlssheet=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlssheet_=0; fi - if [ "${arg#xlsformat=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsformat_=0; fi - if [ "${arg#xlsopen=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopen_=0; fi - if [ "${arg#xlsopenwait=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopenwait_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsfile_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlssheet_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsformat_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopen_=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopenwait_=0; fi if [ "$arg" = "out=xml" ]; then FFOUND=1; F_out__out_xml=1; F_out_=0; fi - if [ "${arg#outxmlprefix}" != "$arg" ]; then FFOUND=1; F_out__out_xml_outxmlprefix=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xml_outxmlprefix=0; fi if [ "$arg" = "out=yaml" ]; then FFOUND=1; F_out__out_yaml=1; F_out_=0; fi # -h single option if [ "$arg" = "-h" ]; then FFOUND=1; F__h=0; fi @@ -723,11 +723,11 @@ if [ $# -gt 0 ]; then if [ "$arg" = "regressionforecast=" ]; then FFOUND=1; F_regression__regressionforecast_=1; F_regression_=0; fi # set= options if [ "$arg" = "setop=" ]; then FFOUND=1; F_set__setop_=1; F_set_=0; fi - if [ "${arg#setop=union}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_union=0; fi - if [ "${arg#setop=diffa}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffa=0; fi - if [ "${arg#setop=diffb}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffb=0; fi - if [ "${arg#setop=diffab}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffab=0; fi - if [ "${arg#setop=intersect}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_intersect=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_union=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffa=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffb=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffab=0; fi + if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_intersect=0; fi # removedups= single option if [ "$arg" = "removedups=" ]; then FFOUND=1; F_removedups_=0; fi # removeempty= single option diff --git a/complete/completion_opack.sh b/complete/completion_opack.sh index 4e7fad871..675ea128e 100644 --- a/complete/completion_opack.sh +++ b/complete/completion_opack.sh @@ -33,7 +33,7 @@ F__cred=1 if [ $# -gt 0 ]; then FFOUND=0 for arg in "$@"; do - if [ "$arg" = "${!#}" ]; then FFOUND=1; break; fi + if [ "$arg" = "" ]; then FFOUND=1; break; fi # info single option if [ "$arg" = "info" ]; then FFOUND=1; F_info=0; fi # search single option diff --git a/js/openaf.js b/js/openaf.js index 166ac94c7..ac6d78025 100644 --- a/js/openaf.js +++ b/js/openaf.js @@ -209,6 +209,7 @@ var __flags = ( typeof __flags != "undefined" && "[object Object]" == Object.pro OJOB_CHECK_JOB_REMOVAL : false, OJOB_CHECK_JOB_CHANGES : false, OJOB_ARGS_FROM_ENVS : false, + OPACK_REMOTE_DB_CACHE_TTL : 60000, OAF_CLOSED : false, OAF_PRECOMPILE_LEVEL : 2, OAF_ERRSTACK : true, // If true $err will print the stack trace @@ -3313,49 +3314,59 @@ const addOPackRemoteDB = function(aURL) { * * getOPackRemoteDB() : Array * Returns an Array of maps. Each map element is an opack package description registered in the OpenAF central repository. + * Results are cached using $cache for __flags.OPACK_REMOTE_DB_CACHE_TTL milliseconds (default: 60000). * */ const getOPackRemoteDB = function() { - var packages = {}; + var __opacksEnv = getEnv("OAF_OPACKS"); + var _cache = $cache("__openaf_getOPackRemoteDB") + .fn((k) => { + var packages = {}; + var _sources = clone(k.sources); + var _zip; - plugin("ZIP") - var zip + plugin("ZIP"); - // Check for OAF_OPACKS environment variable - // If it exists, add the remote opack repositories - if (isString(getEnv("OAF_OPACKS"))) { - getEnv("OAF_OPACKS").split(",").forEach(url => addOPackRemoteDB(url) ) - } - for(var i in __opackCentral) { - if (!noHomeComms && __opackCentral[i].toLowerCase().startsWith("http")) { - try { - var _stream = $rest({ connectionTimeout: 1500 }).get2Stream(__opackCentral[i]) - //http = new HTTP(, "GET", "", {}, true, 1500); - //zip = new ZIP(http.responseBytes()); - zip = new ZIP(af.fromInputStream2Bytes(_stream)) - packages = merge(packages, af.fromJson(af.fromBytes2String(zip.getFile(OPACKCENTRALJSON)))) - } catch(e) { - // Continue to next - } finally { - if (isDef(zip)) zip.close() - } - } else if (io.fileExists(__opackCentral[i]) && io.fileInfo(__opackCentral[i]).isDirectory) { - if (io.fileExists(__opackCentral[i] + "/" + PACKAGESJSON_CENTRALDB)) { + for(var i in _sources) { + if (!k.noHomeComms && _sources[i].toLowerCase().startsWith("http")) { try { - zip = new ZIP(io.readFileBytes(__opackCentral[i] + "/" + PACKAGESJSON_CENTRALDB)) - packages = merge(packages, af.fromJson(af.fromBytes2String(zip.getFile(OPACKCENTRALJSON)))) + var _stream = $rest({ connectionTimeout: 1500 }).get2Stream(_sources[i]); + _zip = new ZIP(af.fromInputStream2Bytes(_stream)); + packages = merge(packages, af.fromJson(af.fromBytes2String(_zip.getFile(OPACKCENTRALJSON)))); + } catch(e) { + // Continue to next } finally { - if (isDef(zip)) zip.close() + if (isDef(_zip)) _zip.close(); + } + } else if (io.fileExists(_sources[i]) && io.fileInfo(_sources[i]).isDirectory) { + if (io.fileExists(_sources[i] + "/" + PACKAGESJSON_CENTRALDB)) { + try { + _zip = new ZIP(io.readFileBytes(_sources[i] + "/" + PACKAGESJSON_CENTRALDB)); + packages = merge(packages, af.fromJson(af.fromBytes2String(_zip.getFile(OPACKCENTRALJSON)))); + } finally { + if (isDef(_zip)) _zip.close(); + } } } } + + return packages; + }) + .ttl(_$(__flags.OPACK_REMOTE_DB_CACHE_TTL, "__flags.OPACK_REMOTE_DB_CACHE_TTL").isNumber().default(60000)) + .create(); + + var _sources = clone(__opackCentral); + + // Check for OAF_OPACKS environment variable + // If it exists, add the remote opack repositories + if (isString(__opacksEnv)) { + _sources = _sources.concat(__opacksEnv.split(",")); } - - //if (isUnDef(http)) return packages; - //packages = af.fromJson(af.fromBytes2String(zip.getFile(OPACKCENTRALJSON))); - //if (!isUnDef(zip)) zip.close(); - return packages; + return _cache.get({ + noHomeComms: noHomeComms, + sources: _sources.sort() + }); } /** diff --git a/js/owrap.format.js b/js/owrap.format.js index 34ed4dbd9..331f55730 100644 --- a/js/owrap.format.js +++ b/js/owrap.format.js @@ -4940,15 +4940,14 @@ OpenWrap.format.prototype.withMD = function(aString, defaultAnsi, aLineWidth, aB __owWithMdCache = _withMdPatterns } - // pre process code blocks - - // remove html - // TODO: .replace(/<\/?(code|pre>)[^>]*>/g, "```"). ? - if (__flags.WITHMD.htmlFilter) - res = res.replace(/)<[^<]*)*<\/script\s*>/gi, "").replace(/<[^>]*>/g, "").replace(/ /g, " ") - - // single line - res = res.replace(/```+(.+?)```+/mg, ansiColor(__colorFormat.md.codeBlock.text, " $1 ")) + // pre process code blocks before html filtering, so literal XML/HTML samples + // inside fenced code blocks are not stripped as markup. + var inlineCodeBlocks = [] + res = res.replace(/```+(.+?)```+/mg, (m, code) => { + var idx = inlineCodeBlocks.length + inlineCodeBlocks.push(ansiColor(__colorFormat.md.codeBlock.text, " " + code + " ")) + return "```INLINE$" + idx + "```" + }) // multi line var cblocks = res.match(/```+\w*( +|\n)((.|\n)+?)( +|\n)```+/mg) @@ -4965,6 +4964,11 @@ OpenWrap.format.prototype.withMD = function(aString, defaultAnsi, aLineWidth, aB res = res.replace(b, "```$$" + i + "```") }) + // remove html outside fenced code blocks + // TODO: .replace(/<\/?(code|pre>)[^>]*>/g, "```"). ? + if (__flags.WITHMD.htmlFilter) + res = res.replace(/)<[^<]*)*<\/script\s*>/gi, "").replace(/<[^>]*>/g, "").replace(/ /g, " ") + var _repBoldItalic = _withMdPatterns.repBoldItalic + da var _repBold = _withMdPatterns.repBold + da var _repItalic = _withMdPatterns.repItalic + da @@ -5067,6 +5071,11 @@ OpenWrap.format.prototype.withMD = function(aString, defaultAnsi, aLineWidth, aB res = res.replace("```$" + i + "```", ow.format.withSideLine(b.replace(/```+\w*( +|\n)((.|\n)+?)( +|\n)```+/mg, "$2").replace(/\\n/g, "\\\\n"), _aSize, __colorFormat.md.codeBlock.line, _withColor(__colorFormat.md.codeBlock.text, aBgColor), _sideLineThemes[__colorFormat.md.codeBlock.theme])) }) } + if (inlineCodeBlocks.length > 0) { + inlineCodeBlocks.forEach((b, i) => { + res = res.replace("```INLINE$" + i + "```", b) + }) + } // table render if (res.indexOf("|") >= 0) { diff --git a/lib/commons-io-2.22.0.jar b/lib/commons-io-2.22.0.jar new file mode 100644 index 000000000..4d09b3835 Binary files /dev/null and b/lib/commons-io-2.22.0.jar differ diff --git a/lib/commons-net-3.12.0.jar b/lib/commons-net-3.12.0.jar deleted file mode 100644 index c12378e2e..000000000 Binary files a/lib/commons-net-3.12.0.jar and /dev/null differ diff --git a/lib/commons-net-3.13.0.jar b/lib/commons-net-3.13.0.jar new file mode 100644 index 000000000..b8229f8af Binary files /dev/null and b/lib/commons-net-3.13.0.jar differ diff --git a/lib/dnsjava-3.6.4.jar b/lib/dnsjava-3.6.5.jar similarity index 80% rename from lib/dnsjava-3.6.4.jar rename to lib/dnsjava-3.6.5.jar index aa9dffaaa..9fbc9cb88 100644 Binary files a/lib/dnsjava-3.6.4.jar and b/lib/dnsjava-3.6.5.jar differ diff --git a/lib/gson-2.13.2.jar b/lib/gson-2.13.2.jar deleted file mode 100644 index 5a1b74e89..000000000 Binary files a/lib/gson-2.13.2.jar and /dev/null differ diff --git a/lib/gson-2.14.0.jar b/lib/gson-2.14.0.jar new file mode 100644 index 000000000..1d5db44d8 Binary files /dev/null and b/lib/gson-2.14.0.jar differ diff --git a/lib/jackson-core-2.21.1.jar b/lib/jackson-core-2.21.3.jar similarity index 58% rename from lib/jackson-core-2.21.1.jar rename to lib/jackson-core-2.21.3.jar index e2cbe789a..8d4c00980 100644 Binary files a/lib/jackson-core-2.21.1.jar and b/lib/jackson-core-2.21.3.jar differ diff --git a/lib/jackson-databind-2.21.1.jar b/lib/jackson-databind-2.21.3.jar similarity index 88% rename from lib/jackson-databind-2.21.1.jar rename to lib/jackson-databind-2.21.3.jar index 6e7af8826..5af13ea61 100644 Binary files a/lib/jackson-databind-2.21.1.jar and b/lib/jackson-databind-2.21.3.jar differ diff --git a/lib/jackson-dataformat-toml-2.21.2.jar b/lib/jackson-dataformat-toml-2.21.3.jar similarity index 82% rename from lib/jackson-dataformat-toml-2.21.2.jar rename to lib/jackson-dataformat-toml-2.21.3.jar index f44c112f4..ebaed7672 100644 Binary files a/lib/jackson-dataformat-toml-2.21.2.jar and b/lib/jackson-dataformat-toml-2.21.3.jar differ diff --git a/lib/jsch-2.28.1.jar b/lib/jsch-2.28.2.jar similarity index 88% rename from lib/jsch-2.28.1.jar rename to lib/jsch-2.28.2.jar index 9d3c84658..8f94f5ca7 100644 Binary files a/lib/jsch-2.28.1.jar and b/lib/jsch-2.28.2.jar differ diff --git a/lib/ojdbc17-23.26.1.0.0.jar b/lib/ojdbc17-23.26.2.0.0.jar similarity index 53% rename from lib/ojdbc17-23.26.1.0.0.jar rename to lib/ojdbc17-23.26.2.0.0.jar index 5d2c1be1f..59a0db411 100644 Binary files a/lib/ojdbc17-23.26.1.0.0.jar and b/lib/ojdbc17-23.26.2.0.0.jar differ diff --git a/lib/slf4j-api-2.0.17.jar b/lib/slf4j-api-2.0.18.jar similarity index 75% rename from lib/slf4j-api-2.0.17.jar rename to lib/slf4j-api-2.0.18.jar index 26b154554..fbf1f2014 100644 Binary files a/lib/slf4j-api-2.0.17.jar and b/lib/slf4j-api-2.0.18.jar differ diff --git a/lib/slf4j-nop-2.0.17.jar b/lib/slf4j-nop-2.0.17.jar deleted file mode 100644 index 8c6e68922..000000000 Binary files a/lib/slf4j-nop-2.0.17.jar and /dev/null differ diff --git a/lib/slf4j-nop-2.0.18.jar b/lib/slf4j-nop-2.0.18.jar new file mode 100644 index 000000000..64ef407b3 Binary files /dev/null and b/lib/slf4j-nop-2.0.18.jar differ diff --git a/pom-check.oafp.yaml b/pom-check.oafp.yaml new file mode 100644 index 000000000..d43adea68 --- /dev/null +++ b/pom-check.oafp.yaml @@ -0,0 +1,28 @@ +# Usage : oafp -f pom-check.oafp.yaml +# Description: Check for updates of maven dependencies in pom.xml +# +file: pom.xml +path: project.dependencies.dependency +out : json +pipe: + in : json + out : json + sql : | #sql + SELECT * WHERE update = true ORDER BY update, groupId, artifactId + oaf : | #js + ow.loadJava() + var m = new ow.java.maven() + return pForEach(data, d => { + try { + d.onlineVersion = m.getLatestVersionString(d.groupId + "." + d.artifactId) + if (d.version != d.onlineVersion) { + d.update = true + } else { + d.update = false + } + } catch(e) { + } + return d + }) + pipe : + out : ctable diff --git a/pom.json b/pom.json index 8543aa30e..307bce929 100644 --- a/pom.json +++ b/pom.json @@ -1 +1 @@ -{"{\"artifactId\":\"rhino\"}":{"groupId":"org.mozilla","artifactId":"rhino","version":"1.8.1"},"{\"artifactId\":\"rhino-xml\"}":{"groupId":"org.mozilla","artifactId":"rhino-xml","version":"1.8.1"},"{\"artifactId\":\"rhino-engine\"}":{"groupId":"org.mozilla","artifactId":"rhino-engine","version":"1.8.1"},"{\"artifactId\":\"asciilist-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciilist-j7","version":"1.0.0"},"{\"artifactId\":\"asciitable-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciitable-j7","version":"1.0.1"},"{\"artifactId\":\"commons-cli\"}":{"groupId":"commons-cli","artifactId":"commons-cli","version":"1.11.0"},"{\"artifactId\":\"commons-codec\"}":{"groupId":"commons-codec","artifactId":"commons-codec","version":"1.22.0"},"{\"artifactId\":\"commons-collections4\"}":{"groupId":"org.apache.commons","artifactId":"commons-collections4","version":"4.5.0"},"{\"artifactId\":\"commons-compress\"}":{"groupId":"org.apache.commons","artifactId":"commons-compress","version":"1.28.0"},"{\"artifactId\":\"commons-csv\"}":{"groupId":"org.apache.commons","artifactId":"commons-csv","version":"1.14.1"},"{\"artifactId\":\"commons-email\"}":{"groupId":"org.apache.commons","artifactId":"commons-email","version":"1.6.0"},"{\"artifactId\":\"commons-io\"}":{"groupId":"commons-io","artifactId":"commons-io","version":"2.21.0"},"{\"artifactId\":\"commons-lang3\"}":{"groupId":"org.apache.commons","artifactId":"commons-lang3","version":"3.20.0"},"{\"artifactId\":\"commons-logging\"}":{"groupId":"commons-logging","artifactId":"commons-logging","version":"1.3.6"},"{\"artifactId\":\"commons-math3\"}":{"groupId":"org.apache.commons","artifactId":"commons-math3","version":"3.6.1"},"{\"artifactId\":\"commons-net\"}":{"groupId":"commons-net","artifactId":"commons-net","version":"3.12.0"},"{\"artifactId\":\"googleauth\"}":{"groupId":"com.warrenstrange","artifactId":"googleauth","version":"1.5.0"},"{\"artifactId\":\"gson\"}":{"groupId":"com.google.code.gson","artifactId":"gson","version":"2.13.2"},"{\"artifactId\":\"h2\"}":{"groupId":"com.h2database","artifactId":"h2","version":"2.4.240"},"{\"artifactId\":\"jackson-annotations\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-annotations","version":"2.21"},"{\"artifactId\":\"jackson-core\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-core","version":"2.21.1"},"{\"artifactId\":\"jackson-databind\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-databind","version":"2.21.1"},"{\"artifactId\":\"jansi\"}":{"groupId":"org.fusesource.jansi","artifactId":"jansi","version":"1.18"},"{\"artifactId\":\"jaxb-api\"}":{"groupId":"javax.xml.bind","artifactId":"jaxb-api","version":"2.3.1"},"{\"artifactId\":\"jbsdiff\"}":{"groupId":"io.sigpipe","artifactId":"jbsdiff","version":"1.0"},"{\"artifactId\":\"jetty-client\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-client","version":"12.1.8"},"{\"artifactId\":\"jetty-http\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-http","version":"12.1.8"},"{\"artifactId\":\"jetty-io\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-io","version":"12.1.8"},"{\"artifactId\":\"jetty-util\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-util","version":"12.1.8"},"{\"artifactId\":\"jetty-websocket-jetty-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-common","version":"12.1.8"},"{\"artifactId\":\"jetty-websocket-jetty-api\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-api","version":"12.1.8"},"{\"artifactId\":\"jetty-websocket-jetty-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-client","version":"12.1.8"},"{\"artifactId\":\"jetty-websocket-core-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-client","version":"12.1.8"},"{\"artifactId\":\"jetty-websocket-core-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-common","version":"12.1.8"},"{\"artifactId\":\"jline\"}":{"groupId":"jline","artifactId":"jline","version":"2.14.6"},"{\"artifactId\":\"jna-platform\"}":{"groupId":"net.java.dev.jna","artifactId":"jna-platform","version":"5.18.1"},"{\"artifactId\":\"jna\"}":{"groupId":"net.java.dev.jna","artifactId":"jna","version":"5.18.1"},"{\"artifactId\":\"postgresql\"}":{"groupId":"org.postgresql","artifactId":"postgresql","version":"42.7.11"},"{\"artifactId\":\"snmp4j\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j","version":"3.9.7"},"{\"artifactId\":\"snmp4j-agent\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j-agent","version":"3.8.3"},"{\"artifactId\":\"jjwt-impl\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-impl","version":"0.13.0"},"{\"artifactId\":\"jjwt-api\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-api","version":"0.13.0"},"{\"artifactId\":\"jjwt-gson\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-gson","version":"0.13.0"},"{\"artifactId\":\"okhttp\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp","version":"5.3.2"},"{\"artifactId\":\"okhttp-jvm\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp-jvm","version":"5.3.2"},"{\"artifactId\":\"kotlin-stdlib\"}":{"groupId":"org.jetbrains.kotlin","artifactId":"kotlin-stdlib","version":"2.3.20"},"{\"artifactId\":\"okio\"}":{"groupId":"com.squareup.okio","artifactId":"okio","version":"3.17.0"},"{\"artifactId\":\"okio-jvm\"}":{"groupId":"com.squareup.okio","artifactId":"okio-jvm","version":"3.17.0"},"{\"artifactId\":\"dnsjava\"}":{"groupId":"dnsjava","artifactId":"dnsjava","version":"3.6.4"},"{\"artifactId\":\"slf4j-api\"}":{"groupId":"org.slf4j","artifactId":"slf4j-api","version":"2.0.17"},"{\"artifactId\":\"slf4j-nop\"}":{"groupId":"org.slf4j","artifactId":"slf4j-nop","version":"2.0.17"},"{\"artifactId\":\"jsch\"}":{"groupId":"com.github.mwiede","artifactId":"jsch","version":"2.28.1"},"{\"artifactId\":\"sql-formatter\"}":{"groupId":"com.github.vertical-blank","artifactId":"sql-formatter","version":"2.0.5"},"{\"artifactId\":\"semver4j\"}":{"groupId":"org.semver4j","artifactId":"semver4j","version":"6.0.0"},"{\"artifactId\":\"ojdbc11\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc11","version":"23.9.0.25.07"},"{\"artifactId\":\"ojdbc17\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc17","version":"23.26.1.0.0"},"{\"artifactId\":\"jetty-compression-common\"}":{"groupId":"org.eclipse.jetty.compression","artifactId":"jetty-compression-common","version":"12.1.8"},"{\"artifactId\":\"jackson-dataformat-toml\"}":{"groupId":"com.fasterxml.jackson.dataformat","artifactId":"jackson-dataformat-toml","version":"2.21.2"},"{\"artifactId\":\"jakarta.mail\"}":{"groupId":"com.sun.mail","artifactId":"jakarta.mail","version":"1.6.8"}} \ No newline at end of file +{"{\"artifactId\":\"rhino\"}":{"groupId":"org.mozilla","artifactId":"rhino","version":"1.8.1"},"{\"artifactId\":\"rhino-xml\"}":{"groupId":"org.mozilla","artifactId":"rhino-xml","version":"1.8.1"},"{\"artifactId\":\"rhino-engine\"}":{"groupId":"org.mozilla","artifactId":"rhino-engine","version":"1.8.1"},"{\"artifactId\":\"asciilist-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciilist-j7","version":"1.0.0"},"{\"artifactId\":\"asciitable-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciitable-j7","version":"1.0.1"},"{\"artifactId\":\"commons-cli\"}":{"groupId":"commons-cli","artifactId":"commons-cli","version":"1.11.0"},"{\"artifactId\":\"commons-codec\"}":{"groupId":"commons-codec","artifactId":"commons-codec","version":"1.22.0"},"{\"artifactId\":\"commons-collections4\"}":{"groupId":"org.apache.commons","artifactId":"commons-collections4","version":"4.5.0"},"{\"artifactId\":\"commons-compress\"}":{"groupId":"org.apache.commons","artifactId":"commons-compress","version":"1.28.0"},"{\"artifactId\":\"commons-csv\"}":{"groupId":"org.apache.commons","artifactId":"commons-csv","version":"1.14.1"},"{\"artifactId\":\"commons-email\"}":{"groupId":"org.apache.commons","artifactId":"commons-email","version":"1.6.0"},"{\"artifactId\":\"commons-io\"}":{"groupId":"commons-io","artifactId":"commons-io","version":"2.22.0"},"{\"artifactId\":\"commons-lang3\"}":{"groupId":"org.apache.commons","artifactId":"commons-lang3","version":"3.20.0"},"{\"artifactId\":\"commons-logging\"}":{"groupId":"commons-logging","artifactId":"commons-logging","version":"1.3.6"},"{\"artifactId\":\"commons-math3\"}":{"groupId":"org.apache.commons","artifactId":"commons-math3","version":"3.6.1"},"{\"artifactId\":\"commons-net\"}":{"groupId":"commons-net","artifactId":"commons-net","version":"3.13.0"},"{\"artifactId\":\"googleauth\"}":{"groupId":"com.warrenstrange","artifactId":"googleauth","version":"1.5.0"},"{\"artifactId\":\"gson\"}":{"groupId":"com.google.code.gson","artifactId":"gson","version":"2.14.0"},"{\"artifactId\":\"h2\"}":{"groupId":"com.h2database","artifactId":"h2","version":"2.4.240"},"{\"artifactId\":\"jackson-annotations\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-annotations","version":"2.21"},"{\"artifactId\":\"jackson-core\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-core","version":"2.21.3"},"{\"artifactId\":\"jackson-databind\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-databind","version":"2.21.3"},"{\"artifactId\":\"jansi\"}":{"groupId":"org.fusesource.jansi","artifactId":"jansi","version":"1.18"},"{\"artifactId\":\"jaxb-api\"}":{"groupId":"javax.xml.bind","artifactId":"jaxb-api","version":"2.3.1"},"{\"artifactId\":\"jbsdiff\"}":{"groupId":"io.sigpipe","artifactId":"jbsdiff","version":"1.0"},"{\"artifactId\":\"jetty-client\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-client","version":"12.1.9"},"{\"artifactId\":\"jetty-http\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-http","version":"12.1.9"},"{\"artifactId\":\"jetty-io\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-io","version":"12.1.9"},"{\"artifactId\":\"jetty-util\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-util","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-common","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-api\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-api","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-client","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-core-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-client","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-core-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-common","version":"12.1.9"},"{\"artifactId\":\"jline\"}":{"groupId":"jline","artifactId":"jline","version":"2.14.6"},"{\"artifactId\":\"jna-platform\"}":{"groupId":"net.java.dev.jna","artifactId":"jna-platform","version":"5.18.1"},"{\"artifactId\":\"jna\"}":{"groupId":"net.java.dev.jna","artifactId":"jna","version":"5.18.1"},"{\"artifactId\":\"postgresql\"}":{"groupId":"org.postgresql","artifactId":"postgresql","version":"42.7.11"},"{\"artifactId\":\"snmp4j\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j","version":"3.9.7"},"{\"artifactId\":\"snmp4j-agent\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j-agent","version":"3.8.3"},"{\"artifactId\":\"jjwt-impl\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-impl","version":"0.13.0"},"{\"artifactId\":\"jjwt-api\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-api","version":"0.13.0"},"{\"artifactId\":\"jjwt-gson\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-gson","version":"0.13.0"},"{\"artifactId\":\"okhttp\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp","version":"5.3.2"},"{\"artifactId\":\"okhttp-jvm\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp-jvm","version":"5.3.2"},"{\"artifactId\":\"kotlin-stdlib\"}":{"groupId":"org.jetbrains.kotlin","artifactId":"kotlin-stdlib","version":"2.3.20"},"{\"artifactId\":\"okio\"}":{"groupId":"com.squareup.okio","artifactId":"okio","version":"3.17.0"},"{\"artifactId\":\"okio-jvm\"}":{"groupId":"com.squareup.okio","artifactId":"okio-jvm","version":"3.17.0"},"{\"artifactId\":\"dnsjava\"}":{"groupId":"dnsjava","artifactId":"dnsjava","version":"3.6.5"},"{\"artifactId\":\"slf4j-api\"}":{"groupId":"org.slf4j","artifactId":"slf4j-api","version":"2.0.18"},"{\"artifactId\":\"slf4j-nop\"}":{"groupId":"org.slf4j","artifactId":"slf4j-nop","version":"2.0.18"},"{\"artifactId\":\"jsch\"}":{"groupId":"com.github.mwiede","artifactId":"jsch","version":"2.28.2"},"{\"artifactId\":\"sql-formatter\"}":{"groupId":"com.github.vertical-blank","artifactId":"sql-formatter","version":"2.0.5"},"{\"artifactId\":\"semver4j\"}":{"groupId":"org.semver4j","artifactId":"semver4j","version":"6.0.0"},"{\"artifactId\":\"ojdbc11\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc11","version":"23.9.0.25.07"},"{\"artifactId\":\"ojdbc17\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc17","version":"23.26.2.0.0"},"{\"artifactId\":\"jetty-compression-common\"}":{"groupId":"org.eclipse.jetty.compression","artifactId":"jetty-compression-common","version":"12.1.9"},"{\"artifactId\":\"jackson-dataformat-toml\"}":{"groupId":"com.fasterxml.jackson.dataformat","artifactId":"jackson-dataformat-toml","version":"2.21.3"},"{\"artifactId\":\"jakarta.mail\"}":{"groupId":"com.sun.mail","artifactId":"jakarta.mail","version":"1.6.8"}} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1c4435d28..799b2eb6b 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma commons-io commons-io - 2.21.0 + 2.22.0 org.apache.commons @@ -180,7 +180,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma commons-net commons-net - 3.12.0 + 3.13.0 com.warrenstrange @@ -190,7 +190,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.google.code.gson gson - 2.13.2 + 2.14.0 com.h2database @@ -205,17 +205,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.fasterxml.jackson.core jackson-core - 2.21.1 + 2.21.3 com.fasterxml.jackson.core jackson-databind - 2.21.1 + 2.21.3 com.fasterxml.jackson.dataformat jackson-dataformat-toml - 2.21.2 + 2.21.3 org.fusesource.jansi @@ -355,22 +355,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma dnsjava dnsjava - 3.6.4 + 3.6.5 org.slf4j slf4j-api - 2.0.17 + 2.0.18 org.slf4j slf4j-nop - 2.0.17 + 2.0.18 com.github.mwiede jsch - 2.28.1 + 2.28.2 com.github.vertical-blank @@ -385,7 +385,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.oracle.database.jdbc ojdbc17 - 23.26.1.0.0 + 23.26.2.0.0 com.sun.mail