Commit bcf049e
merge(streams) #255: bring the classifier cache-warm down to the error-surfacing rung
Merges `feats/ks-streams-task-lifecycle` (#394), this PR's BASE, which has
just taken #379's post-cut work. Six commits arrive; the only code among
them is the `prepare-deps` warm for Kafka's `sources` and `test-sources` classifier jars, which
closes this rung's share of the Maven Central coin flip - the failure this branch spent four commits
recording sightings of.
**This merges the base rung, NOT master, and that is a correction rather than a shortcut.** The task
was framed as "merge origin/master so #395 stops reading CONFLICTING", but
this PR's base is `feats/ks-streams-task-lifecycle`, not master - so GitHub's CONFLICTING is computed
against that rung, and master cannot clear it. The evidence is direct: the sole conflicting path,
`docs/inflight/ci-streams-classifier-artifacts-escape-the-cache-warming-job.md`, **does not exist on
master at all**, so a master merge leaves the collision untouched while putting this rung 75 commits
ahead of its own base and inflating a stacked PR's diff with work no rung below it carries. The whole
spine still sits on `b2e6c190d`; changes travel DOWN it by merging the rung below, which is what the
three merges arriving here did.
One real conflict, and the incoming file left the instruction for it.
- `docs/inflight/ci-streams-classifier-artifacts-escape-the-cache-warming-job.md` - resolved to the
incoming POST-FIX version's structure, as #379 instructed in the note's
own `post-merge` block: take the version that names the warm step, not the one that still calls the
fix a candidate. Taken as a straight side, though, that instruction would have dropped four commits
of evidence it was never written about: it names the *lifecycle* rung, whose copy was the pre-fix
one unchanged, while THIS rung had since added its own sightings to it. So the branch's findings are
kept, condensed into a new section written in post-merge terms and marked `post-merge: checked` -
the second independent sighting that made this master-state rather than one PR's problem, that Unit
and Integration fail together because they share the runner's route to Central, that a re-run is a
coin flip rather than a fix, and the markdown-only control arm that settles the attribution. All
three remain true for any branch that has not yet merged the warm forward, which is exactly the
population the post-fix version's "What is still open" section addresses. Nothing either side wrote
and still holds was dropped; what went is the superseded framing of the defect as unfixed, whose
reasoning the workflow step's own comment now owns.
One sentence was moved to the past tense rather than carried verbatim: the incoming copy says
`feats/ks-streams-task-lifecycle` still holds the pre-fix file and will collide add/add. Both rungs
that hit that collision have now resolved it as instructed, so as written it was a claim about NOW
that this merge falsifies - the exact rot `bin/check-branch-self-reference.sh` exists to catch. The
instruction is kept for any rung above these two that has not yet merged forward.
`.github/workflows/maven.yml` and `docs/inflight/test-streamthreadtest-invalid-timestamps-flake.md`
auto-merged as pure incoming additions - the warm step, and the example rung's two CI sightings.
No decision this branch recorded is reversed by the incoming side.
Verification. The merge changes **no Java and no pom** - `git diff --stat HEAD` against the pre-merge
tip is the workflow file and two markdown notes - so no module's compilation or test outcome can move,
and none was re-run on that basis rather than on assumption.
`bin/check-all.sh`: 15 ran, 13 passed, 2 failed, and **both failures were reproduced on the pre-merge
tip 228cebc in a detached worktree**, so neither is this merge's:
- `check-file-refs.sh` - `docs/BUG_857_INVESTIGATION.md`, cited by three `docs/solutions/` write-ups,
does not resolve on this branch. Identical before and after.
- `check-quarantine-owners.sh` - `ProducerManagerTest.producedRecordsCantBeInTransactionWithoutItsOffsetDirect`
names owner PR #262, which has merged since this branch was cut while the quarantine stayed. Live
GitHub state, not tree state.
`check-branch-self-reference.sh` and `check-issue-refs.sh` both pass, including the new section's
`post-merge: checked` block.
The repo's pre-commit gate evaluates a different worktree (#382), so this
commit uses `--no-verify`; the gates above were run in this worktree instead.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018rEzrWYFr6oEzy6porczd33 files changed
Lines changed: 120 additions & 75 deletions
File tree
- .github/workflows
- docs/inflight
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
58 | 116 | | |
59 | 117 | | |
60 | 118 | | |
| |||
Lines changed: 55 additions & 75 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
35 | 10 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 11 | + | |
| 12 | + | |
41 | 13 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
61 | 21 | | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
| 22 | + | |
67 | 23 | | |
68 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
69 | 45 | | |
70 | | - | |
71 | | - | |
72 | | - | |
| 46 | + | |
73 | 47 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
79 | 62 | | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
| 63 | + | |
| 64 | + | |
85 | 65 | | |
86 | 66 | | |
87 | 67 | | |
88 | | - | |
89 | | - | |
| 68 | + | |
| 69 | + | |
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
39 | 46 | | |
40 | 47 | | |
41 | 48 | | |
| |||
0 commit comments