Bump CASE-Examples and website pointers; update Java

References: * ucoProject/UCO#373
ajnelson-nist · Jun 14, 2022 · abbb330 · abbb330
1 parent 0f4bcb6
commit abbb330
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,10 +30,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/dependencies/CASE-Examples b/dependencies/CASE-Examples
diff --git a/dependencies/casework.github.io b/dependencies/casework.github.io
diff --git a/tests/CASE-Examples/examples/illustrations/Oresteia/used_concepts.txt b/tests/CASE-Examples/examples/illustrations/Oresteia/used_concepts.txt
@@ -60,8 +60,8 @@ https://ontology.unifiedcyberontology.org/uco/location/region
 https://ontology.unifiedcyberontology.org/uco/location/street
 https://ontology.unifiedcyberontology.org/uco/observable/AccountFacet
 https://ontology.unifiedcyberontology.org/uco/observable/Application
-https://ontology.unifiedcyberontology.org/uco/observable/AttachmentFacet
 https://ontology.unifiedcyberontology.org/uco/observable/BluetoothAddressFacet
+https://ontology.unifiedcyberontology.org/uco/observable/ContentData
 https://ontology.unifiedcyberontology.org/uco/observable/ContentDataFacet
 https://ontology.unifiedcyberontology.org/uco/observable/DataRangeFacet
 https://ontology.unifiedcyberontology.org/uco/observable/Device
@@ -101,6 +101,7 @@ https://ontology.unifiedcyberontology.org/uco/observable/addressValue
 https://ontology.unifiedcyberontology.org/uco/observable/application
 https://ontology.unifiedcyberontology.org/uco/observable/body
 https://ontology.unifiedcyberontology.org/uco/observable/clockSetting
+https://ontology.unifiedcyberontology.org/uco/observable/dataPayloadReferenceURL
 https://ontology.unifiedcyberontology.org/uco/observable/deviceType
 https://ontology.unifiedcyberontology.org/uco/observable/diskPartitionType
 https://ontology.unifiedcyberontology.org/uco/observable/emailAddress
@@ -135,7 +136,6 @@ https://ontology.unifiedcyberontology.org/uco/observable/sizeInBytes
 https://ontology.unifiedcyberontology.org/uco/observable/storageCapacityInBytes
 https://ontology.unifiedcyberontology.org/uco/observable/subject
 https://ontology.unifiedcyberontology.org/uco/observable/to
-https://ontology.unifiedcyberontology.org/uco/observable/url
 https://ontology.unifiedcyberontology.org/uco/observable/version
 https://ontology.unifiedcyberontology.org/uco/role/Role
 https://ontology.unifiedcyberontology.org/uco/tool/ConfigurationSettingType

diff --git a/tests/CASE-Examples/examples/illustrations/message/used_concepts.txt b/tests/CASE-Examples/examples/illustrations/message/used_concepts.txt
@@ -1,6 +1,7 @@
 http://example.org/draft#visibility
 http://example.org/local#identifier
 http://example.org/local#messages
+https://ontology.unifiedcyberontology.org/uco/core/Relationship
 https://ontology.unifiedcyberontology.org/uco/core/hasFacet
 https://ontology.unifiedcyberontology.org/uco/core/isDirectional
 https://ontology.unifiedcyberontology.org/uco/core/kindOfRelationship
@@ -13,19 +14,20 @@ https://ontology.unifiedcyberontology.org/uco/observable/Application
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccount
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccountFacet
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationFacet
-https://ontology.unifiedcyberontology.org/uco/observable/AttachmentFacet
+https://ontology.unifiedcyberontology.org/uco/observable/ContentData
+https://ontology.unifiedcyberontology.org/uco/observable/ContentDataFacet
 https://ontology.unifiedcyberontology.org/uco/observable/Message
 https://ontology.unifiedcyberontology.org/uco/observable/MessageFacet
 https://ontology.unifiedcyberontology.org/uco/observable/MessageThread
 https://ontology.unifiedcyberontology.org/uco/observable/MessageThreadFacet
-https://ontology.unifiedcyberontology.org/uco/observable/ObservableObject
 https://ontology.unifiedcyberontology.org/uco/observable/ObservableRelationship
 https://ontology.unifiedcyberontology.org/uco/observable/OperatingSystem
 https://ontology.unifiedcyberontology.org/uco/observable/OperatingSystemFacet
 https://ontology.unifiedcyberontology.org/uco/observable/URL
 https://ontology.unifiedcyberontology.org/uco/observable/URLFacet
 https://ontology.unifiedcyberontology.org/uco/observable/application
 https://ontology.unifiedcyberontology.org/uco/observable/applicationIdentifier
