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.

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
merged 5 commits into from
Apr 18, 2023

Conversation

vga91
Copy link
Collaborator

@vga91 vga91 commented Feb 16, 2023

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:

  • added addExtraDependencies() in ExtendedTestContainerUtil (instead of TestContainerUtil)
  • Created StartupExtendedTest.java
  • Deleted StartupTest.java

@vga91 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 vga91 marked this pull request as draft February 21, 2023 09:13
@vga91 vga91 force-pushed the hadoop-dependency-conflict_dev branch 3 times, most recently from ecd0e22 to 2080d04 Compare March 13, 2023 14:34
@vga91 vga91 marked this pull request as ready for review March 15, 2023 08:51
.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
Copy link
Contributor

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 vga91 force-pushed the hadoop-dependency-conflict_dev branch from 2080d04 to f4caef4 Compare April 3, 2023 15:25
@vga91 vga91 force-pushed the hadoop-dependency-conflict_dev branch from f4caef4 to 9020c10 Compare April 6, 2023 14:28
@vga91 vga91 force-pushed the hadoop-dependency-conflict_dev branch from 9020c10 to e6b5df5 Compare April 13, 2023 08:01
@vga91 vga91 merged commit c379922 into dev Apr 18, 2023
@vga91 vga91 deleted the hadoop-dependency-conflict_dev branch April 18, 2023 13:50
vga91 added a commit that referenced this pull request Apr 21, 2023
* [TOQo1n9M] apoc-hadoop dependency is conflicting (#3450)

* [TOQo1n9M] changed for 5.x version

* [TOQo1n9M] update .gitmodules branch

* [TOQo1n9M] removed imports

* [TOQo1n9M] fixed compile error
vga91 added a commit that referenced this pull request Apr 21, 2023
* [TOQo1n9M] apoc-hadoop dependency is conflicting (#3450)

* [TOQo1n9M] changed for 5.x version

* [TOQo1n9M] update .gitmodules branch

* [TOQo1n9M] removed imports

* [TOQo1n9M] fixed compile error
vga91 added a commit that referenced this pull request Apr 28, 2023
* [TOQo1n9M] apoc-hadoop dependency is conflicting (#3450)

* [TOQo1n9M] changed for 5.x version

* [TOQo1n9M] update .gitmodules branch

* [TOQo1n9M] removed imports

* [TOQo1n9M] fixed compile error
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants