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.

Sign up for GitHub

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

[JENKINS-68694] Winstone 6.0: Upgrade Jetty from 9.4.46.v20220331 to 10.0.11 #6694

Merged
merged 12 commits into from Jul 4, 2022
Merged

[JENKINS-68694] Winstone 6.0: Upgrade Jetty from 9.4.46.v20220331 to 10.0.11 #6694

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ccf544e
Testing Jetty 10
basil Jun 25, 2022
3f50432
Merge branch 'master' into jetty10
basil Jun 28, 2022
bf0a165
Merge branch 'master' into jetty10
basil Jun 29, 2022
de527a7
Released version of Winstone
basil Jun 29, 2022
036ef77
Update Servlet API
basil Jun 29, 2022
a6266d1
Update Dependabot
basil Jun 29, 2022
d2eed60
Use incremental of Stapler
basil Jun 30, 2022
4656c06
Use released version of Stapler
basil Jun 30, 2022
d1e67b3
Merge branch 'master' into jetty10
basil Jun 30, 2022
758ffe6
Merge branch 'master' into jetty10
basil Jul 3, 2022
879c8ad
Merge branch 'master' into jetty10
basil Jul 3, 2022
2e87a66
Add Stapler/Jelly excludes
basil Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ updates:
# Provided by Jetty and should be aligned with the version provided by the
# version of Jetty we deliver. See:
# https://github.com/jenkinsci/jenkins/pull/5211
- dependency-name: "javax.servlet:javax.servlet-api"
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
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#L1105-L1106=.


# Jetty Maven Plugin and Winstone should be upgraded in lockstep in order
# to keep their corresponding Jetty versions aligned.
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ THE SOFTWARE.
<properties>
<asm.version>9.3</asm.version>
<slf4jVersion>1.7.36</slf4jVersion>
<stapler.version>1685.v3b_5035c4ce05</stapler.version>
<stapler.version>1711.v5b_1b_03f0fcf2</stapler.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/stapler#305

<groovy.version>2.4.21</groovy.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
View file
Open in desktop
Expand Up @@ -468,9 +468,9 @@ THE SOFTWARE.
<version>1.1.4c</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<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.

<scope>provided</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions war/pom.xml
View file
Open in desktop
Expand Up @@ -86,8 +86,8 @@ THE SOFTWARE.
jars that are not needed in war. most of the exclusions should happen in the core, to make IDEs happy, not here.
-->
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
Comment on lines +89 to +90
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/stapler/blob/ba1df74a5f159685c89aeee81389af7ef45f3351/jsp/pom.xml#L32-L33=.

</exclusion>
<!-- Stapler 1.195 fails to declare this as optional, and the 1.1 version lacks a license: -->
<exclusion>
Expand Down Expand Up @@ -138,7 +138,7 @@ THE SOFTWARE.
<groupId>org.jenkins-ci</groupId>
<artifactId>winstone</artifactId>
<!-- Make sure to keep jetty-maven-plugin elsewhere in this file in sync with the Jetty release in Winstone -->
<version>5.25</version>
<version>6.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -500,7 +500,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.46.v20220331</version>
<version>10.0.11</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/62610b74fbcadb1caf13892349995a333a55c8b1/pom.xml#L22=.

<configuration>
<!--
Reload webapp when you hit ENTER. (See JETTY-282 for more)
Expand Down