Do not iterate through transient plugin dependencies if a newer dependency version is explicitly defined in the plugin list #102
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
oleg-nenashev
changed the title
oleg-nenashev
changed the title
oleg-nenashev
commented
Jun 8, 2020
| @@ -0,0 +1,60 @@ | |||
| ace-editor:1.1 | |||
There was a problem hiding this comment.
Unused at the moment
...-library/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerIntegrationTest.java
Outdated
Show resolved
Hide resolved
...-library/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerIntegrationTest.java
Outdated
Show resolved
Hide resolved
|
It will take a while to finish my patch. I will cut the release from the master branch for now |
…there is a higher-version dependency resolved
|
I applied a partial fix which kinda works for dependencies explicitly declared in plugins.txt or plugin.yml . It will still be an issue for dependency conflicts in the dependency tree |
timja
approved these changes
Jun 10, 2020
oleg-nenashev
commented
Jun 16, 2020
plugin-management-library/src/main/java/io/jenkins/tools/pluginmanager/impl/PluginManager.java
Outdated
Show resolved
Hide resolved
…nmanager/impl/PluginManager.java
oleg-nenashev
commented
Jun 16, 2020
| @@ -721,74 +721,6 @@ public void downloadPluginsUnsuccessfulTest() throws IOException { | |||
| pluginManagerSpy.downloadPlugins(plugins); | |||
| } | |||
|
|
|||
| @Test | |||
| public void findPluginsAndDependenciesTest() throws IOException { | |||
There was a problem hiding this comment.
Moved to the integration test which does not use Mocking
timja
approved these changes
Jun 16, 2020
oleg-nenashev
commented
Jun 16, 2020
| } else { | ||
| String message = String.format("Plugin %s:%s depends on %s:%s, but there is an older version defined on the top level - %s:%s", | ||
| plugin.getName(), plugin.getVersion(), p.getName(), p.getVersion(), pinnedPlugin.getName(), pinnedPlugin.getVersion()); | ||
| // TODO(oleg_nenashev): Should be an error by default, but it is not how the tests are written now |
There was a problem hiding this comment.
IMO there should be an error by default, but it is not how the tests are written now
Skipping it for now, original test from @stopalopa will fail
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.
Currently the tool checks for older transient dependency versions even if a newer one is explicitly defined in a plugin source. Fixes #101
Leads to....
Fixes #101