Update from upstream - #23
Merged
Merged
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
Conflicts in files:
Multiple changes with upgrading java to version 21, gradle to version 9. In java files the changes were related to formatting issues and coords changes coming from our fork.
I've kept removed
.github/workflows/ci-build-manual-full.ymland
.github/workflows/ci-build-unstable.ymlI’m not sure whether we can trust the new JAR files they provided to resolve the conflicts, or whether we should rebuild them ourselves for security reasons.
The image used by them in the dockerfiles seems to have vulnerability problems, not sure what to do about it (according to vscode warning):
eclipse-temurin:21.0.10_7-jdkTest plan:
Issue number/task: