Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UCO Issue 632, PRs 638, 639, 642: Bump UCO to current state of develop-2.0.0 #166

Merged
merged 10 commits into from
Nov 12, 2024
Merged

UCO Issue 632, PRs 638, 639, 642: Bump UCO to current state of develop-2.0.0 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc5535e
Bump UCO to current state of develop
ajnelson-nist Oct 29, 2024
820d63d
Bump GitHub Action versions
ajnelson-nist Oct 29, 2024
06a806a
Merge pull request #163 from casework/bump_github_actions_and_regener…
plbt5 Nov 7, 2024
2eb3991
Bump UCO to current state of develop
ajnelson-nist Nov 7, 2024
f759e47
Update NIST licensing text
ajnelson-nist Nov 7, 2024
97006d2
Merge pull request #164 from casework/update_nist_licensing_text
plbt5 Nov 8, 2024
96d45fb
Bump UCO to current state of develop
ajnelson-nist Nov 8, 2024
26bd54e
Merge pull request #165 from casework/UCO-Feature-Issue-632
plbt5 Nov 8, 2024
3b13c7a
Bump UCO to current state of develop-2.0.0
ajnelson-nist Nov 12, 2024
4af9cb2
Merge branch 'develop' into UCO-Features-Issue-632-PRs-638-639-642
ajnelson-nist Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand All @@ -26,8 +29,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand Down
15 changes: 9 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
2 changes: 1 addition & 1 deletion dependencies/UCO
Open in desktop
Submodule UCO updated 31 files
+12 −9 .github/workflows/ci.yml
+9 −6 Makefile
+9 −6 lib/Makefile
+9 −6 ontology/Makefile
+9 −6 ontology/co/Makefile
+9 −6 ontology/owl/Makefile
+9 −6 ontology/uco/Makefile
+10 −12 ontology/uco/observable/observable.ttl
+8 −8 src/create-catalog-v001.xml.py
+9 −6 src/populate_node_kind.py
+9 −6 src/review.mk
+9 −6 tests/Makefile
+9 −6 tests/dependencies/Makefile
+13 −6 tests/examples/Makefile
+1 −1 tests/examples/co_XFAIL_validation.ttl
+1 −1 tests/examples/configuration_setting_XFAIL_validation.ttl
+2 −2 tests/examples/database_records_XFAIL_validation.ttl
+1 −1 tests/examples/hash_XFAIL_validation.ttl
+1 −1 tests/examples/object_status_XFAIL_validation.ttl
+43 −0 tests/examples/operating_system_PASS.json
+11 −0 tests/examples/operating_system_PASS_validation.ttl
+44 −0 tests/examples/operating_system_XFAIL.json
+40 −0 tests/examples/operating_system_XFAIL_validation.ttl
+3 −3 tests/examples/rdf_list_XFAIL_validation.ttl
+28 −6 tests/examples/test_validation.py
+1 −1 tests/examples/thread_XFAIL_validation.ttl
+9 −6 tests/shapes/Makefile
+9 −6 tests/shapes/examples_uco_owl/Makefile
+9 −6 tests/shapes/examples_uco_qc/Makefile
+9 −6 tests/shapes/test_qc_shapes.py
+9 −6 tests/test_uco_monolithic.py
15 changes: 9 additions & 6 deletions ontology/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions ontology/investigation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions ontology/master/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions ontology/vocabulary/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions tests/examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions tests/examples/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/env python3

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions tests/shapes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions tests/test_case_monolithic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/env python3

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down