oscerd commented on PR #27503:
URL: https://github.com/apache/camel/pull/27503#issuecomment-6077829822
Rebased and pushed as `8282a79`. GitHub now reports the PR as `MERGEABLE`
and CI has started, so the conflict block is cleared.
**Rebase.** The branch was 109 commits behind. Conflicts were exactly the
three files you named:
- `SecurityUtilsTest.java` — kept both sides: main's new `assertFalse` for
`splunk-hec.skipTlsVerify` plus my `kubernetes-pods.trustCerts` pair.
- `camel-4x-upgrade-guide-4_23.adoc` — see the inline thread; main had added
its own `=== camel-kubernetes` heading, so this needed care rather than a plain
take-both.
- `SecurityUtils.java` — regenerated, not hand-merged (below).
**On regenerating `SecurityUtils.java`.** I ran the real generator
(`update-sensitive-helper`, bound in `catalog/camel-catalog`) rather than
resolving by hand. Reporting the outcome precisely, because it needs a caveat:
The regen left my `trustcerts` entries **byte-for-byte unchanged** — both
the `map.put("trustcerts", new SecurityOption(INSECURE_SSL, "true"))` line and
the 20-component `owners.put` block. That is the confirmation we wanted: the
committed block is what the generator produces.
It did however *remove* `mongodbsslinvalidhostnameallowed` (CAMEL-25414) and
`component:kafkashare` — entries `main` legitimately has. That is an artifact
of my local reactor, not a real result: those modules were not installed in my
local `~/.m2`, so the catalog regen could not see them. I reverted that noise
and kept the committed file, which has both my additions and main's. If CI's
uncommitted-changes check is happy on a full reactor build, that settles it
definitively; I did not run a full reactor build locally.
**Verification:** `core/camel-util` green (297 tests, 0 failures),
`components/camel-kubernetes` green, working tree clean.
Both of your points from the earlier round were already in before this
rebase; this push only rebases and relocates the guide entry. Not resolving the
conversations — leaving those to you.
_Claude Code on behalf of @oscerd_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
