Compatibility with Git plugin #273
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
jglick
approved these changes
Jul 28, 2022
jetersen
approved these changes
Jul 28, 2022
MarkEWaite
approved these changes
Jul 28, 2022
|
@didiez a release of this would help downstream :) |
|
Thank you! |
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.
Context
Discovered in jenkinsci/bom#1337. Blocks jenkinsci/plugin-compat-tester#348.
Steps to reproduce
Reproducible in
git-pluginby adding@@ -248,6 +248,11 @@ <artifactId>jenkins-test-harness</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jenkins-ci.plugins</groupId> + <artifactId>subversion</artifactId> + <scope>test</scope> + </dependency> </dependencies>and running
mvn clean verify -Dtest=jenkins.plugins.git.BrowsersJCasCCompatibilityTest#roundTripTest.Expected results
Note: These are the actual results with this patch.
The expected result is that the test passes without any exceptions.
Actual result
The actual result is that the test prints:
If the test was executed with
org.apache.maven.surefire.junit4.JUnit4Provider(i.e., running tests with Maven's JUnit 4 support, i.e., plugin POM 4.43.1 and earlier) it is a hard error that makes Maven exit non-zero. But withorg.apache.maven.surefire.junitplatform.JUnitPlatformProvider(i.e., running tests with JUnit Jupiter's Vintage engine, i.e., plugin POM 4.44 and later) it is only a warning that does not make Maven exit non-zero. However either way the exception gets logged.Evaluation
These two plugins both define a descriptor with the symbol
phabricator:Solution
This PR takes the easy way out by disambiguating
hudson.scm.browsers.Phabricatorwith the symbolsvnPhabricator. While technically a breaking change, I would guess there are far fewer users using Phabricator with SVN with Jenkins Configuration as Code (JCasC) than there are using Git. In the meantime, this resolves the symbol error and therefore unblocks jenkinsci/bom#1337 and therefore jenkinsci/plugin-compat-tester#348.CC @didiez @jetersen @jglick @MarkEWaite