+https://ontology.unifiedcyberontology.org/uco/observable/dataPayloadReferenceURL
 https://ontology.unifiedcyberontology.org/uco/observable/displayName
 https://ontology.unifiedcyberontology.org/uco/observable/from
 https://ontology.unifiedcyberontology.org/uco/observable/fullValue
@@ -37,5 +39,4 @@ https://ontology.unifiedcyberontology.org/uco/observable/operatingSystem
 https://ontology.unifiedcyberontology.org/uco/observable/participant
 https://ontology.unifiedcyberontology.org/uco/observable/sentTime
 https://ontology.unifiedcyberontology.org/uco/observable/to
-https://ontology.unifiedcyberontology.org/uco/observable/url
 https://ontology.unifiedcyberontology.org/uco/observable/version
diff --git a/tests/CASE-Examples/examples/illustrations/src/review.mk b/tests/CASE-Examples/examples/illustrations/src/review.mk
@@ -27,7 +27,7 @@ endif
 
 top_srcdir := $(shell cd ../../../../.. ; pwd)
 
-rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE/lib/rdf-toolkit.jar
+rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-unstable/dependencies/UCO/lib/rdf-toolkit.jar
 
 subjectdir_basename := $(shell basename $$PWD)
 

diff --git a/tests/CASE-Examples/examples/illustrations/used_concepts.txt b/tests/CASE-Examples/examples/illustrations/used_concepts.txt
@@ -81,7 +81,6 @@ https://ontology.unifiedcyberontology.org/uco/observable/Application
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccount
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccountFacet
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationFacet
-https://ontology.unifiedcyberontology.org/uco/observable/AttachmentFacet
 https://ontology.unifiedcyberontology.org/uco/observable/BluetoothAddressFacet
 https://ontology.unifiedcyberontology.org/uco/observable/Call
 https://ontology.unifiedcyberontology.org/uco/observable/CallFacet
@@ -129,7 +128,6 @@ https://ontology.unifiedcyberontology.org/uco/observable/MobileDevice
 https://ontology.unifiedcyberontology.org/uco/observable/MobileDeviceFacet
 https://ontology.unifiedcyberontology.org/uco/observable/NetworkConnection
 https://ontology.unifiedcyberontology.org/uco/observable/NetworkConnectionFacet
-https://ontology.unifiedcyberontology.org/uco/observable/ObservableObject
 https://ontology.unifiedcyberontology.org/uco/observable/ObservableRelationship
 https://ontology.unifiedcyberontology.org/uco/observable/OperatingSystem
 https://ontology.unifiedcyberontology.org/uco/observable/OperatingSystemFacet
@@ -249,7 +247,6 @@ https://ontology.unifiedcyberontology.org/uco/observable/tableName
 https://ontology.unifiedcyberontology.org/uco/observable/to
 https://ontology.unifiedcyberontology.org/uco/observable/totalFragments
 https://ontology.unifiedcyberontology.org/uco/observable/totalRam
-https://ontology.unifiedcyberontology.org/uco/observable/url
 https://ontology.unifiedcyberontology.org/uco/observable/value
 https://ontology.unifiedcyberontology.org/uco/observable/version
 https://ontology.unifiedcyberontology.org/uco/role/Role

diff --git a/tests/casework.github.io/examples/README.md b/tests/casework.github.io/examples/README.md
@@ -6,7 +6,7 @@ The following table is the count of undefined concepts used in each example file
 
 ```
    8 asgard/undefined_concepts.txt
-  11 crossover/undefined_concepts.txt
+  11 crossover_wmd/undefined_concepts.txt
   20 owl_trafficking/undefined_concepts.txt
    3 urgent_evidence/undefined_concepts.txt
   33 undefined_concepts.txt
@@ -16,7 +16,7 @@ The following table is the count of undefined relationship literals used in each
 
 ```
   1 asgard/undefined_kindOfRelationships.tsv
-  4 crossover/undefined_kindOfRelationships.tsv
+  4 crossover_wmd/undefined_kindOfRelationships.tsv
   3 owl_trafficking/undefined_kindOfRelationships.tsv
   1 urgent_evidence/undefined_kindOfRelationships.tsv
   4 undefined_kindOfRelationships.tsv

