Skip to content

Rebase onto upstream jhy/jsoup master#5

Draft
Copilot wants to merge 6 commits intomasterfrom
copilot/rebase-master-branch
Draft

Rebase onto upstream jhy/jsoup master#5
Copilot wants to merge 6 commits intomasterfrom
copilot/rebase-master-branch

Conversation

Copy link

Copilot AI commented Mar 5, 2026

Syncs fork with upstream jhy/jsoup master (94 new commits, up to f727535b) while preserving the 4 fork-specific commits on top.

Merge conflict resolution

The upstream added SSLContext support in the same areas where the fork adds HostnameVerifier support. Conflicts resolved in:

  • Connection.java — added HostnameVerifier import and methods alongside new SSLContext API
  • HttpConnection.java — added hostnameVerifier() field/methods alongside sslContext() implementation
  • UrlConnectionExecutor.java — added hostnameVerifier application within the existing HttpsURLConnection block that now handles sslContext
// UrlConnectionExecutor.java — resolved to use upstream's sslContext pattern + fork's hostnameVerifier
if (conn instanceof HttpsURLConnection) {
    HttpsURLConnection scon = (HttpsURLConnection) conn;
    if (req.sslContext != null)
        scon.setSSLSocketFactory(req.sslContext.getSocketFactory());
    else if (req.sslSocketFactory() != null)
        scon.setSSLSocketFactory(req.sslSocketFactory());
    if (req.hostnameVerifier() != null)
        scon.setHostnameVerifier(req.hostnameVerifier());
}

Fork commits preserved

  1. Add ability to set custom HostnameVerifier (Add ability to set custom HostnameVerifier #1)
  2. Add Jitpack build configuration (Skip japicmp plugin for jitpack install #2)
  3. Disable tests for Jitpack build configuration (Disable tests for Jitpack build configuration #3)
  4. Setup JDK version for Jitpack build configuration (Setup JDK version for Jitpack build configuration #4)

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
    • Triggering command: /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.

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
@valfirst valfirst force-pushed the master branch 4 times, most recently from 4f4a97f to bdc5a86 Compare March 5, 2026 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants