[TOQo1n9M] Core part - apoc-hadoop dependency is conflicting 5.x (neo4j-contrib/neo4j-apoc-procedures#3450) #347
Conversation
vga91
force-pushed
the
hadoop-dependency-conflict_core-dev
branch
from
569971c
to
6c20011
Compare
vga91
force-pushed
the
hadoop-dependency-conflict_core-dev
branch
from
6c20011
to
8d4740b
Compare
vga91
changed the title
|
@Lojjs I know it's a cherry pick of a pr you already approved, Do you (or someone else) want to take a look here as well, by any chance? |
| // create and delete a file to retrieve the current project (`core` or `extended`) | ||
| FileObject resource = filer.createResource(StandardLocation.SOURCE_OUTPUT, "", "tmp", (Element[]) null); | ||
| String projectPath = resource.getName(); | ||
| resource.delete(); |
There was a problem hiding this comment.
This feel a bit over complicated to me. Cannot we not e.g. send in a boolean to the write method depending on if we call it from core or extended?
There was a problem hiding this comment.
Changed with a boolean
There was a problem hiding this comment.
I was more thinking about if we could avoid creating a temporary file, but looking closer I think it might not be so easy to do it in a smarter way. With your change it is at least a bit cleaner :)
| @@ -75,8 +75,8 @@ public void compare_with_sources() { | |||
| .list(record -> record.get("name").asString()); | |||
|
|
|||
|
|
|||
| assertEquals(sorted(ApocSignatures.PROCEDURES), procedureNames); | |||
| assertEquals(sorted(ApocSignatures.FUNCTIONS), functionNames); | |||
| assertEquals(sorted(ApocSignaturesCore.PROCEDURES), procedureNames); | |||
There was a problem hiding this comment.
I had a brief look at your extended PR too. How come we test both core and extended in extended PR? I would (maybe naively) have thought that it would make more sense to have the checkCoreWithExtraDependenciesJars test here and the other 2 tests in the extended repo?
There was a problem hiding this comment.
I could be wrong, but I don't think it's possible to test core and extra-dependencies here,
because we have to build the latter directly in extended,
I think it's not possible to build them from core.
There was a problem hiding this comment.
Ah ok. I don't think I actually have tried to build them myself, so you might be right about that. If it was a conscious decision, I think it is ok.
…4j-contrib/neo4j-apoc-procedures#3450) (#347) * [TOQo1n9M] Core part - apoc-hadoop dependency is conflicting 5.x (neo4j-contrib/neo4j-apoc-procedures#3450) * [TOQo1n9M] changed getProjectPath() to isExtendedProject()
Cherry-pick (core part) of neo4j-contrib/neo4j-apoc-procedures#3450
Extended part: neo4j-contrib/neo4j-apoc-procedures#3454.
apoc.ApocSignatureswhich collect the list of procedures and functions,one for core and one for extended, so I added a
String projectPathin order to create 2 different classes (ApocSignaturesCoreandApocSignaturesExtended).copyFilesToPlugin(..)to be reused in Extended