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

Jump to bottom

Bump Jetty from 9.4.48.v20220622 to 10.0.11 #305

Merged
merged 1 commit into from Jun 30, 2022
Merged

Bump Jetty from 9.4.48.v20220622 to 10.0.11 #305

merged 1 commit into from Jun 30, 2022

Conversation

basil
Copy link
Member

@basil basil commented Dec 19, 2021 •
edited

Upgrading Jetty from 9.x to 10.x and Servlet API from 3 to 4 to match Jetty 10.x.

@basil basil added dependencies java Pull requests that update Java code labels Dec 19, 2021
@basil basil force-pushed the jetty10 branch 2 times, most recently from 4428ccf to 88bf544 Compare February 13, 2022 20:03
@basil basil changed the title Bump Jetty from 9.4.44.v20210927 to 10.0.7 Bump Jetty from 9.4.44.v20210927 to 10.0.8 Mar 13, 2022
@basil basil changed the title Bump Jetty from 9.4.44.v20210927 to 10.0.8 Bump Jetty from 9.4.45.v20220203 to 10.0.8 Mar 13, 2022
@basil basil force-pushed the jetty10 branch 2 times, most recently from 39fd994 to ad4ac07 Compare June 7, 2022 18:12
@basil basil force-pushed the jetty10 branch 2 times, most recently from 13505eb to 5822f18 Compare June 22, 2022 22:16
@basil basil force-pushed the jetty10 branch 3 times, most recently from acf0eee to 4179001 Compare June 30, 2022 00:12
@basil basil mentioned this pull request Jun 30, 2022
Merged
12 tasks
basil
basil commented Jun 30, 2022
View reviewed changes
jelly/pom.xml Outdated
@@ -25,7 +25,8 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.1-jenkins-20220625</version>
<!-- TODO https://github.com/jenkinsci/jelly/pull/34 -->
Copy link
Member Author

Choose a reason for hiding this comment

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

jenkinsci/jelly#34

@basil basil marked this pull request as ready for review June 30, 2022 07:34
basil
basil commented Jun 30, 2022
View reviewed changes
groovy/pom.xml
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

core/pom.xml
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

jelly/pom.xml
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

jrebel/pom.xml
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

jsp/pom.xml
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

pom.xml
@@ -45,7 +45,7 @@
<changelist>999999-SNAPSHOT</changelist>
<scmTag>HEAD</scmTag>
<spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
<jetty.version>9.4.48.v20220622</jetty.version>
<jetty.version>10.0.11</jetty.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/jenkinsci/winstone/blob/9149a903679805e97e46eaf100c89735354d2599/pom.xml#L22=.

jsp/pom.xml
<version>2.3.3</version>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>2.3.6</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L66=.

core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
Comment on lines +50 to +51
HttpConfiguration hc = connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration();
hc.setUriCompliance(UriCompliance.LEGACY);
Copy link
Member Author

Choose a reason for hiding this comment

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

Consistent with https://github.com/jenkinsci/winstone/blob/9149a903679805e97e46eaf100c89735354d2599/src/main/java/winstone/ServerConnectorBuilder.java#L107=. Needed to avoid some sort of test failure if I recall.

jelly/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.1-jenkins-20220625</version>
<version>1.1-jenkins-20220630</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

jenkinsci/jelly#34

@basil basil changed the title Bump Jetty from 9.4.45.v20220203 to 10.0.8 Bump Jetty from 9.4.48.v20220622 to 10.0.11 Jun 30, 2022
@basil
Copy link
Member Author

basil commented Jun 30, 2022

BOM test passed: https://ci.jenkins.io/job/Tools/job/bom/job/PR-1226/5/

@basil basil requested a review from timja June 30, 2022 07:36
@basil
Copy link
Member Author

basil commented Jun 30, 2022

Note that as per https://www.eclipse.org/jetty/ the version of jakarta.servlet:jakarta.servlet-api is very important: version 4.x isJakartaEE 8/javax.servlet.*, while version 5.x is JakartaEE 9/jakartaee.servlet.* (i.e. Jetty 11, the big package renaming).

@basil
Copy link
Member Author

basil commented Jun 30, 2022

Also tested by examining jenkins.war before and after this change; no unexpected additions or removals to the WAR file.

@basil basil merged commit 5b1b03f into jenkinsci:master Jun 30, 2022
@basil basil deleted the jetty10 branch June 30, 2022 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timja timja Awaiting requested review from timja

Assignees
No one assigned
Labels
dependencies enhancement java Pull requests that update Java code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@basil