diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 379d3575..186338aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,10 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: - distribution: 'adopt' - java-version: '8' + distribution: 'temurin' + java-version: '11' - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: diff --git a/lib/Makefile b/lib/Makefile index b65d1ff7..70a60eeb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -26,19 +26,13 @@ all: \ # confirmed before moving file into position. (This practice will # probably require frequent updates, unless a signed checksum for the # jar can be retrieved somehow.) -# In case there are concerns on potentially multiple writes to the same -# file, the documentation for wget's "--output-document file" flag notes -# that "... file will be truncated immediately, and all downloaded -# content will be written there." rdf-toolkit.jar: test -r rdf-toolkit.jar.sha512 - # Try retrieval from Github, then from files.caseontology.org. + rm -f $@_ + # Try retrieval from files.caseontology.org. wget \ --output-document $@_ \ - https://github.com/trypuz/openfibo/blob/1f9ab415e8ebd131eadcc9b0fc46241adeeb0384/etc/serialization/rdf-toolkit.jar?raw=true \ - || wget \ - --output-document $@_ \ - http://files.caseontology.org/rdf-toolkit.jar + https://files.caseontology.org/rdf-toolkit-1.11.0.jar test \ "x$$(openssl dgst -sha512 $@_ | awk '{print($$NF)}')" \ == \ diff --git a/lib/rdf-toolkit.jar.sha512 b/lib/rdf-toolkit.jar.sha512 index 4c4f5e0d..39fbb645 100644 --- a/lib/rdf-toolkit.jar.sha512 +++ b/lib/rdf-toolkit.jar.sha512 @@ -1 +1 @@ -24890b4aa484a46803841fbe5938daf60bf2d0889c0e231102c033d71cb84a2bfa8b44419df3ad896d833609afddd4b3910d2ce28660b3350cca22bea0770dad +8131e5515da63f099a89a3ce2c7587fb6b228f1ec7c5eb49ff35710509e8511921bfc847e182ee994e575b1f7895c04ae5bed7e1b7826bb32c9475b43b74dc17 diff --git a/ontology/observable/observable.ttl b/ontology/observable/observable.ttl index 91448529..dcfb8695 100644 --- a/ontology/observable/observable.ttl +++ b/ontology/observable/observable.ttl @@ -4473,39 +4473,16 @@ observable:NetworkSocketAddressFamily a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "af_appletalk" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_bth" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_inet" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_inet6" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_ipx" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_irda" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_netbios" ; - rdf:rest [ - a rdf:List ; - rdf:first "af_unspec" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "af_appletalk" + "af_bth" + "af_inet" + "af_inet6" + "af_ipx" + "af_irda" + "af_netbios" + "af_unspec" + ) ; ] ; . @@ -4513,107 +4490,33 @@ observable:NetworkSocketProtocolFamily a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "pf_appletalk" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_ash" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_atmpvc" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_atmsvc" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_ax25" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_bluetooth" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_bridge" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_decnet" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_econet" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_inet" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_inet6" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_ipx" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_irda" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_key" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_netbeui" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_netlink" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_netrom" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_packet" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_pppox" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_rose" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_route" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_security" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_sna" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_wanpipe" ; - rdf:rest [ - a rdf:List ; - rdf:first "pf_x25" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "pf_appletalk" + "pf_ash" + "pf_atmpvc" + "pf_atmsvc" + "pf_ax25" + "pf_bluetooth" + "pf_bridge" + "pf_decnet" + "pf_econet" + "pf_inet" + "pf_inet6" + "pf_ipx" + "pf_irda" + "pf_key" + "pf_netbeui" + "pf_netlink" + "pf_netrom" + "pf_packet" + "pf_pppox" + "pf_rose" + "pf_route" + "pf_security" + "pf_sna" + "pf_wanpipe" + "pf_x25" + ) ; ] ; . @@ -4621,27 +4524,13 @@ observable:NetworkSocketType a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "sock_dgram" ; - rdf:rest [ - a rdf:List ; - rdf:first "sock_raw" ; - rdf:rest [ - a rdf:List ; - rdf:first "sock_rdm" ; - rdf:rest [ - a rdf:List ; - rdf:first "sock_seqpacket" ; - rdf:rest [ - a rdf:List ; - rdf:first "sock_stream" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "sock_dgram" + "sock_raw" + "sock_rdm" + "sock_seqpacket" + "sock_stream" + ) ; ] ; . @@ -5364,59 +5253,21 @@ observable:RegistryDatatype a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "reg_binary" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_dword" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_dword_big_endian" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_expand_sz" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_full_resource_descriptor" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_invalid_type" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_link" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_multi_sz" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_none" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_qword" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_resource_list" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_resource_requirements_list" ; - rdf:rest [ - a rdf:List ; - rdf:first "reg_sz" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "reg_binary" + "reg_dword" + "reg_dword_big_endian" + "reg_expand_sz" + "reg_full_resource_descriptor" + "reg_invalid_type" + "reg_link" + "reg_multi_sz" + "reg_none" + "reg_qword" + "reg_resource_list" + "reg_resource_requirements_list" + "reg_sz" + ) ; ] ; . @@ -7377,19 +7228,11 @@ observable:WindowsPEBinaryType a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "dll" ; - rdf:rest [ - a rdf:List ; - rdf:first "exe" ; - rdf:rest [ - a rdf:List ; - rdf:first "sys" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; + owl:oneOf ( + "dll" + "exe" + "sys" + ) ; ] ; . @@ -7921,27 +7764,13 @@ observable:WindowsServiceStartType a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "service_auto_start" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_boot_start" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_demand_start" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_disabled" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_system_alert" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "service_auto_start" + "service_boot_start" + "service_demand_start" + "service_disabled" + "service_system_alert" + ) ; ] ; . @@ -7949,35 +7778,15 @@ observable:WindowsServiceStatus a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "service_continue_pending" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_pause_pending" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_paused" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_running" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_start_pending" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_stop_pending" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_stopped" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "service_continue_pending" + "service_pause_pending" + "service_paused" + "service_running" + "service_start_pending" + "service_stop_pending" + "service_stopped" + ) ; ] ; . @@ -7985,23 +7794,12 @@ observable:WindowsServiceType a rdfs:Datatype ; owl:equivalentClass [ a rdfs:Datatype ; - owl:oneOf [ - a rdf:List ; - rdf:first "service_file_system_driver" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_kernel_driver" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_win32_own_process" ; - rdf:rest [ - a rdf:List ; - rdf:first "service_win32_share_process" ; - rdf:rest rdf:nil ; - ] ; - ] ; - ] ; - ] ; + owl:oneOf ( + "service_file_system_driver" + "service_kernel_driver" + "service_win32_own_process" + "service_win32_share_process" + ) ; ] ; .