-
Notifications
You must be signed in to change notification settings - Fork 495
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.
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
[TOQo1n9M] apoc-hadoop dependency is conflicting (#3450) #3454
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vga91
added
cherry-picked
This PR has been cherry-picked to the other active branches
not-ready-for-merge
extended-functionality
5.6
dev
and removed
5.6
labels
Feb 16, 2023
vga91
force-pushed
the
hadoop-dependency-conflict_dev
branch
3 times, most recently
from
March 13, 2023 14:34
ecd0e22
to
2080d04
Compare
Lojjs
reviewed
Mar 16, 2023
.gitmodules
Outdated
@@ -1,4 +1,4 @@ | |||
[submodule "apoc-core"] | |||
path = apoc-core | |||
url = https://github.com/neo4j/apoc | |||
branch = dev | |||
branch = hadoop-dependency-conflict_core-dev |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure not to check in this
vga91
force-pushed
the
hadoop-dependency-conflict_dev
branch
from
April 3, 2023 15:25
2080d04
to
f4caef4
Compare
vga91
force-pushed
the
hadoop-dependency-conflict_dev
branch
from
April 6, 2023 14:28
f4caef4
to
9020c10
Compare
vga91
force-pushed
the
hadoop-dependency-conflict_dev
branch
from
April 13, 2023 08:01
9020c10
to
e6b5df5
Compare
vga91
added a commit
that referenced
this pull request
Apr 21, 2023
vga91
added a commit
that referenced
this pull request
Apr 21, 2023
vga91
added a commit
that referenced
this pull request
Apr 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
cherry-picked
This PR has been cherry-picked to the other active branches
dev
extended-functionality
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.
Cherry-pick of #3450.
Waiting for core part merge.
Unlike 4.4 version, this is a test only pr because it already worked before.
Differences from cherry pick:
addExtraDependencies()
in ExtendedTestContainerUtil (instead of TestContainerUtil)