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

Jump to bottom

Issue 373, v3: Upgrade rdf-toolkit and Java #398

Merged
merged 6 commits into from
Jun 14, 2022
Merged

Issue 373, v3: Upgrade rdf-toolkit and Java #398

merged 6 commits into from
Jun 14, 2022

Conversation

ajnelson-nist
Copy link
Contributor

@ajnelson-nist ajnelson-nist commented Jun 2, 2022 •
edited
Loading

This Pull Request supersedes PR 395. It is a rebase of the patches in that PR against the beginning of the develop branch immediately after UCO 0.8.0's release. The reason for rebasing to earlier in develop is so effects can be isolated for CASE to adopt in CASE PR 90. There is otherwise no change from the "v2" of this PR.

This PR will resolve all requirements of Issue 373.

Review steps taken:

  • Pull request is against correct branch
  • CI passes in (CASE/UCO) feature branch
  • CI passes in (CASE/UCO) current unstable branch (merge-commit)
  • Impact on SHACL validation reviewed for CASE-Examples
  • Impact on SHACL validation remediated for CASE-Examples (N/A)
  • Impact on SHACL validation reviewed for casework.github.io
  • Impact on SHACL validation remediated for casework.github.io

@ajnelson-nist
Update to setup-java version 3; transition from 'adopt' to 'temurin'
efce5c1 
The landing page for the setup-java action states the following:

> NOTE: Adopt OpenJDK got moved to Eclipse Temurin and won't be updated
> anymore. It is highly recommended to migrate workflows from adopt to
> temurin to keep receiving software and security updates. See more
> details in the Good-bye AdoptOpenJDK post.

References:
* https://github.com/actions/setup-java/#supported-distributions
* https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit 2b15709)
(cherry picked from commit bb099de)
@ajnelson-nist
Transition from Java 8 to 11
17a67a3 
With the current version of `rdf-toolkit-action`, this is expected to
cause a CI failure due to an `rdf-toolkit.jar` incompatibility.  A
release coming soon for `rdf-toolkit-action` will update the `.jar` file
used.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit 282468f)
(cherry picked from commit d3aa360)
@ajnelson-nist
Update jar file references to retrieve rdf-toolkit 1.11.0
917f2f7 
References:
* #373

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit 844b59c)
@ajnelson-nist
Normalize RDF lists in observable.ttl
f19694c 
The version of rdf-toolkit run by the pre-commit hook now handles an RDF
list differently than the prior version of rdf-toolkit.

This commit is a mechanically-produced result.

References:
* #373

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit ab0aff8)
(cherry picked from commit a77e4e9)
@ajnelson-nist
Retrieve file only from redistribution point
e06efe3 
This prevents a potential build failure scenario where rdf-toolkit
issues a release and suddenly all CI pinned to 1.11.0's SHA-512 fails.

References:
* #373

Reported-by: Paul Brandt <paul@brandt.name>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit b6f1ce0)
@ajnelson-nist
Reduce documentation of re-build cleanups
2fa9ad6 
References:
* #373

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
(cherry picked from commit e04a980)
@ajnelson-nist ajnelson-nist linked an issue Jun 2, 2022 that may be closed by this pull request
Upgrade rdf-toolkit and Java #373
Closed
14 tasks
@ajnelson-nist ajnelson-nist marked this pull request as draft June 2, 2022 22:07
@ajnelson-nist ajnelson-nist mentioned this pull request Jun 2, 2022
Closed
14 tasks
@ajnelson-nist
Copy link
Contributor Author

The only impact this proposal has on generated CASE files is that the "nightly build" ontology files now are normalized according to rdf-toolkit 1.11.0. (Both CASE-develop.ttl and CASE-unstable.ttl must be generated by the same rdf-toolkit version.) This is only a light oddity in normalization for the next week, and should not negative impact users.

@sbarnum
Copy link
Contributor

sbarnum commented Jun 8, 2022

The CP that this PR is targeted to address describes and proposes changes only to the normalization tool chain outside of the ontology, however this PR contains several substantive changes to the ontology itself in the form of redefinition of all enumerations in the observable.ttl namespace.
I assume these changes were included by error and are associated with some other CP?
These changes should be removed from the PR before it is voted and approved.

@ajnelson-nist
Copy link
Contributor Author

@sbarnum Those changes are not redefinitions. They are syntactic-sugar adjustments, with no semantic revision. The new version of rdf-toolkit (1.11.0) catches those as syntax to normalize. It's not clear why 1.10.0 didn't.

@ajnelson-nist ajnelson-nist marked this pull request as ready for review June 14, 2022 13:23
@b0bkaT b0bkaT merged commit 58fb217 into develop Jun 14, 2022
@ajnelson-nist ajnelson-nist deleted the Feature-Issue-373-v3 branch June 22, 2022 01:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@b0bkaT b0bkaT

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade rdf-toolkit and Java
3 participants
@ajnelson-nist @sbarnum @b0bkaT