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

Add Subversion to the managed set #550

Merged
merged 3 commits into from
Jun 12, 2021
Merged

Add Subversion to the managed set #550

merged 3 commits into from
Jun 12, 2021

Conversation

basil
Copy link
Member

@basil basil commented Jun 11, 2021

Adding Subversion (and its direct dependency MapDB API) to the managed set. It is used in the tests for workflow-multibranch, workflow-cps-global-lib, and workflow-scm-step, all of which need to bump their dependency and do a release whenever Subversion is updated, which is a bit annoying. That could be solved by including Subversion in the BOM. And yes, Subversion does need to be updated for recent versions of core because of the Digester removal.

@timja timja enabled auto-merge (squash) June 11, 2021 15:42
@timja timja added the enhancement New feature or request label Jun 11, 2021
Copy link
Contributor

@bitwiseman bitwiseman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's see if the ASM change makes things work.

bom-latest/pom.xml Outdated Show resolved Hide resolved
Co-authored-by: Liam Newman <bitwiseman@gmail.com>
auto-merge was automatically disabled June 11, 2021 18:06

Head branch was pushed to by a user without write access

@jetersen jetersen enabled auto-merge (squash) June 11, 2021 18:25
@jetersen
Copy link
Member

based on discussion in jenkinsci/subversion-plugin#258 I'll disable auto merge 😅

@jetersen jetersen disabled auto-merge June 11, 2021 18:35
@bitwiseman
Copy link
Contributor

Okay... What the hell does this mean?
.2 passed all tests, but .3 failed. Is this the potential compat failure @basil was talking about? Basically, before .3 the plugin would use the plugin bundled version of ASM. With .3 it was excluded and now doesn't work? Or do we need to test the latest weekly?

Going back to subversion plugin to try again.

@basil
Copy link
Member Author

basil commented Jun 11, 2021

Okay... What the hell does this mean?

I think all it means is that the Git client plugin's ModernScmTest needs to be adjusted. It assumes that Git is the only modern SCM, but when Subversion is added to the classpath (as PCT is doing here), there are now two modern SCMs: Git and Subversion, which the test is not expecting. So ModernScmTest needs to be adjusted to check that the list of modern SCMs contains Git rather than that it exclusively contains Git.

@basil
Copy link
Member Author

basil commented Jun 11, 2021

=> jenkinsci/git-plugin#1093

@basil
Copy link
Member Author

basil commented Jun 11, 2021

Run 3 is green, so I think this is ready for merge.

@timja timja merged commit 1fa45e7 into jenkinsci:master Jun 12, 2021
@jetersen
Copy link
Member

@basil release is ready :)

@basil basil deleted the subversion branch June 12, 2021 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants