Draft
Conversation
Synced with upstream jhy/jsoup master (f727535) and rebased the 4 custom fork commits on top: 1. Add ability to set custom HostnameVerifier (#1) 2. Add Jitpack build configuration (#2) 3. Disable tests for Jitpack build configuration (#3) 4. Setup JDK version for Jitpack build configuration (#4) Resolved merge conflicts in Connection.java, HttpConnection.java, and UrlConnectionExecutor.java to keep both upstream SSLContext changes and fork's HostnameVerifier additions. Co-authored-by: valfirst <5081226+valfirst@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Rebase current master onto upstream master branch
Rebase onto upstream jhy/jsoup master
Mar 5, 2026
4f4a97f to
bdc5a86
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Syncs fork with upstream
jhy/jsoupmaster (94 new commits, up tof727535b) while preserving the 4 fork-specific commits on top.Merge conflict resolution
The upstream added
SSLContextsupport in the same areas where the fork addsHostnameVerifiersupport. Conflicts resolved in:Connection.java— addedHostnameVerifierimport and methods alongside newSSLContextAPIHttpConnection.java— addedhostnameVerifier()field/methods alongsidesslContext()implementationUrlConnectionExecutor.java— addedhostnameVerifierapplication within the existingHttpsURLConnectionblock that now handlessslContextFork commits preserved
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
https://api.github.com/repos/jhy/jsoup/compare/f241ab986664fbf1c38508d5890a9f754511aff2...master/home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/ghcca-node/node/bin/node --enable-source-maps /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js(http block)If you need me to access, download, or install something from one of these locations, you can either:
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.