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

Merge main #4793

Merged
merged 12 commits into from
Oct 3, 2023
Merged

Merge main #4793

merged 12 commits into from
Oct 3, 2023

Conversation

hmottestad
Copy link
Contributor

GitHub issue resolved: #

Briefly describe the changes proposed in this PR:

PR Author Checklist (see the contributor guidelines for more details):

  • my pull request is self-contained
  • I've added tests for the changes I made
  • I've applied code formatting (you can use mvn process-resources to format from the command line)
  • I've squashed my commits where necessary
  • every commit message starts with the issue number (GH-xxxx) followed by a meaningful description of the change

@hmottestad
GH-4781 update github actions workflow to use java 21
2aa7a33
@hmottestad
temurin doesn't have a jdk 21 build
9e147f2
@hmottestad
GH-4781 update github actions workflow to use java 21 (#4782)
6bc981a
@hmottestad
GH-4784 interrupt thread that is owning a connection before closing i…
18e018d 
…f we are closing from a different thread
@hmottestad
GH-4790 describe iteration needs to close the source iteration
8e6828c
@hmottestad
optimize imports
7c7cfd3
@hmottestad
code cleanup
246072e
@hmottestad
code cleanup
2cc42df
@hmottestad
code cleanup
475aa5d
@hmottestad
GH-4784 interrupt threads using connections when forcefully closing (#…
0410820 
…4787)
@hmottestad
GH-4784 fix test
c0ab946
@hmottestad
Merge branch 'main' into merge-main
c0abaab 
# Conflicts:
#	core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/DefaultEvaluationStrategy.java
#	core/sail/api/src/main/java/org/eclipse/rdf4j/sail/helpers/AbstractSailConnection.java
#	tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java
@hmottestad hmottestad enabled auto-merge October 3, 2023 13:05
@hmottestad hmottestad merged commit f729a90 into develop Oct 3, 2023
@hmottestad hmottestad deleted the merge-main branch October 3, 2023 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@hmottestad