diff --git a/...rk.github.io/examples/crossover/README.md → ...ithub.io/examples/crossover_wmd/README.md b/...rk.github.io/examples/crossover/README.md → ...ithub.io/examples/crossover_wmd/README.md
diff --git a/...github.io/examples/crossover/README.md.in → ...ub.io/examples/crossover_wmd/README.md.in b/...github.io/examples/crossover/README.md.in → ...ub.io/examples/crossover_wmd/README.md.in
diff --git a/...examples/crossover/undefined_concepts.txt → ...ples/crossover_wmd/undefined_concepts.txt b/...examples/crossover/undefined_concepts.txt → ...ples/crossover_wmd/undefined_concepts.txt
diff --git a/...ossover/undefined_kindOfRelationships.tsv → ...ver_wmd/undefined_kindOfRelationships.tsv b/...ossover/undefined_kindOfRelationships.tsv → ...ver_wmd/undefined_kindOfRelationships.tsv
diff --git a/...b.io/examples/crossover/used_concepts.txt → .../examples/crossover_wmd/used_concepts.txt b/...b.io/examples/crossover/used_concepts.txt → .../examples/crossover_wmd/used_concepts.txt
diff --git a/...es/crossover/used_kindOfRelationships.tsv → ...rossover_wmd/used_kindOfRelationships.tsv b/...es/crossover/used_kindOfRelationships.tsv → ...rossover_wmd/used_kindOfRelationships.tsv
diff --git a/tests/casework.github.io/examples/src/review.mk b/tests/casework.github.io/examples/src/review.mk
@@ -32,7 +32,7 @@ endif
 
 top_srcdir := $(shell cd ../../../.. ; pwd)
 
-rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-Utilities-Python/dependencies/CASE/lib/rdf-toolkit.jar
+rdf_toolkit_jar := $(top_srcdir)/dependencies/CASE-Examples/dependencies/CASE-unstable/dependencies/UCO/lib/rdf-toolkit.jar
 
 subjectdir_basename := $(shell basename $$PWD)
 

diff --git a/tests/used_concepts.txt b/tests/used_concepts.txt
@@ -117,7 +117,6 @@ https://ontology.unifiedcyberontology.org/uco/observable/Application
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccount
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationAccountFacet
 https://ontology.unifiedcyberontology.org/uco/observable/ApplicationFacet
-https://ontology.unifiedcyberontology.org/uco/observable/AttachmentFacet
 https://ontology.unifiedcyberontology.org/uco/observable/BluetoothAddressFacet
 https://ontology.unifiedcyberontology.org/uco/observable/Call
 https://ontology.unifiedcyberontology.org/uco/observable/CallFacet
+7 −3		.github/workflows/ci.yml
+4 −0		.gitignore
+2 −2		.gitmodules
+11 −0		.pre-commit-config.yaml
+29 −5		Makefile
+14 −0		README.md
+1 −1		dependencies/CASE-develop
+1 −1		dependencies/CASE-unstable
+1 −1		dependencies/Makefile
+1 −1		dependencies/UCO-develop
+1 −1		dependencies/UCO-unstable
+3 −0		examples/illustrations/.gitignore
+1 −33		examples/illustrations/Oresteia/Makefile
+25 −10		examples/illustrations/Oresteia/Oresteia.json
+0 −48		examples/illustrations/Oresteia/Oresteia_validation-develop.ttl
+0 −48		examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl
+1 −33		examples/illustrations/accounts/Makefile
+1 −33		examples/illustrations/bulk_extractor_forensic_path/Makefile
+88 −1		examples/illustrations/bulk_extractor_forensic_path/bulk_extractor_forensic_path_validation-unstable.ttl
+1 −33		examples/illustrations/call_log/Makefile
+1 −33		examples/illustrations/device/Makefile
+13 −17		examples/illustrations/exif_data/Makefile
+91 −1		examples/illustrations/exif_data/exif_data_validation-unstable.ttl
+1 −33		examples/illustrations/file/Makefile
+192 −1		examples/illustrations/file/file_validation-unstable.ttl
+1 −33		examples/illustrations/forensic_lifecycle/Makefile
+1 −33		examples/illustrations/location/Makefile
+1 −33		examples/illustrations/message/Makefile
+45 −29		examples/illustrations/message/message.json
+1 −33		examples/illustrations/mobile_device_and_sim_card/Makefile
+1 −33		examples/illustrations/multipart_file/Makefile
+1 −33		examples/illustrations/network_connection/Makefile
+1 −33		examples/illustrations/raw_data/Makefile
+138 −1		examples/illustrations/raw_data/raw_data_validation-unstable.ttl
+1 −33		examples/illustrations/reconstructed_file/Makefile
+1 −33		examples/illustrations/sms_and_contacts/Makefile
+67 −0		examples/illustrations/src/generic_snippet_combiner.py
+62 −0		examples/illustrations/src/illustration-basedir.mk
+8 −2		examples/illustrations/src/illustration-nosrc.mk
+81 −0		examples/illustrations/src/illustration-src.mk
+7 −3		.github/workflows/web_resources.yml
+1 −0		.gitignore
+2 −2		.gitmodules
+26 −0		.pre-commit-config.yaml
+42 −58		Gemfile.lock
+50 −5		Makefile
+2 −0		_config.yml
+0 −77		_data/governance/directors.yml
+0 −62		_data/governance/elections.yml
+6 −4		_data/nav.yml
+3 −0		_data/releases/releases.yml
+0 −0		_data/resources/presentations.yml
+ −		assets/img/governance/beek.jpg
+ −		assets/img/governance/blank.jpg
+ −		assets/img/governance/brown.jpg
+ −		assets/img/governance/casey.jpg
+ −		assets/img/governance/griffith.jpg
+ −		assets/img/governance/hyde.jpg
+ −		assets/img/governance/lee.jpg
+ −		assets/img/governance/nelson.jpg
+ −		assets/img/governance/westman.jpg
+2 −1		community/adopters.html
+0 −19		community/governance.html
+2 −2		community/membership.html
+2 −2		contact.html
+1 −1		dependencies/CASE-develop
+1 −1		dependencies/CASE-unstable
+1 −1		dependencies/Makefile
+1 −1		dependencies/UCO-develop
+1 −1		dependencies/UCO-unstable
+0 −1		examples/.gitignore
+12 −12		examples/Makefile
+3 −0		examples/asgard/src/asgard_json.py
+16 −9		examples/asgard/src/test_asgard.py
+21 −0		examples/crossover/index.md
+25 −0		examples/crossover_heist/index.html
+18 −0		examples/crossover_linked/index.html
+0 −0		examples/crossover_wmd/Makefile
+0 −0		examples/crossover_wmd/crossover_wmd.json
+5 −10		examples/crossover_wmd/index.html
+0 −0		examples/crossover_wmd/src/Makefile
+0 −0		examples/crossover_wmd/src/crossover_wmd-android_device_properties.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-data_extraction.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-elder_wand_png.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-email.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-file_in_file_system.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-file_system_in_partition.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-integrity_details.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-investigator_role.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-location.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-partition_on_disk_image.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-reddit_account.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-report_generation.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-sim_card_containments.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-sim_card_properties.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-url_history.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-users_and_accounts.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_account.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_application.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_file_forensic_copy_relationship.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_file_msgstore_db.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_message.json
+0 −0		examples/crossover_wmd/src/crossover_wmd-whatsapp_message_file_relationship.json
+0 −0		examples/crossover_wmd/src/crossover_wmd_base.json
+4 −1		examples/crossover_wmd/src/crossover_wmd_json.py
+0 −46		examples/crossover_wmd/src/crossover_wmd_validation-develop.ttl
+0 −46		examples/crossover_wmd/src/crossover_wmd_validation-unstable.ttl
+0 −0		examples/crossover_wmd/src/crossover_wmd_validation.ttl
+28 −33		examples/crossover_wmd/src/index.html.in
+4 −1		examples/owl_trafficking/src/owl_trafficking_json.py
+16 −9		examples/owl_trafficking/test_owl_trafficking.py
+14 −29		examples/src/example-src.mk
+1 −6		examples/urgent_evidence/index.html
+1 −6		examples/urgent_evidence/src/query-exhibit_photos.sparql
+72 −51		examples/urgent_evidence/src/test_urgent_evidence.py
+1 −6		examples/urgent_evidence/src/urgent_evidence_base.json
+2 −0		examples/urgent_evidence/src/urgent_evidence_json.py
+615 −14		examples/urgent_evidence/src/urgent_evidence_validation-unstable.ttl
+1 −6		examples/urgent_evidence/urgent_evidence.json
+16,950 −0		ontology/CASE-develop.ttl
+17,025 −0		ontology/CASE-unstable.ttl
+81 −0		ontology/Makefile
+1 −1		ontology/start.html
+52 −0		releases/0.2.1/index.md
+1 −1		resources/presentations.html