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

[JENKINS-70774] Upgrade to Winstone 6.11 (e.g Jetty 10.0.13 to 10.0.15) #7858

Merged
merged 2 commits into from Apr 19, 2023

Conversation

olamy
Copy link
Member

@olamy olamy commented Apr 19, 2023

See JENKINS-70774

Testing done

  • Started controller and connected an inbound Linux agent with a fixed TCP port configured (50000), confirmed the agent remained connected
  • Connected an inbound Linux agent with Websocket and confirmed the agent connected
  • Disabled the fixed TCP port and confirmed that the first inbound agent was no longer able to connect and the second inbound agent (using Websocket) was still able to connect

Proposed changelog entries

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

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

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy olamy marked this pull request as ready for review April 19, 2023 03:21
@olamy olamy changed the title Upgrade to Winstone 6.11 (e.g Jetty 10.0.15) Upgrade to Winstone 6.11 (e.g Jetty 10.0.13 to 10.0.15) Apr 19, 2023
@olamy olamy added the dependencies Pull requests that update a dependency file label Apr 19, 2023
@MarkEWaite MarkEWaite changed the title Upgrade to Winstone 6.11 (e.g Jetty 10.0.13 to 10.0.15) [JENKINS-70774] Upgrade to Winstone 6.11 (e.g Jetty 10.0.13 to 10.0.15) Apr 19, 2023
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.

Are you also interested in adding Jetty 10.0.15 releases of Stapler and Jenkins Test Harness (JTH) to this PR?

diff --git a/bom/pom.xml b/bom/pom.xml
index 396b4b1bd2..9fdf5e5cb1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.5</asm.version>
     <slf4jVersion>2.0.7</slf4jVersion>
-    <stapler.version>1777.v7c6fe6d54a_0c</stapler.version>
+    <stapler.version>1781.v62372c33644e</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/test/pom.xml b/test/pom.xml
index feb0da2a97..61d2bf2ff0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -106,7 +106,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1952.v3a_b_0cd3f5a_03</version>
+      <version>1954.v2e3fd5465b_a_6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

If you are interested, I think this would be desirable because it would complete the work needed to transition to Jetty 10.0.15 in Jenkins core.

…ency

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

olamy commented Apr 19, 2023

Stapler and Jenkins Test Harness

Are you also interested in adding Jetty 10.0.15 releases of Stapler and Jenkins Test Harness (JTH) to this PR?

diff --git a/bom/pom.xml b/bom/pom.xml
index 396b4b1bd2..9fdf5e5cb1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.5</asm.version>
     <slf4jVersion>2.0.7</slf4jVersion>
-    <stapler.version>1777.v7c6fe6d54a_0c</stapler.version>
+    <stapler.version>1781.v62372c33644e</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/test/pom.xml b/test/pom.xml
index feb0da2a97..61d2bf2ff0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -106,7 +106,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1952.v3a_b_0cd3f5a_03</version>
+      <version>1954.v2e3fd5465b_a_6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

If you are interested, I think this would be desirable because it would complete the work needed to transition to Jetty 10.0.15 in Jenkins core.

good idea. done with 9077c2d

@basil basil self-assigned this Apr 19, 2023
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.

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process. Thanks!

@basil basil added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback java Pull requests that update Java code labels Apr 19, 2023
@basil
Copy link
Member

basil commented Apr 19, 2023

Merging this a bit early to prevent Dependabot from recreating these pull requests and wasting costs.

@basil basil merged commit 0d78920 into jenkinsci:master Apr 19, 2023
16 checks passed
@olamy olamy deleted the winstone-6.11 branch April 19, 2023 21:10
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 java Pull requests that update Java code ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
2 participants