Skip to content

Conversation

ZheSun88
Copy link
Contributor

vulnerability report GHSA-vv7r-c36w-3prj
since version 2.0.0-M2, the commons-fileupload2-jakarta has been separated to commons-fileupload2-jakarta-servlet5 and commons-fileupload2-jakarta-servlet6

mshabarov
mshabarov previously approved these changes Jun 17, 2025
@mshabarov
Copy link
Contributor

mshabarov commented Jun 17, 2025

Though more changes needed:

/flow-server/src/test/java/com/vaadin/flow/server/communication/StreamReceiverHandlerTest.java:[315,9] cannot find symbol
 symbol:   class JakartaServletFileUpload
location: class com.vaadin.flow.server.communication.StreamReceiverHandlerTest

Copy link

github-actions bot commented Jun 17, 2025

Test Results

1 235 files  ±0  1 235 suites  ±0   1h 13m 21s ⏱️ -46s
8 547 tests ±0  8 491 ✅ ±0  56 💤 ±0  0 ❌ ±0 
8 949 runs  +4  8 884 ✅ +4  65 💤 ±0  0 ❌ ±0 

Results for commit de0796c. ± Comparison against base commit 526dd84.

♻️ This comment has been updated with latest results.

@ZheSun88 ZheSun88 enabled auto-merge (squash) June 17, 2025 12:08
Copy link

@knoobie
Copy link
Contributor

knoobie commented Jun 17, 2025

vote 4 all supported 24.x branches

@ZheSun88 ZheSun88 merged commit 93a443e into main Jun 18, 2025
27 checks passed
@ZheSun88 ZheSun88 deleted the dependency-replace branch June 18, 2025 06:16
vaadin-bot pushed a commit that referenced this pull request Jun 18, 2025
@vaadin-bot
Copy link
Collaborator

Hi @ZheSun88 and @ZheSun88, when i performed cherry-pick to this commit to 24.7, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 93a443e
error: could not apply 93a443e... chore: replace commons-fileupload2-jakarta with commons-fileupload2-jakarta-servlet6 (#21711)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@vaadin-bot
Copy link
Collaborator

Hi @ZheSun88 and @ZheSun88, when i performed cherry-pick to this commit to 24.6, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 93a443e
error: could not apply 93a443e... chore: replace commons-fileupload2-jakarta with commons-fileupload2-jakarta-servlet6 (#21711)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

ZheSun88 added a commit that referenced this pull request Jun 18, 2025
…akarta-servlet6 (#21711) (#21715)

Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
mshabarov pushed a commit that referenced this pull request Jun 18, 2025
mshabarov pushed a commit that referenced this pull request Jun 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants