Require Jenkins 2.479.3 and Jakarta EE 9

[strangelookingnerd]

Require Jenkins 2.479.3 and Jakarta EE 9

Jenkins 2.479.3 provides Jakarta EE 9, Eclipse Jetty 12, Spring Security 6, and Java 17.

• Update plugin pom and baseline
• Remove deprecations
• Use Java 17 language features
• Minor cleanup

Testing done

mvn clean verify

Submitter checklist

• Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
• Ensure that the pull request title represents the desired changelog entry
• Please describe what you did
• Link to relevant issues in GitHub or Jira
• Link to relevant pull requests, esp. upstream and downstream changes
• Ensure you have provided tests - that demonstrates feature works or fixes the issue

[strangelookingnerd]

@stuartrowe Kindly requesting a review.

[stuartrowe]

@strangelookingnerd I'm not a maintainer of this plugin so I don't think I'm qualified to review it.

@skumar7322 would be the best to review it.

[skumar7322]

Hi @strangelookingnerd thanks for creating this PR.
There are too many files in this PR. If possible could you please break this in multiple PRs(max 30 files per commit).
The decision to update Jenkins version is taken by us, after analysing the number of impacted users. Remove Jenkins version and java version changes.
Really appreciate you efforts for these changes.

[strangelookingnerd]

9a7e8e8 contains the most important changes that are more or less required.

b60493d contains changes that are optional to a certain extent, however I'd highly recommend considering them to improve code quality and maintainability. I don't see the point of breaking that up into smaller commits.

[skumar7322]

I will run our test suite for this PR.

[rantoniuk]

I will run our test suite for this PR.

Any results?

[skumar7322]

Hi @rantoniuk,

Apologies for the delayed follow-up.

The commit 9a7e8e8 is currently causing test failures.

Some of the changes from this PR were already merged into master after the PR was closed, which has resulted in conflicts.

Could you please resolve the conflicts in this PR? Once that's done, I'll prioritize reviewing and working on it.

Thanks!

[strangelookingnerd]

Conflicts resolved. Tests ran fine locally, waiting what CI has to say.

[skumar7322]

The commit 9a7e8e8 is currently causing test failures. The fix is to exclude commons-lang3 from the p4java dependency, as it is being pulled in transitively.

With that fix in place, I'm happy to merge this change into master. Could you please move commit b60493d into a separate PR and keep this PR focused on the dependency update only?

I can review the other change independently in the new PR as there are lots of file.

Thanks!

[strangelookingnerd]

The commit 9a7e8e8 is currently causing test failures. The fix is to exclude commons-lang3 from the p4java dependency, as it is being pulled in transitively.

Mind sharing these test results? I was not able to reproduce any failures locally. I tried excluding the dependency, but have not seen any change in behavior. That's why I am asking.

With that fix in place, I'm happy to merge this change into master. Could you please move commit b60493d into a separate PR and keep this PR focused on the dependency update only?

#231 (comment)

[skumar7322]

my bad. This is enforcer failure not a test failure.
ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.5.0:enforce (display-info) on project p4:
[ERROR] Rule 5: org.apache.maven.enforcer.rules.dependency.RequireUpperBoundDeps failed with message:
[ERROR] Failed while enforcing RequireUpperBoundDeps. The error(s) are [
[ERROR] Require upper bound dependencies error for org.apache.commons:commons-lang3:3.12.0 paths to dependency are:
[ERROR] +-org.jenkins-ci.plugins:p4:1.17.2-SNAPSHOT
[ERROR] +-com.perforce:p4java:2024.2.2695691
[ERROR] +-org.apache.commons:commons-lang3:3.12.0
[ERROR] and
[ERROR] +-org.jenkins-ci.plugins:p4:1.17.2-SNAPSHOT
[ERROR] +-io.jenkins.plugins:commons-lang3-api:3.17.0-87.v5cf526e63b_8b_
[ERROR] +-org.apache.commons:commons-lang3:3.17.0
[ERROR] ]
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException

[strangelookingnerd]

my bad. This is enforcer failure not a test failure. ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.5.0:enforce (display-info) on project p4: [ERROR] Rule 5: org.apache.maven.enforcer.rules.dependency.RequireUpperBoundDeps failed with message: [ERROR] Failed while enforcing RequireUpperBoundDeps. The error(s) are [ [ERROR] Require upper bound dependencies error for org.apache.commons:commons-lang3:3.12.0 paths to dependency are: [ERROR] +-org.jenkins-ci.plugins:p4:1.17.2-SNAPSHOT [ERROR] +-com.perforce:p4java:2024.2.2695691 [ERROR] +-org.apache.commons:commons-lang3:3.12.0 [ERROR] and [ERROR] +-org.jenkins-ci.plugins:p4:1.17.2-SNAPSHOT [ERROR] +-io.jenkins.plugins:commons-lang3-api:3.17.0-87.v5cf526e63b_8b_ [ERROR] +-org.apache.commons:commons-lang3:3.17.0 [ERROR] ] [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException

I can also not reproduce this. The maven failure does also make me think, that this is not my PR being build either. In my changes you can see I do use version 2025.2.2917314 of p4java (https://github.com/strangelookingnerd/p4-plugin/blob/5f0879f180a9aaa5863482846b151efc9633e8e1/pom.xml#L135) - the stacktrace suggests 2024.2.2695691 though.

[skumar7322]

I can also not reproduce this. The maven failure does also make me think, that this is not my PR being build either. In my changes you can see I do use version 2025.2.2917314 of p4java (https://github.com/strangelookingnerd/p4-plugin/blob/5f0879f180a9aaa5863482846b151efc9633e8e1/pom.xml#L135) - the stacktrace suggests 2024.2.2695691 though.

This is because the build run only on the commit 9a7e8e8

I have updated the Jenkinsfile to run the tests using JDK 17. These changes were taken from your PR, so the Jenkins CI checks should now run successfully for this PR as well.

Could you please resolve the merge conflicts so we can proceed with the review and merge?

Thank you!

[strangelookingnerd]

While the tests run fine locally, they seem to be flaky on ci. I can see similar test failures on the master branch as well. I can only hope that fb55a0b fixes it by not running tests in parallel which I assume is the root cause.

[rantoniuk]

@strangelookingnerd I see the CI is still failing... any thoughts?

[strangelookingnerd]

I merged main again to get the changes to the Jenkinsfile regarding concurrency. Unfortunately ci.jenkins.io or GitHub for that matter seem to have issues. Would you be able to restart the check?

[rantoniuk]

I see a compilation error:

12:58:34 [ERROR] /home/jenkins/agent/workspace/Plugins_p4-plugin_PR-231/src/main/java/org/jenkinsci/plugins/p4/credentials/P4CredentialsImpl.java:[24,10] cannot find symbol

[strangelookingnerd]

Build succeeded. Finally 🎉

[rantoniuk]

"This branch has conflicts that must be resolved" 🐙