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

Upgrade Jetty from 9.4.49.v20220914 to 10.0.12 #409

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Upgrade Jetty from 9.4.49.v20220914 to 10.0.12 #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

---
Copy link
Member Author

Choose a reason for hiding this comment

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

Making yamllint(1) happy.

Copy link
Member

Choose a reason for hiding this comment

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

Or just delete the comment since the link is dead anyway!

Copy link
Member Author

Choose a reason for hiding this comment

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

Pre-existing issue

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
ignore:
# Must remain within Jetty 9.x until Java 8 support is removed
# [JENKINS-68698] Must remain within Jetty 10.x until the Jakarta EE 9
# migration is complete
- dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
versions: [">=10.0.0"]
versions: [">=11.0.0"]
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
7 changes: 0 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,3 @@ groovy -e "basedir='$(pwd)/target/its/parent-4x'; evaluate new File('src/it/pare
```

Also make sure `project.parent.version` is the latest in every integration test except `src/it/parent-4-40/pom.xml`.

## Updating Jetty
`hpi:run` mojo is a variant of `jetty:run` mojo, and because of the way plugin descriptor is generated, this module copies some code from Jetty Maven plugin, specifically `AbstractJettyMojo.java` and `ConsoleScanner.java`.

To keep upstream tracking easier, pristine copies of these files are copied into `incoming-x.y` branch, then package renamed. This version specific incoming branch is then "theirs" merged into the `incoming` branch, which acts as the upstream tracking branch.

This branch is then merged into `master` via `git merge -X ignore-space-at-eol incoming`. See diff between `incoming` and `master` on these files to see the exact local patches.
Comment on lines -39 to -45
Copy link
Member Author

Choose a reason for hiding this comment

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

No longer relevant, as we no longer copy code from Jetty Maven plugin.

16 changes: 14 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.4.0</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
Comment on lines +164 to +169
Copy link
Member Author

Choose a reason for hiding this comment

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

Was pulling in an ancient version of ASM 3, which is not compatible with Jetty Maven plugin.

</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand Down Expand Up @@ -191,7 +197,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.49.v20220914</version>
<version>10.0.12</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
Expand All @@ -202,6 +208,12 @@
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-groovy</artifactId>
<version>1756.vec9071748061</version>
<exclusions>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
</exclusions>
Comment on lines +211 to +216
Copy link
Member Author

Choose a reason for hiding this comment

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

Was pulling in a Jakarta import version of this API which conflicts with that of Jetty.

</dependency>
<dependency>
<groupId>org.twdata.maven</groupId>
Expand Down Expand Up @@ -313,9 +325,9 @@
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>commons-lang:commons-lang</exclude>
<exclude>org.apache.commons:commons-collections4</exclude>
<exclude>org.codehaus.plexus:plexus-archiver</exclude>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>
<exclude>org.ow2.asm:asm</exclude>
Copy link
Member Author

Choose a reason for hiding this comment

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

Miscellaneous cleanup: realized that this was unnecessary while updating this list.

<exclude>org.slf4j:slf4j-api</exclude>
</excludes>
</requireUpperBoundDeps>
Expand Down
Loading