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

Bump Jetty from 9.4.48.v20220622 to 10.0.11 #305

Merged
merged 1 commit into from Jun 30, 2022
Merged

Conversation

basil
Copy link
Member

@basil basil commented Dec 19, 2021

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 Feb 13, 2022
@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 Jun 7, 2022
@basil basil force-pushed the jetty10 branch 2 times, most recently from 13505eb to 5822f18 Compare Jun 22, 2022
@basil basil force-pushed the jetty10 branch 3 times, most recently from acf0eee to 4179001 Compare Jun 30, 2022
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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

@basil basil marked this pull request as ready for review Jun 30, 2022
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

@@ -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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

<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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

HttpConfiguration hc = connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration();
hc.setUriCompliance(UriCompliance.LEGACY);
Copy link
Member Author

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

@@ -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

@basil basil Jun 30, 2022

Choose a reason for hiding this comment

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

@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 basil commented Jun 30, 2022

@basil basil requested a review from timja Jun 30, 2022
@basil
Copy link
Member Author

@basil 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 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
13 checks passed
@basil basil deleted the jetty10 branch Jun 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies enhancement java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant