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

Upgrade to winstone with Jetty 12 #8380

Closed
wants to merge 16 commits into from

Conversation

olamy
Copy link
Member

@olamy olamy commented Aug 16, 2023

Signed-off-by: Olivier Lamy olamy@apache.org

See JENKINS-XXXXX.

Testing done

Proposed changelog entries

  • Entry 1: Issue, human-readable text
  • […]

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

@olamy olamy added work-in-progress The PR is under active development, not ready to the final review on-hold This pull request depends on another event/release, and it cannot be merged right now dependencies Pull requests that update a dependency file labels Aug 16, 2023
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Sep 2, 2023
@github-actions
Copy link

github-actions bot commented Sep 2, 2023

Please take a moment and address the merge conflicts of your pull request. Thanks!

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Sep 2, 2023
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Oct 11, 2023
@github-actions
Copy link

Please take a moment and address the merge conflicts of your pull request. Thanks!

1 similar comment
@github-actions
Copy link

Please take a moment and address the merge conflicts of your pull request. Thanks!

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Incomplete—does not include the requisite WebSocket changes for Jetty 12.

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label May 7, 2024
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

WebSocket test automation fails.

pom.xml Outdated Show resolved Hide resolved
websocket/jetty12/pom.xml Outdated Show resolved Hide resolved
websocket/jetty12/pom.xml Outdated Show resolved Hide resolved
war/pom.xml Outdated Show resolved Hide resolved
@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label May 8, 2024
Copy link

github-actions bot commented May 8, 2024

Please take a moment and address the merge conflicts of your pull request. Thanks!

@basil
Copy link
Member

basil commented May 8, 2024

Not only that, but the test harness needs significant changes for Jetty 12, along with these tests:

test/src/test/java/hudson/model/QueueTest.java
test/src/test/java/hudson/model/UpdateSiteTest.java
test/src/test/java/jenkins/install/SetupWizardTest.java
test/src/test/java/jenkins/util/SystemPropertiesTest.java

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label May 9, 2024
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Still failing WebSocket RealJenkinsRule tests, presumably due to websocket-jetty12-ee8 being missing from war/pom.xml.

.idea/encodings.xml Outdated Show resolved Hide resolved
.idea/encodings.xml Outdated Show resolved Hide resolved
basil added a commit to olamy/jenkins that referenced this pull request May 9, 2024
basil added a commit to olamy/jenkins that referenced this pull request May 9, 2024
websocket/jetty12-ee8/pom.xml Outdated Show resolved Hide resolved
olamy pushed a commit to olamy/jenkins that referenced this pull request May 13, 2024
olamy pushed a commit to olamy/jenkins that referenced this pull request May 13, 2024
olamy pushed a commit to olamy/jenkins that referenced this pull request May 14, 2024
olamy pushed a commit to olamy/jenkins that referenced this pull request May 14, 2024
olamy and others added 14 commits May 14, 2024 14:58
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Basil Crow <me@basilcrow.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

When upgrading Jetty to version 12 in Jenkins core, I think the core test suite should also be adapted to Jetty 12. Any progress on resolving the three known Jetty 12 test bugs in the core test suite? These are tracked in Jira:

Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
Copy link
Member Author

olamy commented May 30, 2024

As I have giving up with jenkinsci/winstone#341 I close this PR as well.
Everybody is free to reuse the branch from the fork

@olamy olamy closed this May 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file on-hold This pull request depends on another event/release, and it cannot be merged right now work-in-progress The PR is under active development, not ready to the final review
Projects
None yet
2 participants