Exclude :core:shadowJar task from extended #3597
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 a commit
that referenced
this pull request
Jul 26, 2023
vga91
added a commit
that referenced
this pull request
Jul 26, 2023
vga91
added a commit
that referenced
this pull request
Jul 26, 2023
vga91
added a commit
that referenced
this pull request
Jul 26, 2023
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.
In teamcity is firstly executed a
./gradlew shadowin the root folder, which creates anapoc-5.8.1-core.jar,where 5.8.1 is the current APOC Extended version.
But when
StartupExtendedTest.checkCoreAndFullWithExtraDependenciesJarsis executed,this runs the
:core:shadowJartask on the apoc-core folder (via https://github.com/neo4j/apoc/blob/dev/test-utils/src/main/java/apoc/util/TestContainerUtil.java#L133),which create an
apoc-5.8.0-core.jar(5.8.0: current APOC Core version),this causes an error due to duplicated packages:
In this pr I excluded
:core:shadowJar, when running on the root folder,since it is actually only needed when running integration tests with both core and extended.
FOLLOW UP:
Anyway, this causes packages with different versions (i.e. apoc-5.8.1-processor and apoc-5.8.0-processor, apoc-5.8.0-core and apoc-5.8.1 in core folder, apoc-5.8.0 and apoc-5.8 .1 in common, etc..),
so I think the ideal solution would be to force core, processor and common to accept the current core version when we run
/.gradle shadowin the root folder (5.8.0 in this case),but to do this it would also be necessary to change the APOC Core build.gradle , so I created a follow-up card: id
OIvGQTfi